Added array type-hint and return early when types have errors

pierredup · pierredup · commit 897081a8adf3 · 2017-09-26T23:14:26.000+02:00
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -893,12 +893,12 @@ public function offsetGet($option)
      *
      * @return bool
      */
-    private function verifyTypes($type, $value, &$invalidTypes = array())
+    private function verifyTypes($type, $value, array &$invalidTypes = array())
     {
         if ('[]' === substr($type, -2) && is_array($value)) {
             $originalType = $type;
             $type = substr($type, 0, -2);
-            $invalidValues = array_filter( // Filter out valid values, keeping invalid values in the resulting arrays
+            $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;
@@ -910,6 +910,8 @@ function ($value) use ($type) {
             }
 
             $invalidTypes[] = $this->formatTypeOf($value, $originalType);
+
+            return false;
         }
 
         if ((function_exists($isFunction = 'is_'.$type) && $isFunction($value)) || $value instanceof $type) {
@@ -919,6 +921,8 @@ function ($value) use ($type) {
         if (!$invalidTypes) {
             $invalidTypes[] = $this->formatTypeOf($value, null);
         }
+
+        return false;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -893,12 +893,12 @@ public function offsetGet($option)`
`893`	`893`	`*`
`894`	`894`	`* @return bool`
`895`	`895`	`*/`
`896`		`- private function verifyTypes($type, $value, &$invalidTypes = array())`
	`896`	`+ private function verifyTypes($type, $value, array &$invalidTypes = array())`
`897`	`897`	`{`
`898`	`898`	`if ('[]' === substr($type, -2) && is_array($value)) {`
`899`	`899`	`$originalType = $type;`
`900`	`900`	`$type = substr($type, 0, -2);`
`901`		`- $invalidValues = array_filter( // Filter out valid values, keeping invalid values in the resulting arrays`
	`901`	`+ $invalidValues = array_filter( // Filter out valid values, keeping invalid values in the resulting array`
`902`	`902`	`$value,`
`903`	`903`	`function ($value) use ($type) {`
`904`	`904`	`return (function_exists($isFunction = 'is_'.$type) && !$isFunction($value)) \|\| !$value instanceof $type;`
`@@ -910,6 +910,8 @@ function ($value) use ($type) {`
`910`	`910`	`}`
`911`	`911`
`912`	`912`	`$invalidTypes[] = $this->formatTypeOf($value, $originalType);`
	`913`	`+`
	`914`	`+ return false;`
`913`	`915`	`}`
`914`	`916`
`915`	`917`	`if ((function_exists($isFunction = 'is_'.$type) && $isFunction($value)) \|\| $value instanceof $type) {`
`@@ -919,6 +921,8 @@ function ($value) use ($type) {`
`919`	`921`	`if (!$invalidTypes) {`
`920`	`922`	`$invalidTypes[] = $this->formatTypeOf($value, null);`
`921`	`923`	`}`
	`924`	`+`
	`925`	`+ return false;`
`922`	`926`	`}`
`923`	`927`
`924`	`928`	`/**`