merged branch Tobion/patch-2 (PR #5240)

fabpot · fabpot · commit bef34bda6752 · 2012-08-25T19:04:51.000+02:00
Commits ------- 9e5d5a4 [Form] fix static method call Discussion ---------- [Form] fix static method call `allowDataWalking` was called statically, but wasnt defined as such.
diff --git a/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php b/src/Symfony/Component/Form/Extension/Validator/Constraints/FormValidator.php
@@ -53,7 +53,7 @@ public function validate($form, Constraint $constraint)
             // Validate the form data only if transformation succeeded
             $path = $this->context->getPropertyPath();
             $graphWalker = $this->context->getGraphWalker();
-            $groups = $this->getValidationGroups($form);
+            $groups = self::getValidationGroups($form);
 
             if (!empty($path)) {
                 $path .= '.';
@@ -126,7 +126,7 @@ public function validate($form, Constraint $constraint)
      *
      * @return Boolean Whether the graph walker may walk the data.
      */
-    private function allowDataWalking(FormInterface $form)
+    private static function allowDataWalking(FormInterface $form)
     {
         $data = $form->getData();
 
@@ -158,7 +158,7 @@ private function allowDataWalking(FormInterface $form)
      *
      * @return array The validation groups.
      */
-    private function getValidationGroups(FormInterface $form)
+    private static function getValidationGroups(FormInterface $form)
     {
         do {
             $groups = $form->getConfig()->getOption('validation_groups');

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function validate($form, Constraint $constraint)`
`53`	`53`	`// Validate the form data only if transformation succeeded`
`54`	`54`	`$path = $this->context->getPropertyPath();`
`55`	`55`	`$graphWalker = $this->context->getGraphWalker();`
`56`		`- $groups = $this->getValidationGroups($form);`
	`56`	`+ $groups = self::getValidationGroups($form);`
`57`	`57`
`58`	`58`	`if (!empty($path)) {`
`59`	`59`	`$path .= '.';`
`@@ -126,7 +126,7 @@ public function validate($form, Constraint $constraint)`
`126`	`126`	`*`
`127`	`127`	`* @return Boolean Whether the graph walker may walk the data.`
`128`	`128`	`*/`
`129`		`- private function allowDataWalking(FormInterface $form)`
	`129`	`+ private static function allowDataWalking(FormInterface $form)`
`130`	`130`	`{`
`131`	`131`	`$data = $form->getData();`
`132`	`132`
`@@ -158,7 +158,7 @@ private function allowDataWalking(FormInterface $form)`
`158`	`158`	`*`
`159`	`159`	`* @return array The validation groups.`
`160`	`160`	`*/`
`161`		`- private function getValidationGroups(FormInterface $form)`
	`161`	`+ private static function getValidationGroups(FormInterface $form)`
`162`	`162`	`{`
`163`	`163`	`do {`
`164`	`164`	`$groups = $form->getConfig()->getOption('validation_groups');`