Simplified checks for array and traversable values

BitScout · Oct 8, 2019 · 90c9e07 · 90c9e07
1 parent f06a91b
commit 90c9e07
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Admin/AbstractAdmin.php b/src/Admin/AbstractAdmin.php
@@ -3029,7 +3029,7 @@ protected function buildForm()
 
             $value = $propertyAccessor->getValue($object, $propertyPath);
 
-            if (\is_array($value) || ($value instanceof \Traversable && $value instanceof \ArrayAccess)) {
+            if (\is_array($value) || $value instanceof \ArrayAccess) {
                 $value[] = $parent;
                 $propertyAccessor->setValue($object, $propertyPath, $value);
             } else {

diff --git a/src/Form/Type/ChoiceFieldMaskType.php b/src/Form/Type/ChoiceFieldMaskType.php
@@ -32,7 +32,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         $sanitizedMap = [];
         $allFieldNames = [];
         foreach ($options['map'] as $value => $fieldNames) {
-            if (\is_array($fieldNames) || $fieldNames instanceof \Traversable) {
+            if (is_iterable($fieldNames)) {
                 foreach ($fieldNames as $fieldName) {
                     $sanitizedFieldName = str_replace(['__', '.'], ['____', '__'], $fieldName);
                     $sanitizedMap[$value][] = $sanitizedFieldName;