reset constraint options

ro0NL · ro0NL · commit 4c6ddd4737a5 · 2016-10-01T21:36:38.000Z
diff --git a/src/Symfony/Component/Validator/Constraint.php b/src/Symfony/Component/Validator/Constraint.php
@@ -129,6 +129,9 @@ public function __construct($options = null)
             unset($options['value']);
         }
 
+        if (is_array($options)) {
+            reset($options);
+        }
         if (is_array($options) && count($options) > 0 && is_string(key($options))) {
             foreach ($options as $option => $value) {
                 if (array_key_exists($option, $knownOptions)) {
diff --git a/src/Symfony/Component/Validator/Tests/ConstraintTest.php b/src/Symfony/Component/Validator/Tests/ConstraintTest.php
@@ -206,4 +206,35 @@ public function testGetErrorNameForUnknownCode()
     {
         Constraint::getErrorName(1);
     }
+
+    public function testOptionsAsDefaultOption()
+    {
+        $constraint = new ConstraintA($options = array('value1'));
+
+        $this->assertEquals($options, $constraint->property2);
+
+        $constraint = new ConstraintA($options = array('value1', 'property1' => 'value2'));
+
+        $this->assertEquals($options, $constraint->property2);
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Validator\Exception\InvalidOptionsException
+     * @expectedExceptionMessage The options "0", "5" do not exist
+     */
+    public function testInvalidOptions()
+    {
+        new ConstraintA(array('property2' => 'foo', 'bar', 5 => 'baz'));
+    }
+
+    public function testOptionsWithInvalidInternalPointer()
+    {
+        $options = array('property1' => 'foo');
+        next($options);
+        next($options);
+
+        $constraint = new ConstraintA($options);
+
+        $this->assertEquals('foo', $constraint->property1);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -129,6 +129,9 @@ public function __construct($options = null)`
`129`	`129`	`unset($options['value']);`
`130`	`130`	`}`
`131`	`131`
	`132`	`+ if (is_array($options)) {`
	`133`	`+ reset($options);`
	`134`	`+ }`
`132`	`135`	`if (is_array($options) && count($options) > 0 && is_string(key($options))) {`
`133`	`136`	`foreach ($options as $option => $value) {`
`134`	`137`	`if (array_key_exists($option, $knownOptions)) {`