use default annotation method property

ray-di · Sep 16, 2015 · 142eb88 · 142eb88
1 parent b06d3e0
commit 142eb88
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/tests/Fake/FakeController.php b/tests/Fake/FakeController.php
@@ -24,7 +24,7 @@ public function setForm(FormInterface $form)
 
     /**
      * @FormValidation
-     * 
+     *
      * = is same as @ FormValidation(form="form", onFailure="createActionValidationFailed")
      */
     public function createAction($name)

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()
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ public function setForm(FormInterface $form) @@
         /**
          * @FormValidation
-         *
+         *
          * = is same as @ FormValidation(form="form", onFailure="createActionValidationFailed")
          */
         public function createAction($name)
@@ Expand Down @@