Fix options resolver with array allowed types

mcg-web · mcg-web · commit 1e46b191f4c5 · 2018-01-11T08:52:35.000+01:00
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -883,7 +883,7 @@ private function verifyTypes($type, $value, array &$invalidTypes)
             $invalidValues = array_filter( // Filter out valid values, keeping invalid values in the resulting array
                 $value,
                 function ($value) use ($type) {
-                    return (function_exists($isFunction = 'is_'.$type) && !$isFunction($value)) || !$value instanceof $type;
+                    return !self::isValueValidType($type, $value);
                 }
             );
 
@@ -896,7 +896,7 @@ function ($value) use ($type) {
             return false;
         }
 
-        if ((function_exists($isFunction = 'is_'.$type) && $isFunction($value)) || $value instanceof $type) {
+        if (self::isValueValidType($type, $value)) {
             return true;
         }
 
@@ -1073,4 +1073,9 @@ private function formatValues(array $values)
 
         return implode(', ', $values);
     }
+
+    private static function isValueValidType($type, $value)
+    {
+        return (function_exists($isFunction = 'is_'.$type) && $isFunction($value)) || $value instanceof $type;
+    }
 }
diff --git a/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php b/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
@@ -486,6 +486,15 @@ public function testSetAllowedTypesFailsIfUnknownOption()
         $this->resolver->setAllowedTypes('foo', 'string');
     }
 
+    public function testResolveTypedArray()
+    {
+        $this->resolver->setDefined('foo');
+        $this->resolver->setAllowedTypes('foo', 'string[]');
+        $options = $this->resolver->resolve(['foo' => ['bar', 'baz']]);
+
+        $this->assertSame(['foo' => ['bar', 'baz']], $options);
+    }
+
     /**
      * @expectedException \Symfony\Component\OptionsResolver\Exception\AccessException
      */

Original file line number	Diff line number	Diff line change
`@@ -883,7 +883,7 @@ private function verifyTypes($type, $value, array &$invalidTypes)`
`883`	`883`	`$invalidValues = array_filter( // Filter out valid values, keeping invalid values in the resulting array`
`884`	`884`	`$value,`
`885`	`885`	`function ($value) use ($type) {`
`886`		`- return (function_exists($isFunction = 'is_'.$type) && !$isFunction($value)) \|\| !$value instanceof $type;`
	`886`	`+ return !self::isValueValidType($type, $value);`
`887`	`887`	`}`
`888`	`888`	`);`
`889`	`88 8000 9`
`@@ -896,7 +896,7 @@ function ($value) use ($type) {`
`896`	`896`	`return false;`
`897`	`897`	`}`
`898`	`898`
`899`		`- if ((function_exists($isFunction = 'is_'.$type) && $isFunction($value)) \|\| $value instanceof $type) {`
	`899`	`+ if (self::isValueValidType($type, $value)) {`
`900`	`900`	`return true;`
`901`	`901`	`}`
`902`	`902`
`@@ -1073,4 +1073,9 @@ private function formatValues(array $values)`
`1073`	`1073`
`1074`	`1074`	`return implode(', ', $values);`
`1075`	`1075`	`}`
	`1076`	`+`
	`1077`	`+ private static function isValueValidType($type, $value)`
	`1078`	`+ {`
	`1079`	`+ return (function_exists($isFunction = 'is_'.$type) && $isFunction($value)) \|\| $value instanceof $type;`
	`1080`	`+ }`
`1076`	`1081`	`}`