added code (#74)

ytake · Apr 23, 2020 · ce78a13 · ce78a13
1 parent 670e86f
commit ce78a13
Show file tree

Hide file tree

Showing 100 changed files with 904 additions and 915 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,10 @@
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/.styleci.yml export-ignore
+/.scrutinizer.yml export-ignore
+/.sensiolabs.yml export-ignore
+/nitpick.json export-ignore
+/composer.lock export-ignore
+/tests/ export-ignore
+/phpunit.xml export-ignore
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 vendor
 composer.lock
 composer.phar
+*.result.cache
+
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2017 Yuuki Takezawa
+Copyright (c) 2015-2020 Yuuki Takezawa
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -29,7 +29,8 @@ This library is heavily inspired by the [jcabi/jcabi-aspects](https://github.com
  5.6.x    | 2.1.*
  5.7.x    | 3.0.*
  6.0.x    | 4.0
-
+ 7.x      | 5.0
+
 ### install 
 
 ```bash

diff --git a/composer.json b/composer.json
@@ -17,36 +17,36 @@
     }
   ],
   "require": {
-    "php": "^7.1",
-    "illuminate/console": "^6.0",
-    "illuminate/filesystem": "^6.0",
-    "illuminate/support": "^6.0",
-    "illuminate/config": "^6.0",
-    "illuminate/contracts": "^6.0",
-    "illuminate/log": "^6.0",
-    "illuminate/database": "^6.0",
-    "illuminate/cache": "^6.0",
-    "illuminate/events": "^6.0",
-    "illuminate/bus": "^6.0",
-    "illuminate/queue": "^6.0",
+    "php": "^7.2.5",
+    "illuminate/console": "^7.0",
+    "illuminate/filesystem": "^7.0",
+    "illuminate/support": "^7.0",
+    "illuminate/config": "^7.0",
+    "illuminate/contracts": "^7.0",
+    "illuminate/log": "^7.0",
+    "illuminate/database": "^7.0",
+    "illuminate/cache": "^7.0",
+    "illuminate/events": "^7.0",
+    "illuminate/bus": "^7.0",
+    "illuminate/queue": "^7.0",
     "ray/aop": "^2.9",
     "doctrine/annotations": "^1.4",
     "nikic/php-parser": "^4.0",
     "psr/log": "~1.0"
   },
   "require-dev": {
-    "symfony/framework-bundle": "^4.1",
-    "symfony/console": "^4.1",
-    "phpunit/phpunit": "^7.0",
+    "symfony/framework-bundle": "^5.0",
+    "symfony/console": "^5.0",
+    "phpunit/phpunit": "^8.5",
     "mockery/mockery": "*",
     "satooshi/php-coveralls": "*",
     "sebastian/phpcpd": "*",
     "phploc/phploc": "*",
     "pdepend/pdepend" : "^2.2.4",
     "phpmd/phpmd": "@stable",
     "squizlabs/php_codesniffer": "~2.7",
-    "illuminate/encryption":"^6.0",
-    "vlucas/phpdotenv": "^3.3"
+    "illuminate/encryption":"^7.0",
+    "vlucas/phpdotenv": "^4.1.4"
   },
   "autoload": {
     "psr-4": {

diff --git a/src/AnnotateClass.php b/src/AnnotateClass.php
@@ -13,7 +13,7 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2018 Yuuki Takezawa
+ * Copyright (c) 2015-2020 Yuuki Takezawa
  *
  */
 

diff --git a/src/Annotation/AnnotationReaderTrait.php b/src/Annotation/AnnotationReaderTrait.php
@@ -13,7 +13,7 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2018 Yuuki Takezawa
+ * Copyright (c) 2015-2020 Yuuki Takezawa
  *
  */
 namespace Ytake\LaravelAspect\Annotation;

diff --git a/src/Annotation/CacheEvict.php b/src/Annotation/CacheEvict.php
@@ -13,7 +13,7 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2018 Yuuki Takezawa
+ * Copyright (c) 2015-2020 Yuuki Takezawa
  *
  */
 namespace Ytake\LaravelAspect\Annotation;

diff --git a/src/Annotation/CachePut.php b/src/Annotation/CachePut.php
@@ -13,7 +13,7 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2018 Yuuki Takezawa
+ * Copyright (c) 2015-2020 Yuuki Takezawa
  *
  */
 namespace Ytake\LaravelAspect\Annotation;

diff --git a/src/Annotation/Cacheable.php b/src/Annotation/Cacheable.php
@@ -13,7 +13,7 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2018 Yuuki Takezawa
+ * Copyright (c) 2015-2020 Yuuki Takezawa
  *
  */
 namespace Ytake\LaravelAspect\Annotation;

diff --git a/src/Annotation/Delayed.php b/src/Annotation/Delayed.php
@@ -13,7 +13,7 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2018 Yuuki Takezawa
+ * Copyright (c) 2015-2020 Yuuki Takezawa
  *
  */
 namespace Ytake\LaravelAspect\Annotation;

diff --git a/src/Annotation/EagerQueue.php b/src/Annotation/EagerQueue.php
@@ -13,7 +13,7 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2018 Yuuki Takezawa
+ * Copyright (c) 2015-2020 Yuuki Takezawa
  *
  */
 namespace Ytake\LaravelAspect\Annotation;

diff --git a/src/Annotation/LazyQueue.php b/src/Annotation/LazyQueue.php
@@ -13,7 +13,7 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2018 Yuuki Takezawa
+ * Copyright (c) 2015-2020 Yuuki Takezawa
  *
  */
 namespace Ytake\LaravelAspect\Annotation;

diff --git a/src/Annotation/LogExceptions.php b/src/Annotation/LogExceptions.php
@@ -13,7 +13,7 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2018 Yuuki Takezawa
+ * Copyright (c) 2015-2020 Yuuki Takezawa
  *
  */
 

diff --git a/src/Annotation/Loggable.php b/src/Annotation/Loggable.php
@@ -13,7 +13,7 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2018 Yuuki Takezawa
+ * Copyright (c) 2015-2020 Yuuki Takezawa
  *
  */
 

diff --git a/src/Annotation/LoggableAnnotate.php b/src/Annotation/LoggableAnnotate.php
@@ -13,7 +13,7 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2018 Yuuki Takezawa
+ * Copyright (c) 2015-2020 Yuuki Takezawa
  *
  */
 

diff --git a/src/Annotation/MessageDriven.php b/src/Annotation/MessageDriven.php
@@ -13,7 +13,7 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2018 Yuuki Takezawa
+ * Copyright (c) 2015-2020 Yuuki Takezawa
  *
  */
 

diff --git a/src/Annotation/PostConstruct.php b/src/Annotation/PostConstruct.php
@@ -13,7 +13,7 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2018 Yuuki Takezawa
+ * Copyright (c) 2015-2020 Yuuki Takezawa
  *
  */
 

diff --git a/src/Annotation/QueryLog.php b/src/Annotation/QueryLog.php
@@ -13,7 +13,7 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2018 Yuuki Takezawa
+ * Copyright (c) 2015-2020 Yuuki Takezawa
  *
  */
 namespace Ytake\LaravelAspect\Annotation;

diff --git a/src/Annotation/RetryOnFailure.php b/src/Annotation/RetryOnFailure.php
@@ -13,7 +13,7 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2018 Yuuki Takezawa
+ * Copyright (c) 2015-2020 Yuuki Takezawa
  *
  */
 

diff --git a/src/Annotation/Transactional.php b/src/Annotation/Transactional.php
@@ -13,7 +13,7 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2018 Yuuki Takezawa
+ * Copyright (c) 2015-2020 Yuuki Takezawa
  *
  */
 

diff --git a/src/AnnotationConfiguration.php b/src/AnnotationConfiguration.php
@@ -13,7 +13,7 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2018 Yuuki Takezawa
+ * Copyright (c) 2015-2020 Yuuki Takezawa
  *
  */
 

diff --git a/src/AspectBind.php b/src/AspectBind.php
@@ -13,7 +13,7 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2018 Yuuki Takezawa
+ * Copyright (c) 2015-2020 Yuuki Takezawa
  *
  */
 
@@ -51,18 +51,22 @@ class AspectBind
      * @param string     $path
      * @param bool       $cacheable
      */
-    public function __construct(Filesystem $filesystem, string $path, bool $cacheable = false)
-    {
+    public function __construct(
+        Filesystem $filesystem,
+        string $path,
+        bool $cacheable = false
+    ) {
         $this->filesystem = $filesystem;
         $this->cacheable = $cacheable;
         $this->path = $path;
     }
 
     /**
      * @param string $class
-     * @param array  $pointcuts
-     *
+     * @param array $pointcuts
      * @return mixed|\Ray\Aop\BindInterface
+     * @throws \Doctrine\Common\Annotations\AnnotationException
+     * @throws \ReflectionException
      */
     public function bind(string $class, array $pointcuts)
     {

diff --git a/src/AspectDriverInterface.php b/src/AspectDriverInterface.php
@@ -13,7 +13,7 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2018 Yuuki Takezawa
+ * Copyright (c) 2015-2020 Yuuki Takezawa
  *
  */
 namespace Ytake\LaravelAspect;

diff --git a/src/AspectManager.php b/src/AspectManager.php
@@ -13,7 +13,7 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2018 Yuuki Takezawa
+ * Copyright (c) 2015-2020 Yuuki Takezawa
  *
  */
 
@@ -37,8 +37,8 @@ class AspectManager extends Manager
     protected function createRayDriver(): AspectDriverInterface
     {
         return new RayAspectKernel(
-            $this->app,
-            $this->app['files'],
+            $this->container,
+            $this->container['files'],
             $this->getConfigure('ray')
         );
     }
@@ -56,7 +56,7 @@ protected function createNoneDriver(): AspectDriverInterface
      */
     public function getDefaultDriver()
     {
-        return $this->app['config']->get('ytake-laravel-aop.aspect.default');
+        return $this->container['config']->get('ytake-laravel-aop.aspect.default');
     }
 
     /**
@@ -66,8 +66,8 @@ public function getDefaultDriver()
      */
     protected function getConfigure(string $driver): array
     {
-        $aspectConfigure = $this->app['config']->get('ytake-laravel-aop.aspect.drivers');
-        $aspectConfigure[$driver]['modules'] = $this->app['config']->get('ytake-laravel-aop.aspect.modules', []);
+        $aspectConfigure = $this->container['config']->get('ytake-laravel-aop.aspect.drivers');
+        $aspectConfigure[$driver]['modules'] = $this->container['config']->get('ytake-laravel-aop.aspect.modules', []);
 
         return $aspectConfigure[$driver];
     }

diff --git a/src/AspectServiceProvider.php b/src/AspectServiceProvider.php
@@ -13,7 +13,7 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2018 Yuuki Takezawa
+ * Copyright (c) 2015-2020 Yuuki Takezawa
  *
  */
 

diff --git a/src/Console/ClearCacheCommand.php b/src/Console/ClearCacheCommand.php
@@ -13,7 +13,7 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2018 Yuuki Takezawa
+ * Copyright (c) 2015-2020 Yuuki Takezawa
  *
  */
 
@@ -54,7 +54,7 @@ public function __construct(ConfigRepository $config, Filesystem $filesystem)
     /**
      * @return void
      */
-    public function handle()
+    public function handle(): void
     {
         $configure = $this->config->get('ytake-laravel-aop.aspect');
         $driverConfig = $configure['drivers'][$configure['default']];

diff --git a/src/Console/CompileCommand.php b/src/Console/CompileCommand.php
@@ -13,7 +13,7 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2018 Yuuki Takezawa
+ * Copyright (c) 2015-2020 Yuuki Takezawa
  *
  */
 
@@ -50,7 +50,7 @@ public function __construct(AspectManager $aspectManager)
     /**
      * @return void
      */
-    public function handle()
+    public function handle(): void
     {
         $this->aspectManager->weave();
         $this->info('class files compiled!');

diff --git a/src/Console/ModulePublishCommand.php b/src/Console/ModulePublishCommand.php
@@ -13,7 +13,7 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2018 Yuuki Takezawa
+ * Copyright (c) 2015-2020 Yuuki Takezawa
  *
  */
 
@@ -73,7 +73,7 @@ public function __construct(Filesystem $filesystem)
      * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
      * @throws \ReflectionException
      */
-    public function handle()
+    public function handle(): void
     {
         foreach ($this->modules as $className => $module) {
             $path = $this->getPath($this->parseClassName($className, $this->argument('module_dir')));