Consider missing attribute in context validation (#557)

vjik · samdark · arogachev · web-flow · commit b35780cbedb2 · 2023-02-14T08:16:00.000+03:00
Co-authored-by: Alexander Makarov &lt;sam@rmcreative.ru&gt;
Co-authored-by: Alexey Rogachev &lt;arogachev90@gmail.com&gt;
diff --git a/src/ValidationContext.php b/src/ValidationContext.php
@@ -53,6 +53,11 @@ final class ValidationContext
      */
     private ?AttributeTranslatorInterface $defaultAttributeTranslator = null;
 
+    /**
+     * @var bool Whether {@see $dataSet} is missing.
+     */
+    private bool $isDataSetMissing = false;
+
     /**
      * @param array $parameters Arbitrary parameters.
      * @param AttributeTranslatorInterface|null $attributeTranslator Optional attribute translator instance to use.
@@ -127,11 +132,15 @@ public function validate(mixed $data, callable|iterable|object|string|null $rule
 
         $currentDataSet = $this->dataSet;
         $currentAttribute = $this->attribute;
+        $isCurrentDataSetMissing = $this->isDataSetMissing;
 
+        // The lack of an attribute means that in the context of further validation there is no data set at all.
+        $this->isDataSetMissing = $this->isAttributeMissing();
         $result = $this->validator->validate($data, $rules, $this);
 
         $this->dataSet = $currentDataSet;
         $this->attribute = $currentAttribute;
+        $this->isDataSetMissing = $isCurrentDataSetMissing;
 
         return $result;
     }
@@ -262,7 +271,8 @@ public function setParameter(string $name, mixed $value): self
      */
     public function isAttributeMissing(): bool
     {
-        return $this->attribute !== null && !$this->getDataSet()->hasAttribute($this->attribute);
+        return $this->isDataSetMissing
+            || ($this->attribute !== null && !$this->getDataSet()->hasAttribute($this->attribute));
     }
 
     /**
diff --git a/tests/Rule/StopOnErrorTest.php b/tests/Rule/StopOnErrorTest.php
@@ -6,6 +6,7 @@
 
 use Yiisoft\Validator\Rule\Length;
 use Yiisoft\Validator\Rule\Number;
+use Yiisoft\Validator\Rule\Required;
 use Yiisoft\Validator\Rule\StopOnError;
 use Yiisoft\Validator\Rule\StopOnErrorHandler;
 use Yiisoft\Validator\Tests\Rule\Base\DifferentRuleInHandlerTestTrait;
@@ -128,6 +129,19 @@ public function dataValidationFailed(): array
                     ],
                 ],
             ],
+            'case4' => [
+                ['b' => null],
+                [
+                    'a' => new StopOnError([
+                        new Required(),
+                    ]),
+                    'b' => new Required(),
+                ],
+                [
+                    'a' => ['Value not passed.'],
+                    'b' => ['Value cannot be blank.'],
+                ],
+            ],
         ];
     }
 
