diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
index 86a1f7a070921..ec1989dc30627 100644
--- 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
index 2fae3575014d3..9d6f7c0248815 100644
--- 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'));
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy