compare custom date/immutable_date using date comparison (laravel#38720)

Fixes laravel#38719
cdsistemas · Oct 12, 2021 · 7acdb5c · 7acdb5c
1 parent 35e3604
commit 7acdb5c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php b/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php
@@ -1217,7 +1217,7 @@ public function getCasts()
      */
     protected function isDateCastable($key)
     {
-        return $this->hasCast($key, ['date', 'datetime', 'immutable_date', 'immutable_datetime']);
+        return $this->hasCast($key, ['date', 'datetime', 'custom_datetime', 'immutable_date', 'immutable_datetime', 'immutable_custom_datetime']);
     }
 
     /**
@@ -1643,7 +1643,7 @@ public function originalIsEquivalent($key)
             return true;
         } elseif (is_null($attribute)) {
             return false;
-        } elseif ($this->isDateAttribute($key)) {
+        } elseif ($this->isDateAttribute($key) || $this->isDateCastable($key)) {
             return $this->fromDateTime($attribute) ===
                 $this->fromDateTime($original);
         } elseif ($this->hasCast($key, ['object', 'collection'])) {

diff --git a/tests/Integration/Database/EloquentModelDateCastingTest.php b/tests/Integration/Database/EloquentModelDateCastingTest.php
@@ -2,6 +2,7 @@
 
 namespace Illuminate\Tests\Integration\Database\EloquentModelDateCastingTest;
 
+use Carbon\CarbonImmutable;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Carbon;
@@ -21,6 +22,8 @@ protected function setUp(): void
             $table->increments('id');
             $table->date('date_field')->nullable();
             $table->datetime('datetime_field')->nullable();
+            $table->date('immutable_date_field')->nullable();
+            $table->datetime('immutable_datetime_field')->nullable();
         });
     }
 
@@ -36,6 +39,27 @@ public function testDatesAreCustomCastable()
         $this->assertInstanceOf(Carbon::class, $user->date_field);
         $this->assertInstanceOf(Carbon::class, $user->datetime_field);
     }
+
+    public function testCustomDateCastsAreComparedAsDates()
+    {
+        /** @var TestModel1 */
+        $user = TestModel1::create([
+            'date_field' => '2019-10-01',
+            'datetime_field' => '2019-10-01 10:15:20',
+            'immutable_date_field' => '2019-10-01',
+            'immutable_datetime_field' => '2019-10-01 10:15:20',
+        ]);
+
+        $user->date_field = new Carbon('2019-10-01');
+        $user->datetime_field = new Carbon('2019-10-01 10:15:20');
+        $user->immutable_date_field = new CarbonImmutable('2019-10-01');
+        $user->immutable_datetime_field = new CarbonImmutable('2019-10-01 10:15:20');
+
+        $this->assertArrayNotHasKey('date_field', $user->getDirty());
+        $this->assertArrayNotHasKey('datetime_field', $user->getDirty());
+        $this->assertArrayNotHasKey('immutable_date_field', $user->getDirty());
+        $this->assertArrayNotHasKey('immutable_datetime_field', $user->getDirty());
+    }
 }
 
 class TestModel1 extends Model
@@ -47,5 +71,7 @@ class TestModel1 extends Model
     public $casts = [
         'date_field' => 'date:Y-m',
         'datetime_field' => 'datetime:Y-m H:i',
+        'immutable_date_field' => 'date:Y-m',
+        'immutable_datetime_field' => 'datetime:Y-m H:i',
     ];
 }