Merge pull request #16 from koriym/on-failure-method

On failure method suffix
ray-di · Sep 16, 2015 · 1afcfd2 · 1afcfd2
2 parents ba957db + 142eb88
commit 1afcfd2
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 14 deletions.
diff --git a/src/OnFailureMethodHandler.php b/src/OnFailureMethodHandler.php
@@ -13,6 +13,8 @@
 
 final class OnFailureMethodHandler implements FailureHandlerInterface
 {
+    const FAILURE_SUFFIX = 'ValidationFailed';
+
     /**
      * {@inheritdoc}
      */
@@ -21,10 +23,14 @@ public function handle(AbstractValidation $formValidation, MethodInvocation $inv
         unset($form);
         $args = (array) $invocation->getArguments();
         $object = $invocation->getThis();
-        if (! $formValidation instanceof FormValidation || ! method_exists($object, $formValidation->onFailure)) {
+        if (! $formValidation instanceof FormValidation) {
+            throw new InvalidOnFailureMethod(get_class($invocation->getThis()));
+        }
+        $onFailureMethod = $formValidation->onFailure ?: $invocation->getMethod()->getName() . self::FAILURE_SUFFIX;
+        if (! $formValidation instanceof FormValidation || ! method_exists($object, $onFailureMethod)) {
             throw new InvalidOnFailureMethod(get_class($invocation->getThis()));
         }
 
-        return call_user_func_array([$invocation->getThis(), $formValidation->onFailure], $args);
+        return call_user_func_array([$invocation->getThis(), $onFailureMethod], $args);
     }
 }
diff --git a/tests/Fake/FakeController.php b/tests/Fake/FakeController.php
@@ -11,26 +11,28 @@ class FakeController
     /**
      * @var FormInterface
      */
-    protected $form1;
+    protected $form;
 
     /**
      * @Inject
      * @Named("contact_form")
      */
     public function setForm(FormInterface $form)
     {
-        $this->form1 = $form;
+        $this->form = $form;
     }
 
     /**
-     * @FormValidation(form="form1", onFailure="badRequestAction")
+     * @FormValidation
+     *
+     * = is same as @ FormValidation(form="form", onFailure="createActionValidationFailed")
      */
     public function createAction($name)
     {
         return '201';
     }
 
-    public function badRequestAction()
+    public function createActionValidationFailed()
     {
         return '400';
     }

diff --git a/tests/Fake/FakeControllerVndError.php b/tests/Fake/FakeControllerVndError.php
@@ -4,7 +4,7 @@
 
 use Ray\Di\Di\Inject;
 use Ray\Di\Di\Named;
-use Ray\WebFormModule\Annotation\FormValidation;
+use Ray\WebFormModule\Annotation\InputValidation;
 use Ray\WebFormModule\Annotation\VndError;
 
 class FakeControllerVndError
@@ -24,10 +24,11 @@ public function setForm(FormInterface $form)
     }
 
     /**
-     * @FormValidation(form="form1", onFailure="badRequestAction")
+     * @InputValidation(form="form1")
      * @VndError(
      *   message="foo validation failed",
-     *   logref="a1000", path="/path/to/error",
+     *   logref="a1000",
+     *   path="/path/to/error",
      *   href={"_self"="/path/to/error", "help"="/path/to/help"}
      * )
      */

diff --git a/tests/Fake/FakeInputValidationController.php b/tests/Fake/FakeInputValidationController.php
@@ -11,19 +11,19 @@ class FakeInputValidationController
     /**
      * @var FormInterface
      */
-    protected $form1;
+    protected $form;
 
     /**
      * @Inject
      * @Named("contact_form")
      */
     public function setForm(FormInterface $form)
     {
-        $this->form1 = $form;
+        $this->form  = $form;
     }
 
     /**
-     * @InputValidation(form="form1")
+     * @InputValidation
      */
     public function createAction($name)
     {

diff --git a/tests/Fake/FakeInvalidController2.php b/tests/Fake/FakeInvalidController2.php
@@ -9,7 +9,7 @@ class FakeInvalidController2
     private $form = null;
 
     /**
-     * @FormValidation(form="form")
+     * @FormValidation
      */
     public function createAction()
     {

diff --git a/tests/Fake/FakeInvalidInstanceController.php b/tests/Fake/FakeInvalidInstanceController.php
@@ -9,7 +9,7 @@ class FakeInvalidInstanceController
     private $form;
 
     /**
-     * @FormValidation(form="form")
+     * @FormValidation
      */
     public function createAction()
     {