feat: Adds support for base Carbon class (#500)

larastan · Mar 20, 2020 · 4e56118 · 4e56118
1 parent 1055d4a
commit 4e56118
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/Properties/ModelPropertyExtension.php b/src/Properties/ModelPropertyExtension.php
@@ -155,9 +155,15 @@ private function requireFiles(array $files): void
 
     private function getDateClass(): string
     {
-        return $this->dateClass ?? class_exists(\Illuminate\Support\Facades\Date::class)
-            ? '\\'.get_class(\Illuminate\Support\Facades\Date::now())
-            : '\Illuminate\Support\Carbon';
+        if (! $this->dateClass) {
+            $this->dateClass = class_exists(\Illuminate\Support\Facades\Date::class)
+                ? '\\'.get_class(\Illuminate\Support\Facades\Date::now())
+                : '\Illuminate\Support\Carbon';
+
+            $this->dateClass .= '|\Carbon\Carbon';
+        }
+
+        return $this->dateClass;
     }
 
     /**

diff --git a/tests/Features/Properties/ModelPropertyExtension.php b/tests/Features/Properties/ModelPropertyExtension.php
@@ -5,6 +5,7 @@
 namespace Tests\Features\Properties;
 
 use App\User;
+use Carbon\Carbon as BaseCarbon;
 use Illuminate\Support\Carbon;
 
 class ModelPropertyExtension
@@ -17,7 +18,10 @@ public function testPropertyReturnType(): int
         return $this->user->id;
     }
 
-    public function testDateReturnType(): ?Carbon
+    /**
+     * @return Carbon|BaseCarbon|null
+     */
+    public function testDateReturnType()
     {
         return $this->user->created_at;
     }
@@ -27,6 +31,7 @@ public function testWriteToProperty(): void
         $this->user->created_at = 'test';
         $this->user->created_at = now();
         $this->user->created_at = null;
+        $this->user->created_at = BaseCarbon::now();
     }
 
     /** @return array<int, string> */