Replace $dates casts with date casting through the $casts property

finiteinfinity · finiteinfinity · commit 09aadb35921b · 2023-03-03T10:51:06.000Z
diff --git a/src/Coders/Model/Factory.php b/src/Coders/Model/Factory.php
@@ -459,10 +459,6 @@ protected function body(Model $model)
             $body .= $this->class->field('casts', $model->getCasts(), ['before' => "\n"]);
         }
 
-        if ($model->hasDates()) {
-            $body .= $this->class->field('dates', $model->getDates(), ['before' => "\n"]);
-        }
-
         if ($model->hasHidden() && $model->doesNotUseBaseFiles()) {
             $body .= $this->class->field('hidden', $model->getHidden(), ['before' => "\n"]);
         }
diff --git a/src/Coders/Model/Model.php b/src/Coders/Model/Model.php
@@ -67,11 +67,6 @@ class Model
      */
     protected $mutations = [];
 
-    /**
-     * @var array
-     */
-    protected $dates = [];
-
     /**
      * @var array
      */
@@ -267,12 +262,8 @@ protected function parseColumn(Fluent $column)
             $cast = 'string';
         }
 
-        // Track dates
-        if ($cast == 'date') {
-            $this->dates[] = $propertyName;
-        }
-        // Track attribute casts
-        elseif ($cast != 'string') {
+        // Track attribute casts, ignoring timestamps
+        if ($cast != 'string' && !in_array($propertyName, [$this->CREATED_AT, $this->UPDATED_AT])) {
             $this->casts[$propertyName] = $cast;
         }
 
@@ -1001,7 +992,12 @@ public function hasDates()
      */
     public function getDates()
     {
-        return array_diff($this->dates, [$this->CREATED_AT, $this->UPDATED_AT]);
+        return array_diff(
+            array_filter($this->casts, function (string $cast) {
+                return $cast === 'date';
+            }),
+            [$this->CREATED_AT, $this->UPDATED_AT]
+        );
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -459,10 +459,6 @@ protected function body(Model $model)`
`459`	`459`	`$body .= $this->class->field('casts', $model->getCasts(), ['before' => "\n"]);`
`460`	`460`	`}`
`461`	`461`
`462`		`- if ($model->hasDates()) {`
`463`		`- $body .= $this->class->field('dates', $model->getDates(), ['before' => "\n"]);`
`464`		`- }`
`465`		`-`
`466`	`462`	`if ($model->hasHidden() && $model->doesNotUseBaseFiles()) {`
`467`	`463`	`$body .= $this->class->field('hidden', $model->getHidden(), ['before' => "\n"]);`
`468`	`464`	`}`