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;
     }
 
     /**
