[OptionsResolver] Implemented fluid interface

symfony · May 14, 2012 · 876fd9b · 876fd9b
1 parent 95454f5
commit 876fd9b
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 0 deletions.
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -63,13 +63,17 @@ public function __construct()
      *
      *                                 - function (Options $options)
      *                                 - function (Options $options, $previousValue)
+     *
+     * @return OptionsResolver The resolver instance.
      */
     public function setDefaults(array $defaultValues)
     {
         foreach ($defaultValues as $option => $value) {
             $this->defaultOptions[$option] = $value;
             $this->knownOptions[$option] = true;
         }
+
+        return $this;
     }
 
     /**
@@ -85,6 +89,8 @@ public function setDefaults(array $defaultValues)
      *                             of the following signature:
      *
      *                                 - function (Options $options)
+     *
+     * @return OptionsResolver The resolver instance.
      */
     public function replaceDefaults(array $defaultValues)
     {
@@ -93,6 +99,8 @@ public function replaceDefaults(array $defaultValues)
             $this->defaultOptions[$option] = $value;
             $this->knownOptions[$option] = true;
         }
+
+        return $this;
     }
 
     /**
@@ -105,6 +113,8 @@ public function replaceDefaults(array $defaultValues)
      *
      * @param  array $optionNames  A list of option names.
      *
+     * @return OptionsResolver The resolver instance.
+     *
      * @throws OptionDefinitionException  When trying to pass default values.
      */
     public function setOptional(array $optionNames)
@@ -116,6 +126,8 @@ public function setOptional(array $optionNames)
 
             $this->knownOptions[$option] = true;
         }
+
+        return $this;
     }
 
     /**
@@ -125,6 +137,8 @@ public function setOptional(array $optionNames)
      *
      * @param  array $optionNames  A list of option names.
      *
+     * @return OptionsResolver The resolver instance.
+     *
      * @throws OptionDefinitionException  When trying to pass default values.
      */
     public function setRequired(array $optionNames)
@@ -137,6 +151,8 @@ public function setRequired(array $optionNames)
             $this->knownOptions[$option] = true;
             $this->requiredOptions[$option] = true;
         }
+
+        return $this;
     }
 
     /**
@@ -146,6 +162,8 @@ public function setRequired(array $optionNames)
      *                             with values acceptable for that option as
      *                             values.
      *
+     * @return OptionsResolver The resolver instance.
+     *
      * @throws InvalidOptionsException If an option has not been defined for
      *                                 which an allowed value is set.
      */
@@ -154,6 +172,8 @@ public function setAllowedValues(array $allowedValues)
         $this->validateOptionNames(array_keys($allowedValues));
 
         $this->allowedValues = array_replace($this->allowedValues, $allowedValues);
+
+        return $this;
     }
 
     /**
@@ -165,6 +185,8 @@ public function setAllowedValues(array $allowedValues)
      *                             with values acceptable for that option as
      *                             values.
      *
+     * @return OptionsResolver The resolver instance.
+     *
      * @throws InvalidOptionsException If an option has not been defined for
      *                                 which an allowed value is set.
      */
@@ -173,6 +195,8 @@ public function addAllowedValues(array $allowedValues)
         $this->validateOptionNames(array_keys($allowedValues));
 
         $this->allowedValues = array_merge_recursive($this->allowedValues, $allowedValues);
+
+        return $this;
     }
 
     /**

diff --git a/src/Symfony/Component/OptionsResolver/Tests/OptionResolverTest.php b/src/Symfony/Component/OptionsResolver/Tests/OptionResolverTest.php
@@ -292,4 +292,23 @@ public function testSetOptionalFailsIfDefaultIsPassed()
             'one' => '1',
         ));
     }
+
+    public function testFluidInterface()
+    {
+        $this->resolver->setDefaults(array('one' => '1'))
+            ->replaceDefaults(array('one' => '2'))
+            ->setAllowedValues(array('one' => array('1', '2')))
+            ->addAllowedValues(array('one' => array('3')))
+            ->setRequired(array('two'))
+            ->setOptional(array('three'));
+
+        $options = array(
+            'two' => '2',
+        );
+
+        $this->assertEquals(array(
+            'one' => '2',
+            'two' => '2',
+        ), $this->resolver->resolve($options));
+    }
 }