Remove RulesProviderInterface from rules (#571)

Co-authored-by: Alexey Rogachev <arogachev90@gmail.com>
yiisoft · Feb 20, 2023 · c89a4d7 · c89a4d7
1 parent 3420c01
commit c89a4d7
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 10 deletions.
diff --git a/src/Rule/Composite.php b/src/Rule/Composite.php
@@ -14,7 +14,6 @@
 use Yiisoft\Validator\Rule\Trait\WhenTrait;
 use Yiisoft\Validator\Helper\RulesDumper;
 use Yiisoft\Validator\RuleInterface;
-use Yiisoft\Validator\RulesProviderInterface;
 use Yiisoft\Validator\RuleWithOptionsInterface;
 use Yiisoft\Validator\SkipOnEmptyInterface;
 use Yiisoft\Validator\SkipOnErrorInterface;
@@ -78,7 +77,6 @@ class Composite implements
     SkipOnEmptyInterface,
     SkipOnErrorInterface,
     WhenInterface,
-    RulesProviderInterface,
     AfterInitAttributeEventInterface
 {
     use SkipOnEmptyTrait;

diff --git a/src/Rule/Each.php b/src/Rule/Each.php
@@ -17,7 +17,6 @@
 use Yiisoft\Validator\Rule\Trait\WhenTrait;
 use Yiisoft\Validator\RuleInterface;
 use Yiisoft\Validator\Helper\RulesDumper;
-use Yiisoft\Validator\RulesProviderInterface;
 use Yiisoft\Validator\RuleWithOptionsInterface;
 use Yiisoft\Validator\SkipOnEmptyInterface;
 use Yiisoft\Validator\SkipOnErrorInterface;
@@ -67,7 +66,6 @@ final class Each implements
     SkipOnEmptyInterface,
     SkipOnErrorInterface,
     WhenInterface,
-    RulesProviderInterface,
     PropagateOptionsInterface,
     AfterInitAttributeEventInterface
 {

diff --git a/src/Rule/StopOnError.php b/src/Rule/StopOnError.php
@@ -14,7 +14,6 @@
 use Yiisoft\Validator\Rule\Trait\WhenTrait;
 use Yiisoft\Validator\Helper\RulesDumper;
 use Yiisoft\Validator\RuleInterface;
-use Yiisoft\Validator\RulesProviderInterface;
 use Yiisoft\Validator\RuleWithOptionsInterface;
 use Yiisoft\Validator\SkipOnEmptyInterface;
 use Yiisoft\Validator\SkipOnErrorInterface;
@@ -51,7 +50,6 @@ final class StopOnError implements
     SkipOnEmptyInterface,
     SkipOnErrorInterface,
     WhenInterface,
-    RulesProviderInterface,
     AfterInitAttributeEventInterface
 {
     use SkipOnEmptyTrait;

diff --git a/tests/Rule/Base/RuleWithProvidedRulesTrait.php b/tests/Rule/Base/RuleWithProvidedRulesTrait.php
@@ -8,7 +8,6 @@
 use Yiisoft\Validator\Rule\Number;
 use Yiisoft\Validator\Rule\Required;
 use Yiisoft\Validator\RuleInterface;
-use Yiisoft\Validator\RulesProviderInterface;
 use Yiisoft\Validator\RuleWithOptionsInterface;
 
 trait RuleWithProvidedRulesTrait
@@ -24,7 +23,6 @@ private function testGetOptionsWithNotRuleInternal($ruleClassName): void
             new Number(min: 1),
         ]);
         $this->assertInstanceOf(RuleWithOptionsInterface::class, $rule);
-        $this->assertInstanceOf(RulesProviderInterface::class, $rule);
 
         $this->expectException(InvalidArgumentException::class);
 

diff --git a/tests/Rule/EachTest.php b/tests/Rule/EachTest.php
@@ -180,6 +180,11 @@ public function dataValidationFailed(): array
                 [new Each([new Number(max: 13)], incorrectInputMessage: 'Custom incorrect input message.')],
                 ['' => ['Custom incorrect input message.']],
             ],
+            'custom incorrect input message, plain Each rule' => [
+                1,
+                new Each([new Number(max: 13)], incorrectInputMessage: 'Custom incorrect input message.'),
+                ['' => ['Custom incorrect input message.']],
+            ],
             'custom incorrect input message with parameters' => [
                 1,
                 [new Each([new Number(max: 13)], incorrectInputMessage: 'Attribute - {attribute}, type - {type}.')],

diff --git a/tests/Rule/NestedTest.php b/tests/Rule/NestedTest.php
@@ -30,7 +30,6 @@
 use Yiisoft\Validator\Tests\Rule\Base\DifferentRuleInHandlerTestTrait;
 use Yiisoft\Validator\Tests\Rule\Base\RuleTestCase;
 use Yiisoft\Validator\Tests\Rule\Base\RuleWithOptionsTestTrait;
-use Yiisoft\Validator\Tests\Rule\Base\RuleWithProvidedRulesTrait;
 use Yiisoft\Validator\Tests\Rule\Base\SkipOnErrorTestTrait;
 use Yiisoft\Validator\Tests\Rule\Base\WhenTestTrait;
 use Yiisoft\Validator\Tests\Support\Data\EachNestedObjects\Foo;
@@ -49,7 +48,6 @@ final class NestedTest extends RuleTestCase
 {
     use DifferentRuleInHandlerTestTrait;
     use RuleWithOptionsTestTrait;
-    use RuleWithProvidedRulesTrait;
     use SkipOnErrorTestTrait;
     use WhenTestTrait;
 

diff --git a/tests/Rule/StopOnErrorTest.php b/tests/Rule/StopOnErrorTest.php
@@ -121,6 +121,14 @@ public function dataValidationFailed(): array
                 ],
                 ['' => ['This value must contain at most 1 character.']],
             ],
+            'basic, plain StopOnError rule' => [
+                'hello',
+                new StopOnError([
+                    new Length(min: 10),
+                    new Length(max: 1),
+                ]),
+                ['' => ['This value must contain at least 10 characters.']],
+            ],
             'combined with other top level rules' => [
                 'hello',
                 [