Fix #266: Make behavior expected when passing empty rules explicitly (#269)

samdark · web-flow · commit c9bbfa8653df · 2022-07-24T21:55:47.000+03:00
diff --git a/src/Validator.php b/src/Validator.php
@@ -29,18 +29,21 @@ public function __construct(private RuleHandlerResolverInterface $ruleHandlerRes
 
     /**
      * @param DataSetInterface|mixed|RulesProviderInterface $data
-     * @param iterable<\Closure|\Closure[]|RuleInterface|RuleInterface[]> $rules
+     * @param iterable<\Closure|\Closure[]|RuleInterface|RuleInterface[]>|null $rules
      */
-    public function validate($data, iterable $rules = []): Result
+    public function validate(mixed $data, ?iterable $rules = null): Result
     {
         $data = $this->normalizeDataSet($data);
-        if ($rules === [] && $data instanceof RulesProviderInterface) {
+        if ($rules === null && $data instanceof RulesProviderInterface) {
             $rules = $data->getRules();
         }
 
-        $context = new ValidationContext($this, $data);
         $compoundResult = new Result();
+        if (empty($rules)) {
+            return $compoundResult;
+        }
 
+        $context = new ValidationContext($this, $data);
         $results = [];
 
         foreach ($rules as $attribute => $attributeRules) {
diff --git a/src/ValidatorInterface.php b/src/ValidatorInterface.php
@@ -12,8 +12,11 @@ interface ValidatorInterface
     /**
      * Validate data set against rules set for data set attributes.
      *
-     * @param DataSetInterface|mixed|RulesProviderInterface $data Data set to validate.
-     * @param iterable<\Closure|\Closure[]|RuleInterface|RuleInterface[]> $rules Rules to apply.
+     * @param DataSetInterface|mixed|RulesProviderInterface $data Data set to validate. If {@see RulesProviderInterface}
+     * instance provided and rules are not specified explicitly, they are read from the
+     * {@see RulesProviderInterface::getRules()}.
+     * @param iterable<\Closure|\Closure[]|RuleInterface|RuleInterface[]>|null $rules Rules to apply. If specified,
+     * rules are not read from data set even if it is an instance of {@see RulesProviderInterface}.
      */
-    public function validate(mixed $data, iterable $rules = []): Result;
+    public function validate(mixed $data, ?iterable $rules = null): Result;
 }
diff --git a/tests/DataSet/RulesProvidedDataSetTest.php b/tests/DataSet/RulesProvidedDataSetTest.php
@@ -50,4 +50,30 @@ public function testExplicitRulesHavePriority(): void
 
         $this->assertTrue($result->isValid());
     }
+
+    public function testEmptyExplicitRulesHavePriority(): void
+    {
+        $dataSet = new RulesProvidedDataSet(
+            [
+                'username' => 'test123',
+                'age' => 42,
+            ],
+            [
+                'username' => [
+                    new Regex('^[a-z]+$'),
+                    new HasLength(max: 3),
+                ],
+                'age' => [
+                    new Number(max: 25),
+                ],
+            ]
+        );
+        $validator = FakeValidatorFactory::make();
+        $result = $validator->validate(
+            $dataSet,
+            []
+        );
+
+        $this->assertTrue($result->isValid());
+    }
 }
