Merge pull request #22 from PackageFactory/bugfix/handleArrayAccessIn…

…DataStructureValidatorGracefully BUGFIX: Handle ArrayAccess in DataStructure validator gracefully
PackageFactory · Jan 12, 2023 · a94ac42 · a94ac42
2 parents c42e26a + 22b02f8
commit a94ac42
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/Classes/Validators/DataStructureValidator.php b/Classes/Validators/DataStructureValidator.php
@@ -37,11 +37,7 @@ protected function isValid($value)
             $result = $this->getResult() ?: new Result();
             foreach ($this->options['dataStructure'] as $key => $subValidator) {
                 if (is_array($value) || ($value instanceof \ArrayAccess)) {
-                    if (array_key_exists($key, $value)) {
-                        $subValue = $value[$key];
-                    } else {
-                        $subValue = null;
-                    }
+                    $subValue = $value[$key] ?? null;
                 } elseif (ObjectAccess::isPropertyGettable($value, $key)) {
                     $subValue = ObjectAccess::getPropertyPath($value, $key);
                 } else {

diff --git a/Classes/Validators/ShapeValidator.php b/Classes/Validators/ShapeValidator.php
@@ -37,11 +37,7 @@ protected function isValid($value)
             $result = $this->getResult() ?: new Result();
             foreach ($this->options['shape'] as $key => $subValidator) {
                 if (is_array($value) || ($value instanceof \ArrayAccess)) {
-                    if (array_key_exists($key, $value)) {
-                        $subValue = $value[$key];
-                    } else {
-                        $subValue = null;
-                    }
+                    $subValue = $value[$key] ?? null;
                 } elseif (ObjectAccess::isPropertyGettable($value, $key)) {
                     $subValue = ObjectAccess::getPropertyPath($value, $key);
                 } else {