[12.x] Fixes how the fluent Date rule builder handles date_format (#55052)

* Fixed adding a format to the fluent date rule builder

* Conformed to StyleCI

* Take initial rules from previous PR

* Added tests for specific dates with custom date format

* Update Date.php

---------

Co-authored-by: Taylor Otwell <[email protected]>

Author: AndrewMast

src/Illuminate/Validation/Rules/Date.php

@@ -12,17 +12,24 @@ class Date implements Stringable
 {
     use Conditionable, Macroable;
 
+    /**
+     * The format of the date.
+     */
+    protected ?string $format = null;
+
     /**
      * The constraints for the date rule.
      */
-    protected array $constraints = ['date'];
+    protected array $constraints = [];
 
     /**
      * Ensure the date has the given format.
      */
     public function format(string $format): static
     {
-        return $this->addRule('date_format:'.$format);
+        $this->format = $format;
+
+        return $this;
     }
 
     /**
@@ -121,7 +128,7 @@ protected function addRule(array|string $rules): static
     protected function formatDate(DateTimeInterface|string $date): string
     {
         return $date instanceof DateTimeInterface
-            ? $date->format('Y-m-d')
+            ? $date->format($this->format ?? 'Y-m-d')
             : $date;
     }
 
@@ -130,6 +137,9 @@ protected function formatDate(DateTimeInterface|string $date): string
      */
     public function __toString(): string
     {
-        return implode('|', $this->constraints);
+        return implode('|', [
+            $this->format === null ? 'date' : 'date_format:'.$this->format,
+            ...$this->constraints,
+        ]);
     }
 }

tests/Validation/ValidationDateRuleTest.php

@@ -24,7 +24,7 @@ public function testDefaultDateRule()
     public function testDateFormatRule()
     {
         $rule = Rule::date()->format('d/m/Y');
-        $this->assertEquals('date|date_format:d/m/Y', (string) $rule);
+        $this->assertEquals('date_format:d/m/Y', (string) $rule);
     }
 
     public function testAfterTodayRule()
@@ -49,30 +49,45 @@ public function testAfterSpecificDateRule()
     {
         $rule = Rule::date()->after(Carbon::parse('2024-01-01'));
         $this->assertEquals('date|after:2024-01-01', (string) $rule);
+
+        $rule = Rule::date()->format('d/m/Y')->after(Carbon::parse('2024-01-01'));
+        $this->assertEquals('date_format:d/m/Y|after:01/01/2024', (string) $rule);
     }
 
     public function testBeforeSpecificDateRule()
     {
         $rule = Rule::date()->before(Carbon::parse('2024-01-01'));
         $this->assertEquals('date|before:2024-01-01', (string) $rule);
+
+        $rule = Rule::date()->format('d/m/Y')->before(Carbon::parse('2024-01-01'));
+        $this->assertEquals('date_format:d/m/Y|before:01/01/2024', (string) $rule);
     }
 
     public function testAfterOrEqualSpecificDateRule()
     {
         $rule = Rule::date()->afterOrEqual(Carbon::parse('2024-01-01'));
         $this->assertEquals('date|after_or_equal:2024-01-01', (string) $rule);
+
+        $rule = Rule::date()->format('d/m/Y')->afterOrEqual(Carbon::parse('2024-01-01'));
+        $this->assertEquals('date_format:d/m/Y|after_or_equal:01/01/2024', (string) $rule);
     }
 
     public function testBeforeOrEqualSpecificDateRule()
     {
         $rule = Rule::date()->beforeOrEqual(Carbon::parse('2024-01-01'));
         $this->assertEquals('date|before_or_equal:2024-01-01', (string) $rule);
+
+        $rule = Rule::date()->format('d/m/Y')->beforeOrEqual(Carbon::parse('2024-01-01'));
+        $this->assertEquals('date_format:d/m/Y|before_or_equal:01/01/2024', (string) $rule);
     }
 
     public function testBetweenDatesRule()
     {
         $rule = Rule::date()->between(Carbon::parse('2024-01-01'), Carbon::parse('2024-02-01'));
         $this->assertEquals('date|after:2024-01-01|before:2024-02-01', (string) $rule);
+
+        $rule = Rule::date()->format('d/m/Y')->between(Carbon::parse('2024-01-01'), Carbon::parse('2024-02-01'));
+        $this->assertEquals('date_format:d/m/Y|after:01/01/2024|before:01/02/2024', (string) $rule);
     }
 
     public function testBetweenOrEqualDatesRule()
@@ -87,7 +102,7 @@ public function testChainedRules()
             ->format('Y-m-d')
             ->after('2024-01-01 00:00:00')
             ->before('2025-01-01 00:00:00');
-        $this->assertEquals('date|date_format:Y-m-d|after:2024-01-01 00:00:00|before:2025-01-01 00:00:00', (string) $rule);
+        $this->assertEquals('date_format:Y-m-d|after:2024-01-01 00:00:00|before:2025-01-01 00:00:00', (string) $rule);
 
         $rule = Rule::date()
             ->format('Y-m-d')
@@ -97,7 +112,7 @@ public function testChainedRules()
             ->unless(true, function ($rule) {
                 $rule->before('2025-01-01');
             });
-        $this->assertSame('date|date_format:Y-m-d|after:2024-01-01', (string) $rule);
+        $this->assertSame('date_format:Y-m-d|after:2024-01-01', (string) $rule);
     }
 
     public function testDateValidation()

tests/Validation/ValidationRuleParserTest.php

@@ -398,15 +398,15 @@ public function testExplodeHandlesDateRuleWithAdditionalRules()
         ]));
 
         $rules = [
-            'date' => Rule::date()->format('Y-m-d'),
+            'date' => Rule::date()->after('today'),
         ];
 
         $results = $parser->explode($rules);
 
         $this->assertEquals([
             'date' => [
                 'date',
-                'date_format:Y-m-d',
+                'after:today',
             ],
         ], $results->rules);
     }