Allow giving a callback as an allowedValue to OptionsResolver

marekkalnik · marekkalnik · commit 07d1d3074e9c · 2014-01-07T10:05:19.000+01:00
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -294,8 +294,14 @@ private function validateOptionsCompleteness(array $options)
     private function validateOptionValues(array $options)
     {
         foreach ($this->allowedValues as $option => $allowedValues) {
-            if (isset($options[$option]) && !in_array($options[$option], $allowedValues, true)) {
-                throw new InvalidOptionsException(sprintf('The option "%s" has the value "%s", but is expected to be one of "%s"', $option, $options[$option], implode('", "', $allowedValues)));
+            if (isset($options[$option])) {
+                if (is_array($allowedValues) && !in_array($options[$option], $allowedValues, true)) {
+                    throw new InvalidOptionsException(sprintf('The option "%s" has the value "%s", but is expected to be one of "%s"', $option, $options[$option], implode('", "', $allowedValues)));
+                }
+
+                if (is_callable($allowedValues) && !call_user_func($allowedValues, $options[$option])) {
+                    throw new InvalidOptionsException(sprintf('The option "%s" has the value "%s", which it is not valid', $option, $options[$option]));
+                }
             }
         }
     }
diff --git a/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php b/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
@@ -658,6 +658,45 @@ public function testResolveSucceedsIfOptionRequiredAndValueAllowed()
         $this->assertEquals($options, $this->resolver->resolve($options));
     }
 
+    public function testResolveSucceedsIfValueAllowedCallbackReturnsTrue()
+    {
+        $this->resolver->setRequired(array(
+            'test',
+        ));
+        $this->resolver->setAllowedValues(array(
+            'test' => function ($value) {
+                return true;
+            },
+        ));
+
+        $options = array(
+            'test' => true,
+        );
+
+        $this->assertEquals($options, $this->resolver->resolve($options));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\OptionsResolver\Exception\InvalidOptionsException
+     */
+    public function testResolveFailsIfValueAllowedCallbackReturnsFalse()
+    {
+        $this->resolver->setRequired(array(
+            'test',
+        ));
+        $this->resolver->setAllowedValues(array(
+            'test' => function ($value) {
+                return false;
+            },
+        ));
+
+        $options = array(
+            'test' => true,
+        );
+
+        $this->assertEquals($options, $this->resolver->resolve($options));
+    }
+
     public function testClone()
     {
         $this->resolver->setDefaults(array('one' => '1'));

Original file line number	Diff line number	Diff line change
`@@ -294,8 +294,14 @@ private function validateOptionsCompleteness(array $options)`
`294`	`294`	`private function validateOptionValues(array $options)`
`295`	`295`	`{`
`296`	`296`	`foreach ($this->allowedValues as $option => $allowedValues) {`
`297`		`- if (isset($options[$option]) && !in_array($options[$option], $allowedValues, true)) {`
`298`		`- throw new InvalidOptionsException(sprintf('The option "%s" has the value "%s", but is expected to be one of "%s"', $option, $options[$option], implode('", "', $allowedValues)));`
	`297`	`+ if (isset($options[$option])) {`
	`298`	`+ if (is_array($allowedValues) && !in_array($options[$option], $allowedValues, true)) {`
	`299`	`+ throw new InvalidOptionsException(sprintf('The option "%s" has the value "%s", but is expected to be one of "%s"', $option, $options[$option], implode('", "', $allowedValues)));`
	`300`	`+ }`
	`301`	`+`
	`302`	`+ if (is_callable($allowedValues) && !call_user_func($allowedValues, $options[$option])) {`
	`303`	`+ throw new InvalidOptionsException(sprintf('The option "%s" has the value "%s", which it is not valid', $option, $options[$option]));`
	`304`	`+ }`
`299`	`305`	`}`
`300`	`306`	`}`
`301`	`307`	`}`