Cleanup and minor refactoring (#324)

arogachev · web-flow · commit aa5826665444 · 2022-10-05T11:34:30.000+06:00
* Cleanup and minor refactoring

* Revert deletion of CustomUrlRule used in tests
diff --git a/src/Validator.php b/src/Validator.php
@@ -80,8 +80,11 @@ public function validate(
         foreach ($rules ?? [] as $attribute => $attributeRules) {
             $result = new Result();
 
-            $tempRule = is_iterable($attributeRules) ? $attributeRules : [$attributeRules];
-            $attributeRules = $this->normalizeRules($tempRule);
+            if (!is_iterable($attributeRules)) {
+                $attributeRules = [$attributeRules];
+            }
+
+            $attributeRules = $this->normalizeRules($attributeRules);
 
             if (is_int($attribute)) {
                 $validatedData = $data->getData();
diff --git a/tests/DataSet/PHP80/ObjectDataSet80Test.php b/tests/DataSet/PHP80/ObjectDataSet80Test.php
@@ -16,10 +16,10 @@
 use Yiisoft\Validator\Tests\Data\TitleTrait;
 use Yiisoft\Validator\Tests\Stub\FakeValidatorFactory;
 use Yiisoft\Validator\Tests\Stub\NotRuleAttribute;
-use Yiisoft\Validator\Tests\Stub\ObjectWithCallbackMethod;
-use Yiisoft\Validator\Tests\Stub\ObjectWithNonExistingCallbackMethod;
-use Yiisoft\Validator\Tests\Stub\ObjectWithNonPublicCallbackMethod;
-use Yiisoft\Validator\Tests\Stub\ObjectWithNonStaticCallbackMethod;
+use Yiisoft\Validator\Tests\Stub\ObjectWithCallbackMethod\ObjectWithCallbackMethod;
+use Yiisoft\Validator\Tests\Stub\ObjectWithCallbackMethod\ObjectWithNonExistingCallbackMethod;
+use Yiisoft\Validator\Tests\Stub\ObjectWithCallbackMethod\ObjectWithNonPublicCallbackMethod;
+use Yiisoft\Validator\Tests\Stub\ObjectWithCallbackMethod\ObjectWithNonStaticCallbackMethod;
 
 final class ObjectDataSet80Test extends TestCase
 {
diff --git a/tests/Stub/ObjectWithCallbackMethod/ObjectWithCallbackMethod.php b/tests/Stub/ObjectWithCallbackMethod/ObjectWithCallbackMethod.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Validator\Tests\Stub;
+namespace Yiisoft\Validator\Tests\Stub\ObjectWithCallbackMethod;
 
 use Yiisoft\Validator\Result;
 use Yiisoft\Validator\Rule\Callback;
diff --git a/tests/Stub/ObjectWithCallbackMethod/ObjectWithNonExistingCallbackMethod.php b/tests/Stub/ObjectWithCallbackMethod/ObjectWithNonExistingCallbackMethod.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Validator\Tests\Stub;
+namespace Yiisoft\Validator\Tests\Stub\ObjectWithCallbackMethod;
 
 use Yiisoft\Validator\Rule\Callback;
 
diff --git a/tests/Stub/ObjectWithCallbackMethod/ObjectWithNonPublicCallbackMethod.php b/tests/Stub/ObjectWithCallbackMethod/ObjectWithNonPublicCallbackMethod.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Validator\Tests\Stub;
+namespace Yiisoft\Validator\Tests\Stub\ObjectWithCallbackMethod;
 
 use Yiisoft\Validator\Result;
 use Yiisoft\Validator\Rule\Callback;
diff --git a/tests/Stub/ObjectWithCallbackMethod/ObjectWithNonStaticCallbackMethod.php b/tests/Stub/ObjectWithCallbackMethod/ObjectWithNonStaticCallbackMethod.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Yiisoft\Validator\Tests\Stub;
+namespace Yiisoft\Validator\Tests\Stub\ObjectWithCallbackMethod;
 
 use Yiisoft\Validator\Result;
 use Yiisoft\Validator\Rule\Callback;
diff --git a/tests/Stub/PiHandler.php b/tests/Stub/PiHandler.php
@@ -10,15 +10,12 @@
 
 final class PiHandler implements RuleHandlerInterface
 {
-    /**
-     * @inheritDoc
-     */
-    public function validate(mixed $value, object $rule, ?ValidationContext $context = null): Result
+    public function validate(mixed $value, object $rule, ValidationContext $context): Result
     {
         $result = new Result();
 
         if (!(\abs($value - M_PI) < PHP_FLOAT_EPSILON)) {
-            $result->addError('Value must be Pi.', ['value' => $value]);
+            $result->addError('Value must be Pi.');
         }
 
         return $result;
diff --git a/tests/Stub/RuleHandler.php b/tests/Stub/RuleHandler.php
@@ -10,7 +10,7 @@
 
 final class RuleHandler implements RuleHandlerInterface
 {
-    public function validate(mixed $value, object $rule, ?ValidationContext $context = null): Result
+    public function validate(mixed $value, object $rule, ValidationContext $context): Result
     {
         return new Result();
     }

Original file line number	Diff line number	Diff line change
`@@ -10,15 +10,12 @@`
`10`	`10`
`11`	`11`	`final class PiHandler implements RuleHandlerInterface`
`12`	`12`	`{`
`13`		`- /**`
`14`		`- * @inheritDoc`
`15`		`- */`
`16`		`- public function validate(mixed $value, object $rule, ?ValidationContext $context = null): Result`
	`13`	`+ public function validate(mixed $value, object $rule, ValidationContext $context): Result`
`17`	`14`	`{`
`18`	`15`	`$result = new Result();`
`19`	`16`
`20`	`17`	`if (!(\abs($value - M_PI) < PHP_FLOAT_EPSILON)) {`
`21`		`- $result->addError('Value must be Pi.', ['value' => $value]);`
	`18`	`+ $result->addError('Value must be Pi.');`
`22`	`19`	`}`
`23`	`20`
`24`	`21`	`return $result;`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`
`11`	`11`	`final class RuleHandler implements RuleHandlerInterface`
`12`	`12`	`{`
`13`		`- public function validate(mixed $value, object $rule, ?ValidationContext $context = null): Result`
	`13`	`+ public function validate(mixed $value, object $rule, ValidationContext $context): Result`
`14`	`14`	`{`
`15`	`15`	`return new Result();`
`16`	`16`	`}`