diff --git a/Classes/Validators/DataStructureValidator.php b/Classes/Validators/DataStructureValidator.php index 1a5eec6..de1ad28 100644 --- 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 index b0de0c5..2a0476f 100644 --- 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 {