extend transaction (#44)

ytake · Apr 22, 2017 · 401ef4d · 401ef4d
1 parent e214ab0
commit 401ef4d
Show file tree

Hide file tree

Showing 70 changed files with 408 additions and 129 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2016 Yuuki Takezawa
+Copyright (c) 2015-2017 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
@@ -146,7 +146,7 @@ you must use the TransactionalModule
 
 | params | description |
 |-----|-------|
-| value | database connection |
+| value (or array) | database connection |
 | expect | expect exception |
 
 ```php
@@ -157,7 +157,21 @@ use Ytake\LaravelAspect\Annotation\Transactional;
  */
 public function save(array $params)
 {
-    return $this->eloquent->save($params)
+    return $this->eloquent->save($params);
+}
+```
+
+#### Multiple Transaction
+```php
+use Ytake\LaravelAspect\Annotation\Transactional;
+
+/**
+ * @Transactional({"master", "second_master"})
+ */
+public function save(array $params)
+{
+    $this->eloquent->save($params);
+    $this->query->save($params);
 }
 ```
 

diff --git a/composer.json b/composer.json
@@ -26,7 +26,9 @@
     "illuminate/log": "~5.0",
     "illuminate/database": "~5.0",
     "illuminate/cache": "~5.0",
+    "illuminate/events": "~5.0",
     "ray/aop": "~2.0",
+    "nikic/php-parser": "^1.0|^2.0",
     "doctrine/annotations": "~1.0"
   },
   "require-dev": {

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

diff --git a/src/Annotation/Async.php b/src/Annotation/Async.php
@@ -12,14 +12,15 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2016 Yuuki Takezawa
+ * Copyright (c) 2015-2017 Yuuki Takezawa
  *
  */
 namespace Ytake\LaravelAspect\Annotation;
 
 use Doctrine\Common\Annotations\Annotation;
 
 /**
+ * @deprecated
  * @Annotation
  * @Target("METHOD")
  */

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

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

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

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

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

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

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

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

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

diff --git a/src/Annotation/Transactional.php b/src/Annotation/Transactional.php
@@ -12,7 +12,7 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2016 Yuuki Takezawa
+ * Copyright (c) 2015-2017 Yuuki Takezawa
  *
  */
 namespace Ytake\LaravelAspect\Annotation;
@@ -26,7 +26,7 @@
  */
 final class Transactional extends Annotation
 {
-    /** @var null $connection  database connection */
+    /** @var null|string|array $value  database connection names */
     public $value = null;
 
     /** @var string  */

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

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

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

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

diff --git a/src/AspectServiceProvider.php b/src/AspectServiceProvider.php
@@ -12,7 +12,7 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2016 Yuuki Takezawa
+ * Copyright (c) 2015-2017 Yuuki Takezawa
  *
  */
 namespace Ytake\LaravelAspect;
@@ -67,35 +67,4 @@ public function provides()
             'aspect.manager',
         ];
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function compiles()
-    {
-        return [
-            base_path() . '/vendor/ytake/laravel-aspect/src/AspectServiceProvider.php',
-            base_path() . '/vendor/ytake/laravel-aspect/src/ConsoleServiceProvider.php',
-            base_path() . '/vendor/ytake/laravel-aspect/src/AspectBind.php',
-            base_path() . '/vendor/ytake/laravel-aspect/src/AspectDriverInterface.php',
-            base_path() . '/vendor/ytake/laravel-aspect/src/NullAspectKernel.php',
-            base_path() . '/vendor/ytake/laravel-aspect/src/RayAspectKernel.php',
-            base_path() . '/vendor/ytake/laravel-aspect/src/PointCut/CacheablePointCut.php',
-            base_path() . '/vendor/ytake/laravel-aspect/src/PointCut/CacheEvictPointCut.php',
-            base_path() . '/vendor/ytake/laravel-aspect/src/PointCut/CachePutPointCut.php',
-            base_path() . '/vendor/ytake/laravel-aspect/src/PointCut/LoggablePointCut.php',
-            base_path() . '/vendor/ytake/laravel-aspect/src/PointCut/PointCutable.php',
-            base_path() . '/vendor/ytake/laravel-aspect/src/PointCut/TransactionalPointCut.php',
-            base_path() . '/vendor/ytake/laravel-aspect/src/Modules/CacheableModule.php',
-            base_path() . '/vendor/ytake/laravel-aspect/src/Modules/CacheEvictModule.php',
-            base_path() . '/vendor/ytake/laravel-aspect/src/Modules/CachePutModule.php',
-            base_path() . '/vendor/ytake/laravel-aspect/src/Modules/LoggableModule.php',
-            base_path() . '/vendor/ytake/laravel-aspect/src/Modules/TransactionalModule.php',
-            base_path() . '/vendor/ytake/laravel-aspect/src/Interceptor/CacheableInterceptor.php',
-            base_path() . '/vendor/ytake/laravel-aspect/src/Interceptor/CacheEvictInterceptor.php',
-            base_path() . '/vendor/ytake/laravel-aspect/src/Interceptor/CachePutInterceptor.php',
-            base_path() . '/vendor/ytake/laravel-aspect/src/Interceptor/LoggableInterceptor.php',
-            base_path() . '/vendor/ytake/laravel-aspect/src/Interceptor/TransactionalInterceptor.php',
-        ];
-    }
 }
diff --git a/src/Console/ClearCacheCommand.php b/src/Console/ClearCacheCommand.php
@@ -12,7 +12,7 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2016 Yuuki Takezawa
+ * Copyright (c) 2015-2017 Yuuki Takezawa
  *
  */
 namespace Ytake\LaravelAspect\Console;

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

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

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

diff --git a/src/ContainerInterceptor.php b/src/ContainerInterceptor.php
@@ -12,9 +12,10 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2016 Yuuki Takezawa
+ * Copyright (c) 2015-2017 Yuuki Takezawa
  *
  */
+
 namespace Ytake\LaravelAspect;
 
 use Ray\Aop\Bind;
@@ -43,13 +44,15 @@ public function __construct(Container $container)
      * @param string $abstract
      * @param Bind   $bind
      * @param string $className
+     *
+     * @return bool
      */
     public function intercept($abstract, Bind $bind, $className)
     {
         if ($abstract === $className) {
             return false;
         }
-        
+
         if (isset($this->container->contextual[$abstract])) {
             $this->resolveContextualBindings($abstract, $className);
         }

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

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

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

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

diff --git a/src/Interceptor/AsyncInterceptor.php b/src/Interceptor/AsyncInterceptor.php
@@ -12,7 +12,7 @@
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
  *
- * Copyright (c) 2015-2016 Yuuki Takezawa
+ * Copyright (c) 2015-2017 Yuuki Takezawa
  *
  */
 namespace Ytake\LaravelAspect\Interceptor;
@@ -24,7 +24,7 @@
 
 /**
  * Class AsyncInterceptor
- *
+ * @deprecated
  * @codeCoverageIgnore
  */
 class AsyncInterceptor implements MethodInterceptor

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

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