Fix rules serialization (#344)

xepozz · StyleCIBot · arogachev · web-flow · commit ef7e3dbfa06b · 2022-10-20T13:41:51.000+06:00
* Fix rules serialization * Apply fixes from StyleCI * Add test for iterable rules * Fix error message * Apply fixes from StyleCI * Improve callable rule (#343) * Add ability to run non-static closures * Apply fixes from StyleCI * Fix tests * Apply fixes from StyleCI * Improve method check * Apply fixes from StyleCI * Check property before the use * Collapse test * Apply fixes from StyleCI * Add test for static method * Apply CR suggestions * Update tests/Rule/CallbackTest.php * Apply fixes from StyleCI Co-authored-by: StyleCI Bot <bot@styleci.io> Co-authored-by: Alexey Rogachev <arogachev90@gmail.com> * Fix code coverage Co-authored-by: StyleCI Bot <bot@styleci.io> Co-authored-by: Alexey Rogachev <arogachev90@gmail.com>
diff --git a/src/RulesDumper.php b/src/RulesDumper.php
@@ -5,7 +5,6 @@
 namespace Yiisoft\Validator;
 
 use InvalidArgumentException;
-use function is_array;
 
 /**
  * RulesDumper allows to get an array of rule names and corresponding settings from a set of rules.
@@ -54,16 +53,17 @@ private function fetchOptions(iterable $rules): array
     {
         $result = [];
         foreach ($rules as $attribute => $rule) {
-            if (is_array($rule)) {
+            if (is_iterable($rule)) {
                 $result[$attribute] = $this->fetchOptions($rule);
             } elseif ($rule instanceof SerializableRuleInterface) {
                 $result[$attribute] = array_merge([$rule->getName()], $rule->getOptions());
             } elseif ($rule instanceof RuleInterface) {
                 $result[$attribute] = [$rule->getName()];
             } else {
                 throw new InvalidArgumentException(sprintf(
-                    'Rules should be a rule or an array of rules that implements %s.',
+                    'Each rule must implement "%s". Type "%s" given.',
                     RuleInterface::class,
+                    get_debug_type($rule),
                 ));
             }
         }
diff --git a/tests/RulesDumperTest.php b/tests/RulesDumperTest.php
@@ -4,6 +4,7 @@
 
 namespace Yiisoft\Validator\Tests;
 
+use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
 use Yiisoft\Validator\Rule\Number;
 use Yiisoft\Validator\RulesDumper;
@@ -16,7 +17,7 @@ public function asArrayDataProvider(): array
             [
                 [
                     'attributeName' => [
-                        new Number(
+                        $rule = new Number(
                             asInteger: true,
                             min: 10,
                             max: 100,
@@ -25,11 +26,12 @@ public function asArrayDataProvider(): array
                             skipOnEmpty: true,
                             skipOnError: true
                         ),
+                        (fn () => yield from [$rule, $rule])(),
                     ],
                 ],
                 [
                     'attributeName' => [
-                        [
+                        $dump = [
                             'number',
                             'asInteger' => true,
                             'min' => 10,
@@ -50,6 +52,10 @@ public function asArrayDataProvider(): array
                             'integerPattern' => '/^\s*[+-]?\d+\s*$/',
                             'numberPattern' => '/^\s*[-+]?\d*\.?\d+([eE][-+]?\d+)?\s*$/',
                         ],
+                        [
+                            $dump,
+                            $dump,
+                        ],
                     ],
                 ],
             ],
@@ -66,4 +72,16 @@ public function testAsArray($rules, array $expected): void
 
         $this->assertEquals($expected, $result);
     }
+
+    public function testException(): void
+    {
+        $dumper = new RulesDumper();
+
+        $this->expectException(InvalidArgumentException::class);
+
+        $message = 'Each rule must implement "Yiisoft\Validator\RuleInterface". Type "string" given.';
+        $this->expectExceptionMessage($message);
+
+        $dumper->asArray(['not a rule']);
+    }
 }
