Delegate to InputInterface::isValid when data not exists

Author: Maks3w

src/BaseInputFilter.php

@@ -259,36 +259,6 @@ protected function validateInputs(array $inputs, $data = [], $context = null)
                 continue;
             }
 
-            $hasFallback = ($input instanceof Input && $input->hasFallback());
-
-            // If the value is required, not present in the data set, and
-            // has no fallback, validation fails.
-            if (!array_key_exists($name, $data)
-                && $input->isRequired()
-                && !$hasFallback
-            ) {
-                $input->setErrorMessage('Value is required');
-                $this->invalidInputs[$name] = $input;
-
-                if ($input->breakOnFailure()) {
-                    return false;
-                }
-
-                $valid = false;
-                continue;
-            }
-
-            // If the value is required, not present in the data set, and
-            // has a fallback, validation passes, and we set the input
-            // value to the fallback.
-            if (!array_key_exists($name, $data)
-                && $input->isRequired()
-                && $hasFallback
-            ) {
-                $input->setValue($input->getFallbackValue());
-                continue;
-            }
-
             // Make sure we have a value (empty) for validation of context
             if (!array_key_exists($name, $data)) {
                 $data[$name] = null;
@@ -543,7 +513,7 @@ protected function populate()
                 $input->clearRawValues();
             }
 
-            if (!isset($this->data[$name])) {
+            if (!array_key_exists($name, $this->data)) {
                 // No value; clear value in this input
                 if ($input instanceof InputFilterInterface) {
                     $input->setData([]);
@@ -555,6 +525,11 @@ protected function populate()
                     continue;
                 }
 
+                if ($input instanceof Input) {
+                    $input->resetValue();
+                    continue;
+                }
+
                 $input->setValue(null);
                 continue;
             }

src/Input.php

@@ -371,11 +371,22 @@ public function merge(InputInterface $input)
     public function isValid($context = null)
     {
         $value           = $this->getValue();
+        $hasValue        = $this->hasValue();
         $empty           = ($value === null || $value === '' || $value === []);
         $required        = $this->isRequired();
         $allowEmpty      = $this->allowEmpty();
         $continueIfEmpty = $this->continueIfEmpty();
 
+        if (! $hasValue && $required && ! $this->hasFallback()) {
+            $this->setErrorMessage('Value is required');
+            return false;
+        }
+
+        if (! $hasValue && $required && $this->hasFallback()) {
+            $this->setValue($this->getFallbackValue());
+            return true;
+        }
+
         if ($empty && ! $required && ! $continueIfEmpty) {
             return true;
         }