[11.x] Fix: Handles non nested explode of multiple Date and Numeric rules in ValidationRuleParser (#54718)

* fix: added condition to exit if Rule is Date or Numeric * test: added tests for new condition

Author: AlexandreMeledandri

src/Illuminate/Validation/ValidationRuleParser.php

@@ -94,6 +94,10 @@ protected function explodeExplicitRule($rule, $attribute)
  }
 
  if (is_object($rule)) {
+ if ($rule instanceof Date || $rule instanceof Numeric) {
+ return explode('|', (string) $rule);
+ }
+
  return Arr::wrap($this->prepareRule($rule, $attribute));
  }
 

tests/Validation/ValidationRuleParserTest.php

@@ -351,4 +351,122 @@ public function testExplodeHandlesSegmentingNestedRules()
  ],
  ], $results->implicitAttributes);
  }
+
+ public function testExplodeHandlesStringDateRule()
+ {
+ $parser = (new ValidationRuleParser([
+ 'date' => '2021-01-01',
+ ]));
+
+ $rules = [
+ 'date' => 'date|date_format:Y-m-d',
+ ];
+
+ $results = $parser->explode($rules);
+
+ $this->assertEquals([
+ 'date' => [
+ 'date',
+ 'date_format:Y-m-d',
+ ],
+ ], $results->rules);
+ }
+
+ public function testExplodeHandlesDateRule()
+ {
+ $parser = (new ValidationRuleParser([
+ 'date' => '2021-01-01',
+ ]));
+
+ $rules = [
+ 'date' => Rule::date(),
+ ];
+
+ $results = $parser->explode($rules);
+
+ $this->assertEquals([
+ 'date' => [
+ 'date',
+ ],
+ ], $results->rules);
+ }
+
+ public function testExplodeHandlesDateRuleWithAdditionalRules()
+ {
+ $parser = (new ValidationRuleParser([
+ 'date' => '2021-01-01',
+ ]));
+
+ $rules = [
+ 'date' => Rule::date()->format('Y-m-d'),
+ ];
+
+ $results = $parser->explode($rules);
+
+ $this->assertEquals([
+ 'date' => [
+ 'date',
+ 'date_format:Y-m-d',
+ ],
+ ], $results->rules);
+ }
+
+ public function testExplodeHandlesNumericStringRule()
+ {
+ $parser = (new ValidationRuleParser([
+ 'number' => 42,
+ ]));
+
+ $rules = [
+ 'number' => 'numeric|max:100',
+ ];
+
+ $results = $parser->explode($rules);
+
+ $this->assertEquals([
+ 'number' => [
+ 'numeric',
+ 'max:100',
+ ],
+ ], $results->rules);
+ }
+
+ public function testExplodeHandlesNumericRule()
+ {
+ $parser = (new ValidationRuleParser([
+ 'number' => 42,
+ ]));
+
+ $rules = [
+ 'number' => Rule::numeric(),
+ ];
+
+ $results = $parser->explode($rules);
+
+ $this->assertEquals([
+ 'number' => [
+ 'numeric',
+ ],
+ ], $results->rules);
+ }
+
+ public function testExplodeHandlesNumericRuleWithAdditionalRules()
+ {
+ $parser = (new ValidationRuleParser([
+ 'number' => 42,
+ ]));
+
+ $rules = [
+ 'number' => Rule::numeric()->max(100),
+ ];
+
+ $results = $parser->explode($rules);
+
+ $this->assertEquals([
+ 'number' => [
+ 'numeric',
+ 'max:100',
+ ],
+ ], $results->rules);
+ }
 }