Move classes RulesDumper, RuleHandlerContainer and `SimpleRuleHan…

…dlerContainer` (#454)

README.md

@@ -206,7 +206,7 @@ new Number(
 For multiple rules this can be also set more conveniently at validator level:
 
 ```php
-use Yiisoft\Validator\SimpleRuleHandlerContainer;
+use Yiisoft\Validator\RuleHandlerResolver\SimpleRuleHandlerContainer;
 use Yiisoft\Validator\Validator;
 
 $validator = new Validator(new SimpleRuleHandlerContainer(), skipOnEmpty: true);
@@ -895,7 +895,7 @@ be used.
 use Yiisoft\Di\Container;
 use Yiisoft\Di\ContainerConfig;
 use Yiisoft\Validator\RuleHandlerResolverInterface;
-use Yiisoft\Validator\RuleHandlerContainer;
+use Yiisoft\Validator\RuleHandlerResolver\RuleHandlerContainer;
 
 // Need to be defined in common.php
 $config = [

config/common.php

@@ -8,7 +8,7 @@
 use Yiisoft\Translator\Message\Php\MessageSource;
 use Yiisoft\Translator\SimpleMessageFormatter;
 use Yiisoft\Validator\RuleHandlerResolverInterface;
-use Yiisoft\Validator\SimpleRuleHandlerContainer;
+use Yiisoft\Validator\RuleHandlerResolver\SimpleRuleHandlerContainer;
 use Yiisoft\Validator\Validator;
 use Yiisoft\Validator\ValidatorInterface;
 

src/Exception/RuleHandlerInterfaceNotImplementedException.php

@@ -6,7 +6,7 @@
 
 use RuntimeException;
 use Throwable;
-use Yiisoft\Validator\RuleHandlerContainer;
+use Yiisoft\Validator\RuleHandlerResolver\RuleHandlerContainer;
 use Yiisoft\Validator\RuleHandlerInterface;
 
 /**

src/Exception/RuleHandlerNotFoundException.php

@@ -6,6 +6,7 @@
 
 use RuntimeException;
 use Throwable;
+use Yiisoft\Validator\RuleHandlerResolver\RuleHandlerContainer;
 
 /**
  * An exception used by {@see RuleHandlerContainer} for the case when a given class name was not found in the container.

src/RulesDumper.php → src/Helper/RulesDumper.php

@@ -2,9 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Validator;
+namespace Yiisoft\Validator\Helper;
 
 use InvalidArgumentException;
+use Yiisoft\Validator\RuleInterface;
+use Yiisoft\Validator\RuleWithOptionsInterface;
 
 use function is_int;
 use function is_string;

src/Rule/Composite.php

@@ -13,7 +13,7 @@
 use Yiisoft\Validator\Rule\Trait\SkipOnErrorTrait;
 use Yiisoft\Validator\Rule\Trait\WhenTrait;
 use Yiisoft\Validator\RuleInterface;
-use Yiisoft\Validator\RulesDumper;
+use Yiisoft\Validator\Helper\RulesDumper;
 use Yiisoft\Validator\RuleWithOptionsInterface;
 use Yiisoft\Validator\SkipOnEmptyInterface;
 use Yiisoft\Validator\SkipOnErrorInterface;

src/Rule/Each.php

@@ -14,7 +14,7 @@
 use Yiisoft\Validator\Rule\Trait\SkipOnErrorTrait;
 use Yiisoft\Validator\Rule\Trait\WhenTrait;
 use Yiisoft\Validator\RuleInterface;
-use Yiisoft\Validator\RulesDumper;
+use Yiisoft\Validator\Helper\RulesDumper;
 use Yiisoft\Validator\RuleWithOptionsInterface;
 use Yiisoft\Validator\SkipOnEmptyInterface;
 use Yiisoft\Validator\SkipOnErrorInterface;

src/Rule/Nested.php

@@ -17,7 +17,7 @@
 use Yiisoft\Validator\Rule\Trait\SkipOnErrorTrait;
 use Yiisoft\Validator\Rule\Trait\WhenTrait;
 use Yiisoft\Validator\RuleInterface;
-use Yiisoft\Validator\RulesDumper;
+use Yiisoft\Validator\Helper\RulesDumper;
 use Yiisoft\Validator\RulesProvider\AttributesRulesProvider;
 use Yiisoft\Validator\RulesProviderInterface;
 use Yiisoft\Validator\RuleWithOptionsInterface;

src/Rule/StopOnError.php

@@ -12,7 +12,7 @@
 use Yiisoft\Validator\Rule\Trait\SkipOnErrorTrait;
 use Yiisoft\Validator\Rule\Trait\WhenTrait;
 use Yiisoft\Validator\RuleInterface;
-use Yiisoft\Validator\RulesDumper;
+use Yiisoft\Validator\Helper\RulesDumper;
 use Yiisoft\Validator\RuleWithOptionsInterface;
 use Yiisoft\Validator\SkipOnEmptyInterface;
 use Yiisoft\Validator\SkipOnErrorInterface;

src/RuleHandlerContainer.php → src/RuleHandlerResolver/RuleHandlerContainer.php

@@ -2,12 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Validator;
+namespace Yiisoft\Validator\RuleHandlerResolver;
 
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Yiisoft\Validator\Exception\RuleHandlerInterfaceNotImplementedException;
 use Yiisoft\Validator\Exception\RuleHandlerNotFoundException;
+use Yiisoft\Validator\RuleHandlerInterface;
+use Yiisoft\Validator\RuleHandlerResolverInterface;
 
 final class RuleHandlerContainer implements RuleHandlerResolverInterface
 {

src/SimpleRuleHandlerContainer.php → src/RuleHandlerResolver/SimpleRuleHandlerContainer.php

@@ -2,10 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Validator;
+namespace Yiisoft\Validator\RuleHandlerResolver;
 
 use Yiisoft\Validator\Exception\RuleHandlerInterfaceNotImplementedException;
 use Yiisoft\Validator\Exception\RuleHandlerNotFoundException;
+use Yiisoft\Validator\RuleHandlerInterface;
+use Yiisoft\Validator\RuleHandlerResolverInterface;
 
 use function array_key_exists;
 

src/RuleInterface.php

@@ -4,6 +4,8 @@
 
 namespace Yiisoft\Validator;
 
+use Yiisoft\Validator\Helper\RulesDumper;
+
 /**
  * A main interface for rules to implement. A rule contains a set of constraint configuration to apply when validating
  * data. If you want to include a rule options in addition to a rule name during conversion to array, use extended

src/Validator.php

@@ -16,6 +16,7 @@
 use Yiisoft\Validator\Helper\DataSetNormalizer;
 use Yiisoft\Validator\Helper\RulesNormalizer;
 use Yiisoft\Validator\Helper\SkipOnEmptyNormalizer;
+use Yiisoft\Validator\RuleHandlerResolver\SimpleRuleHandlerContainer;
 
 use function extension_loaded;
 use function is_int;

tests/ConfigTest.php

@@ -7,7 +7,7 @@
 use Yiisoft\Translator\CategorySource;
 use Yiisoft\Translator\SimpleMessageFormatter;
 use Yiisoft\Validator\RuleHandlerResolverInterface;
-use Yiisoft\Validator\SimpleRuleHandlerContainer;
+use Yiisoft\Validator\RuleHandlerResolver\SimpleRuleHandlerContainer;
 use Yiisoft\Validator\Validator;
 use Yiisoft\Validator\ValidatorInterface;
 

tests/RulesDumperTest.php → tests/Helper/RulesDumperTest.php

@@ -2,13 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Validator\Tests;
+namespace Yiisoft\Validator\Tests\Helper;
 
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 use Yiisoft\Validator\Rule\Boolean;
 use Yiisoft\Validator\Rule\Number;
-use Yiisoft\Validator\RulesDumper;
+use Yiisoft\Validator\Helper\RulesDumper;
 use Yiisoft\Validator\Tests\Support\Data\IteratorWithBooleanKey;
 use Yiisoft\Validator\Tests\Support\Rule\RuleWithoutOptions;
 

tests/RuleHandlerContainerTest.php → tests/RuleHandlerResolver/RuleHandlerContainerTest.php

@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Validator\Rule\Handler\Container\Tests;
+namespace Yiisoft\Validator\Rule\Handler\Container\Tests\RuleHandlerResolver;
 
 use stdClass;
 use Yiisoft\Test\Support\Container\SimpleContainer;
 use PHPUnit\Framework\TestCase;
 use Yiisoft\Validator\Exception\RuleHandlerInterfaceNotImplementedException;
 use Yiisoft\Validator\Exception\RuleHandlerNotFoundException;
-use Yiisoft\Validator\RuleHandlerContainer;
+use Yiisoft\Validator\RuleHandlerResolver\RuleHandlerContainer;
 use Yiisoft\Validator\Tests\Support\Rule\PiHandler;
 use Yiisoft\Validator\RuleHandlerInterface;