[OptionsResolver] Made the OptionsResolver clonable

webmozart · webmozart · commit a924dabd57b4 · 2012-07-12T19:13:45.000+02:00
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -67,6 +67,14 @@ public function __construct()
         $this->defaultOptions = new Options();
     }
 
+    /**
+     * Clones the resolver.
+     */
+    public function __clone()
+    {
+        $this->defaultOptions = clone $this->defaultOptions;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -210,7 +218,7 @@ public function isRequired($option)
     /**
      * {@inheritdoc}
      */
-    public function resolve(array $options)
+    public function resolve(array $options = array())
     {
         $this->validateOptionsExistence($options);
         $this->validateOptionsCompleteness($options);
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php b/src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php
@@ -206,5 +206,5 @@ public function isRequired($option);
      * @throws Exception\OptionDefinitionException If a cyclic dependency is detected
      *                                             between two lazy options.
      */
-    public function resolve(array $options);
+    public function resolve(array $options = array());
 }
diff --git a/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php b/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
@@ -612,4 +612,25 @@ public function testResolveSucceedsIfOptionRequiredAndValueAllowed()
 
         $this->assertEquals($options, $this->resolver->resolve($options));
     }
+
+    public function testClone()
+    {
+        $this->resolver->setDefaults(array('one' => '1'));
+
+        $clone = clone $this->resolver;
+
+        // Changes after cloning don't affect each other
+        $this->resolver->setDefaults(array('two' => '2'));
+        $clone->setDefaults(array('three' => '3'));
+
+        $this->assertEquals(array(
+            'one' => '1',
+            'two' => '2',
+        ), $this->resolver->resolve());
+
+        $this->assertEquals(array(
+            'one' => '1',
+            'three' => '3',
+        ), $clone->resolve());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -206,5 +206,5 @@ public function isRequired($option);`
`206`	`206`	`* @throws Exception\OptionDefinitionException If a cyclic dependency is detected`
`207`	`207`	`* between two lazy options.`
`208`	`208`	`*/`
`209`		`- public function resolve(array $options);`
	`209`	`+ public function resolve(array $options = array());`
`210`	`210`	`}`