Merge pull request #3 from ray-di/0.1.0

0.1.0

Author: koriym

src/ValidateInterceptor.php

@@ -73,6 +73,7 @@ private function getOnValidate(\ReflectionMethod $method)
      * @param \ReflectionMethod $onFailure
      *
      * @return bool|mixed|InvalidArgumentException
+     *
      * @throws \Exception
      */
     private function validate(MethodInvocation $invocation, \ReflectionMethod $onValidate, \ReflectionMethod $onFailure = null)
@@ -139,19 +140,42 @@ private function findOnMethods(\ReflectionClass $class, Valid $valid)
         $onValidateMethod = $onFailureMethod = null;
         foreach ($class->getMethods() as $method) {
             $annotations = $this->reader->getMethodAnnotations($method);
-            foreach ($annotations as $annotation) {
-                if ($this->isOnValidateFound($annotation, $valid, $onValidateMethod)) {
-                    $onValidateMethod = $method;
-                }
-                if ($this->isOnFailureFound($annotation, $valid, $onFailureMethod)) {
-                    $onFailureMethod = $method;
-                }
-            }
+            list($onValidateMethod, $onFailureMethod) = $this->scanAnnotation($valid, $annotations, $method,
+                $onValidateMethod, $onFailureMethod
+            );
         }
 
         return [$onValidateMethod, $onFailureMethod];
     }
 
+    /**
+     * @param Valid             $valid
+     * @param array             $annotations
+     * @param \ReflectionMethod $method
+     * @param \ReflectionMethod $onValidateMethod
+     * @param \ReflectionMethod $onFailureMethod
+     *
+     * @return array
+     */
+    private function scanAnnotation(
+        Valid $valid,
+        array $annotations,
+        \ReflectionMethod $method,
+        \ReflectionMethod $onValidateMethod = null,
+        \ReflectionMethod $onFailureMethod = null
+    ) {
+        foreach ($annotations as $annotation) {
+            if ($this->isOnValidateFound($annotation, $valid, $onValidateMethod)) {
+                $onValidateMethod = $method;
+            }
+            if ($this->isOnFailureFound($annotation, $valid, $onFailureMethod)) {
+                $onFailureMethod = $method;
+            }
+        }
+
+        return [$onValidateMethod ,$onFailureMethod];
+    }
+
     /**
      * @param object            $annotation
      * @param Valid             $valid

src/Validation.php

@@ -10,8 +10,14 @@
 
 class Validation implements ValidationInterface
 {
+    /**
+     * @var array [$name =>]
+     */
     private $failure = [];
 
+    /**
+     * @var MethodInvocation
+     */
     private $invocation;
 
     public function __construct(array $failure = [])
@@ -24,16 +30,26 @@ public function setInvocation(MethodInvocation $invocation)
         $this->invocation = $invocation;
     }
 
+    /**
+     * @param string $name    error target name
+     * @param string $message message
+     */
     public function addError($name, $message)
     {
         $this->failure[$name][] = $message;
     }
 
+    /**
+     * @return array
+     */
     public function getMessages()
     {
         return $this->failure;
     }
 
+    /**
+     * @return MethodInvocation
+     */
     public function getInvocation()
     {
         return $this->invocation;