bug #21208 [Validator] Add object handling of invalid constraints in Composite (SenseException)

fabpot · fabpot · commit ad95227f731c · 2017-03-22T12:05:14.000-07:00
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #21208). Discussion ---------- [Validator] Add object handling of invalid constraints in Composite | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #21206 | License | MIT | Doc PR | n/a This PR fixes a minor bug described in #21206. The constraint `Symfony\Component\Validator\Constraints\Composite` doesn't check in it's exception handling if the wrongly created instance of a nested constraint is an object, which is the expected type for a constraint. Commits ------- 4bd2c22 [Validator] Add object handling of invalid constraints in Composite
diff --git a/src/Symfony/Component/Validator/Constraints/Composite.php b/src/Symfony/Component/Validator/Constraints/Composite.php
@@ -67,6 +67,10 @@ public function __construct($options = null)
 
         foreach ($nestedConstraints as $constraint) {
             if (!$constraint instanceof Constraint) {
+                if (is_object($constraint)) {
+                    $constraint = get_class($constraint);
+                }
+
                 throw new ConstraintDefinitionException(sprintf('The value %s is not an instance of Constraint in constraint %s', $constraint, get_class($this)));
             }
 
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CompositeTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CompositeTest.php
@@ -125,6 +125,17 @@ public function testFailIfNoConstraint()
         ));
     }
 
+    /**
+     * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
+     */
+    public function testFailIfNoConstraintObject()
+    {
+        new ConcreteComposite(array(
+            new NotNull(array('groups' => 'Default')),
+            new \ArrayObject(),
+        ));
+    }
+
     /**
      * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
      */

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,10 @@ public function __construct($options = null)`
`67`	`67`
`68`	`68`	`foreach ($nestedConstraints as $constraint) {`
`69`	`69`	`if (!$constraint instanceof Constraint) {`
	`70`	`+ if (is_object($constraint)) {`
	`71`	`+ $constraint = get_class($constraint);`
	`72`	`+ }`
	`73`	`+`
`70`	`74`	`throw new ConstraintDefinitionException(sprintf('The value %s is not an instance of Constraint in constraint %s', $constraint, get_class($this)));`
`71`	`75`	`}`
`72`	`76`