change array_filter for foreach

Doctrs · Doctrs · commit 6e9fb5b3e33c · 2018-05-31T20:43:39.000+03:00
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -882,12 +882,7 @@ private function verifyTypes($type, $value, array &$invalidTypes)
                 return true;
             }
 
-            $invalidValues = array_filter( // Filter out valid values, keeping invalid values in the resulting array
-                $value,
-                function ($value) use ($type) {
-                    return !self::isValueValidType($type, $value);
-                }
-            );
+            $invalidValues = $this->getInvalidValues($value, $type);
 
             if (!$invalidValues) {
                 return true;
@@ -937,12 +932,7 @@ private function verifyArrayType($type, array $value, array &$invalidTypes)
             return $success;
         }
 
-        $invalid = array_filter( // Filter out valid values, keeping invalid values in the resulting array
-            $value,
-            function ($value) use ($type) {
-                return !self::isValueValidType($type, $value);
-            }
-        );
+        $invalid = $this->getInvalidValues($value, $type);
 
         return !count($invalid);
     }
@@ -1118,4 +1108,22 @@ private static function isValueValidType($type, $value)
     {
         return (function_exists($isFunction = 'is_'.$type) && $isFunction($value)) || $value instanceof $type;
     }
+
+    /**
+     * @param array $arrayValues
+     *
+     * @return array
+     */
+    private function getInvalidValues(array $arrayValues, $type)
+    {
+        $invalidValues = array();
+
+        foreach($arrayValues as $key => $value) {
+            if (!self::isValueValidType($type, $value)) {
+                $invalidValues[$key] = $value;
+            }
+        }
+
+        return $invalidValues;
+    }
 }
