Take PropertyTranslatorProviderInterface into account during context validation (#776)

vjik · web-flow · commit b10c4afbd119 · 2025-07-25T15:39:58.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## 2.5.1 under development
 
-- no changes in this release.
+- Bug #776: Take `PropertyTranslatorProviderInterface` into account during context validation (@vjik)
 
 ## 2.5.0 July 19, 2025
 
diff --git a/src/Rule/Nested.php b/src/Rule/Nested.php
@@ -25,7 +25,6 @@
 use Yiisoft\Validator\RulesProviderInterface;
 use Yiisoft\Validator\SkipOnEmptyInterface;
 use Yiisoft\Validator\SkipOnErrorInterface;
-use Yiisoft\Validator\Tests\Rule\NestedTest;
 use Yiisoft\Validator\WhenInterface;
 
 use function array_pop;
diff --git a/src/ValidationContext.php b/src/ValidationContext.php
@@ -156,15 +156,20 @@ public function validate(mixed $data, callable|iterable|object|string|null $rule
         $currentProperty = $this->property;
         $isCurrentDataSetMissing = $this->isDataSetMissing;
         $currentParameters = $this->parameters;
+        $currentDefaultPropertyTranslator = $this->defaultPropertyTranslator;
 
         // The lack of a property means that in the context of further validation there is no data set at all.
         $this->isDataSetMissing = $this->isPropertyMissing();
+        if ($data instanceof PropertyTranslatorProviderInterface) {
+            $this->defaultPropertyTranslator = $data->getPropertyTranslator() ?? $currentDefaultPropertyTranslator;
+        }
         $result = $this->validator->validate($data, $rules, $this);
 
         $this->dataSet = $currentDataSet;
         $this->property = $currentProperty;
         $this->isDataSetMissing = $isCurrentDataSetMissing;
         $this->parameters = $currentParameters;
+        $this->defaultPropertyTranslator = $currentDefaultPropertyTranslator;
 
         return $result;
     }
diff --git a/tests/Rule/Nested/NestedPropertyTranslator/MainForm.php b/tests/Rule/Nested/NestedPropertyTranslator/MainForm.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Validator\Tests\Rule\Nested\NestedPropertyTranslator;
+
+use Yiisoft\Validator\Rule\Nested;
+
+final class MainForm
+{
+    public function __construct(
+        #[Nested]
+        public SubForm $sub,
+    ) {
+    }
+}
diff --git a/tests/Rule/Nested/NestedPropertyTranslator/NestedPropertyTranslatorTest.php b/tests/Rule/Nested/NestedPropertyTranslator/NestedPropertyTranslatorTest.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Validator\Tests\Rule\Nested\NestedPropertyTranslator;
+
+use PHPUnit\Framework\TestCase;
+use Yiisoft\Validator\Validator;
+
+use function PHPUnit\Framework\assertSame;
+
+final class NestedPropertyTranslatorTest extends TestCase
+{
+    public function testBase(): void
+    {
+        $form = new MainForm(new SubForm());
+        $validator = new Validator();
+
+        $result = $validator->validate($form);
+
+        assertSame(
+            ['Телефон must contain at least 5 characters.'],
+            $result->getErrorMessages()
+        );
+    }
+}
diff --git a/tests/Rule/Nested/NestedPropertyTranslator/SubForm.php b/tests/Rule/Nested/NestedPropertyTranslator/SubForm.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Validator\Tests\Rule\Nested\NestedPropertyTranslator;
+
+use Yiisoft\Validator\PropertyTranslator\ArrayPropertyTranslator;
+use Yiisoft\Validator\PropertyTranslatorInterface;
+use Yiisoft\Validator\PropertyTranslatorProviderInterface;
+use Yiisoft\Validator\Rule\Length;
+
+final class SubForm implements PropertyTranslatorProviderInterface
+{
+    #[Length(min: 5)]
+    public string $phone = '123';
+
+    public function getPropertyTranslator(): ?PropertyTranslatorInterface
+    {
+        return new ArrayPropertyTranslator([
+            'phone' => 'Телефон',
+        ]);
+    }
+}
diff --git a/tests/Rule/Nested/NestedTest.php b/tests/Rule/Nested/NestedTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Validator\Tests\Rule;
+namespace Yiisoft\Validator\Tests\Rule\Nested;
 
 use ArrayObject;
 use InvalidArgumentException;
