[Validator][Form] Removed support for match-all group "*"

The constraint "Valid" does not accept any options or groups anymore. As per JSR303 1.0 final, section 3.5.1 "Object graph validation" (page 39), properties annotated with valid should be cascaded independent of the current group (i.e. always). Thus the group "*" is not necessary anymore and was removed from the "Valid" constraint in the Form validation.xml.
symfony · Nov 17, 2010 · dbb8a94 · dbb8a94
1 parent a4e62a0
commit dbb8a94
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 61 deletions.
diff --git a/Constraint.php b/Constraint.php
@@ -30,7 +30,7 @@ abstract class Constraint
 {
     const DEFAULT_GROUP = 'Default';
 
-    public $groups = self::DEFAULT_GROUP;
+    public $groups = array(self::DEFAULT_GROUP);
 
     /**
      * Initializes the constraint with options.

diff --git a/Constraints/Valid.php b/Constraints/Valid.php
@@ -11,8 +11,21 @@
  * with this source code in the file LICENSE.
  */
 
+use Symfony\Component\Validator\Exception\InvalidOptionsException;
+
 class Valid extends \Symfony\Component\Validator\Constraint
 {
-    public $message = 'This value should be instance of class {{ class }}';
-    public $class;
+    /**
+     * This constraint does not accept any options
+     *
+     * @param  mixed $options           Unsupported argument!
+     *
+     * @throws InvalidOptionsException  When the parameter $options is not NULL
+     */
+    public function __construct($options = null)
+    {
+        if (null !== $options) {
+            throw new InvalidOptionsException('The constraint Valid does not accept any options');
+        }
+    }
 }
diff --git a/Constraints/ValidValidator.php b/Constraints/ValidValidator.php
diff --git a/GraphWalker.php b/GraphWalker.php
@@ -76,6 +76,26 @@ protected function walkMember(MemberMetadata $metadata, $value, $group, $propert
         foreach ($metadata->findConstraints($group) as $constraint) {
             $this->walkConstraint($constraint, $value, $group, $propertyPath);
         }
+
+        if ($metadata->isCascaded()) {
+            $this->walkReference($value, $group, $propertyPath);
+        }
+    }
+
+    protected function walkReference($value, $group, $propertyPath)
+    {
+        if (null !== $value) {
+            if (is_array($value)) {
+                foreach ($value as $key => $element) {
+                    $this->walkReference($element, $group, $propertyPath.'['.$key.']');
+                }
+            } else if (!is_object($value)) {
+                throw new UnexpectedTypeException($value, 'object or array');
+            } else {
+                $metadata = $this->metadataFactory->getClassMetadata(get_class($value));
+                $this->walkClass($metadata, $value, $group, $propertyPath);
+            }
+        }
     }
 
     public function walkConstraint(Constraint $constraint, $value, $group, $propertyPath)

diff --git a/Mapping/ClassMetadata.php b/Mapping/ClassMetadata.php
@@ -12,7 +12,8 @@
  */
 
 use Symfony\Component\Validator\Constraint;
-use Symfony\Component\Validator\Exception\ValidatorException;
+use Symfony\Component\Validator\Constraints\Valid;
+use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
 
 class ClassMetadata extends ElementMetadata
 {
@@ -77,6 +78,10 @@ public function getShortClassName()
      */
     public function addConstraint(Constraint $constraint)
     {
+        if ($constraint instanceof Valid) {
+            throw new ConstraintDefinitionException('The constraint Valid can only be put on properties or getters');
+        }
+
         $constraint->addImplicitGroupName($this->getShortClassName());
 
         parent::addConstraint($constraint);

diff --git a/Mapping/ElementMetadata.php b/Mapping/ElementMetadata.php
@@ -95,14 +95,8 @@ public function hasConstraints()
      */
     public function findConstraints($group)
     {
-        $globalConstraints  = isset($this->constraintsByGroup['*'])
-                ? $this->constraintsByGroup['*']
-                : array();
-
-        $groupConstraints   = isset($this->constraintsByGroup[$group])
+        return isset($this->constraintsByGroup[$group])
                 ? $this->constraintsByGroup[$group]
                 : array();
-
-        return array_merge((array) $globalConstraints, (array) $groupConstraints);
     }
 }
diff --git a/Mapping/MemberMetadata.php b/Mapping/MemberMetadata.php
@@ -11,13 +11,16 @@
  * with this source code in the file LICENSE.
  */
 
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\Constraints\Valid;
 use Symfony\Component\Validator\Exception\ValidatorException;
 
 abstract class MemberMetadata extends ElementMetadata
 {
     public $class;
     public $name;
     public $property;
+    public $cascaded = false;
     private $reflMember;
 
     /**
@@ -34,6 +37,20 @@ public function __construct($class, $name, $property)
         $this->property = $property;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public function addConstraint(Constraint $constraint)
+    {
+        if ($constraint instanceof Valid) {
+            $this->cascaded = true;
+        } else {
+            parent::addConstraint($constraint);
+        }
+
+        return $this;
+    }
+
     /**
      * Returns the names of the properties that should be serialized
      *
@@ -44,7 +61,8 @@ public function __sleep()
         return array_merge(parent::__sleep(), array(
             'class',
             'name',
-            'property'
+            'property',
+            'cascaded', // TESTME
         ));
     }
 
@@ -108,6 +126,16 @@ public function isPrivate()
         return $this->getReflectionMember()->isPrivate();
     }
 
+    /**
+     * Returns whether objects stored in this member should be validated
+     *
+     * @return boolean
+     */
+    public function isCascaded()
+    {
+        return $this->cascaded;
+    }
+
     /**
      * Returns the value of this property in the given object
      *