[OptionsResolver] Fixed Options::replace() method

webmozart · webmozart · commit 2b46975e322b · 2012-05-14T19:35:40.000+02:00
diff --git a/src/Symfony/Component/OptionsResolver/Options.php b/src/Symfony/Component/OptionsResolver/Options.php
@@ -111,8 +111,9 @@ public function replace(array $options)
         }
 
         $this->options = array();
+        
         foreach ($options as $option => $value) {
-            $this->options[$option] = $value;
+            $this->set($option, $value);
         }
     }
 
diff --git a/src/Symfony/Component/OptionsResolver/Tests/OptionsTest.php b/src/Symfony/Component/OptionsResolver/Tests/OptionsTest.php
@@ -198,4 +198,21 @@ public function testFailForCyclicDependencies()
 
         $this->options->get('foo');
     }
+
+    public function testReplaceClearsAndSets()
+    {
+        $this->options->set('one', '1');
+
+        $this->options->replace(array(
+            'two' => '2',
+            'three' => function (Options $options) {
+                return '2' === $options['two'] ? '3' : 'foo';
+            }
+        ));
+
+        $this->assertEquals(array(
+            'two' => '2',
+            'three' => '3',
+        ), $this->options->all());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -111,8 +111,9 @@ public function replace(array $options)`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`$this->options = array();`
	`114`	`+`
`114`	`115`	`foreach ($options as $option => $value) {`
`115`		`- $this->options[$option] = $value;`
	`116`	`+ $this->set($option, $value);`
`116`	`117`	`}`
`117`	`118`	`}`
`118`	`119`