Merge pull request #24 from ytake/feature-log-exceptions

added LogException Annotation
ytake · Mar 17, 2016 · a4b5d2f · a4b5d2f
2 parents d0ce91c + a44d5c2
commit a4b5d2f
Show file tree

Hide file tree

Showing 54 changed files with 500 additions and 79 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Yuuki Takezawa
+Copyright (c) 2015-2016 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/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 Yuuki Takezawa
+ * Copyright (c) 2015-2016 Yuuki Takezawa
  *
  */
 namespace Ytake\LaravelAspect\Annotation;

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 Yuuki Takezawa
+ * Copyright (c) 2015-2016 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 Yuuki Takezawa
+ * Copyright (c) 2015-2016 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 Yuuki Takezawa
+ * Copyright (c) 2015-2016 Yuuki Takezawa
  *
  */
 namespace Ytake\LaravelAspect\Annotation;

diff --git a/src/Annotation/LogExceptions.php b/src/Annotation/LogExceptions.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license.
+ *
+ * Copyright (c) 2015-2016 Yuuki Takezawa
+ *
+ */
+namespace Ytake\LaravelAspect\Annotation;
+
+use Monolog\Logger;
+use Doctrine\Common\Annotations\Annotation;
+
+/**
+ * @Annotation
+ * @Target("METHOD")
+ */
+final class LogExceptions extends Annotation implements LoggableAnnotate
+{
+    /** @var int  Log level */
+    public $value = Logger::ERROR;
+
+    /** @var string  */
+    public $expect = '\Exception';
+
+    /** @var string  */
+    public $name = 'LogExceptions';
+}
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 Yuuki Takezawa
+ * Copyright (c) 2015-2016 Yuuki Takezawa
  *
  */
 namespace Ytake\LaravelAspect\Annotation;
@@ -24,7 +24,7 @@
  * @Annotation
  * @Target("METHOD")
  */
-final class Loggable extends Annotation
+final class Loggable extends Annotation implements LoggableAnnotate
 {
     /** @var int  Log level */
     public $value = Logger::INFO;

diff --git a/src/Annotation/LoggableAnnotate.php b/src/Annotation/LoggableAnnotate.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license.
+ *
+ * Copyright (c) 2015-2016 Yuuki Takezawa
+ *
+ */
+namespace Ytake\LaravelAspect\Annotation;
+
+/**
+ * Interface LoggableAnnotate
+ */
+interface LoggableAnnotate
+{
+}
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 Yuuki Takezawa
+ * Copyright (c) 2015-2016 Yuuki Takezawa
  *
  */
 namespace Ytake\LaravelAspect\Annotation;

diff --git a/src/AnnotationManager.php b/src/AnnotationManager.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 Yuuki Takezawa
+ * Copyright (c) 2015-2016 Yuuki Takezawa
  *
  */
 namespace Ytake\LaravelAspect;

diff --git a/src/AnnotationReadable.php b/src/AnnotationReadable.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 Yuuki Takezawa
+ * Copyright (c) 2015-2016 Yuuki Takezawa
  *
  */
 namespace Ytake\LaravelAspect;

diff --git a/src/ArrayReader.php b/src/ArrayReader.php
@@ -11,7 +11,8 @@
  *
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
- * Copyright (c) 2015 Yuuki Takezawa
+ *
+ * Copyright (c) 2015-2016 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 Yuuki Takezawa
+ * Copyright (c) 2015-2016 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 Yuuki Takezawa
+ * Copyright (c) 2015-2016 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 Yuuki Takezawa
+ * Copyright (c) 2015-2016 Yuuki Takezawa
  *
  */
 namespace Ytake\LaravelAspect;

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

diff --git a/src/Console/ClearAnnotationCacheCommand.php b/src/Console/ClearAnnotationCacheCommand.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 Yuuki Takezawa
+ * Copyright (c) 2015-2016 Yuuki Takezawa
  *
  */
 namespace Ytake\LaravelAspect\Console;

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 Yuuki Takezawa
+ * Copyright (c) 2015-2016 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 Yuuki Takezawa
+ * Copyright (c) 2015-2016 Yuuki Takezawa
  *
  */
 namespace Ytake\LaravelAspect\Console;

diff --git a/src/Console/stub/ModuleStub.stub b/src/Console/stub/ModuleStub.stub
@@ -12,6 +12,6 @@ class DummyClass extends DummyModuleClass
     /** @var array */
     protected $classes = [
         // example
-        // \App\Services\AcmeServce::class
+        // \App\Services\AcmeService::class
     ];
 }
diff --git a/src/ConsoleServiceProvider.php b/src/ConsoleServiceProvider.php
@@ -11,7 +11,8 @@
  *
  * This software consists of voluntary contributions made by many individuals
  * and is licensed under the MIT license.
- * Copyright (c) 2015 Yuuki Takezawa
+ *
+ * Copyright (c) 2015-2016 Yuuki Takezawa
  *
  */
 namespace Ytake\LaravelAspect;

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 Yuuki Takezawa
+ * Copyright (c) 2015-2016 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 Yuuki Takezawa
+ * Copyright (c) 2015-2016 Yuuki Takezawa
  *
  */
 namespace Ytake\LaravelAspect\Exception;

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

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 Yuuki Takezawa
+ * Copyright (c) 2015-2016 Yuuki Takezawa
  *
  */
 namespace Ytake\LaravelAspect\Interceptor;

diff --git a/src/Interceptor/AbstractLogger.php b/src/Interceptor/AbstractLogger.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license.
+ *
+ * Copyright (c) 2015-2016 Yuuki Takezawa
+ *
+ */
+namespace Ytake\LaravelAspect\Interceptor;
+
+use Ray\Aop\MethodInvocation;
+use Ytake\LaravelAspect\Annotation\LoggableAnnotate;
+
+/**
+ * Class AbstractLogger
+ */
+class AbstractLogger
+{
+    /** @var string */
+    protected $format = "%s:%s.%s";
+
+    /**
+     * @param LoggableAnnotate $annotation
+     * @param MethodInvocation $invocation
+     *
+     * @return string[]
+     */
+    protected function logFormatter(LoggableAnnotate $annotation, MethodInvocation $invocation)
+    {
+        $context = [];
+        $arguments = $invocation->getArguments();
+        foreach ($invocation->getMethod()->getParameters() as $parameter) {
+            $context['args'][$parameter->name] = $arguments[$parameter->getPosition()];
+        }
+
+        return [
+            'level' => $annotation->value,
+            'message' => sprintf(
+                $this->format,
+                $annotation->name,
+                $invocation->getMethod()->class,
+                $invocation->getMethod()->name
+            ),
+            'context' => $context,
+        ];
+    }
+}
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 Yuuki Takezawa
+ * Copyright (c) 2015-2016 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 Yuuki Takezawa
+ * Copyright (c) 2015-2016 Yuuki Takezawa
  *
  */
 namespace Ytake\LaravelAspect\Interceptor;

diff --git a/src/Interceptor/CacheableInterceptor.php b/src/Interceptor/CacheableInterceptor.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 Yuuki Takezawa
+ * Copyright (c) 2015-2016 Yuuki Takezawa
  *
  */
 namespace Ytake\LaravelAspect\Interceptor;