formatting and performance fix

laravel · Feb 2, 2018 · 1f902c8 · 1f902c8
1 parent 1e4bca5
commit 1f902c8
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php b/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php
@@ -190,7 +190,7 @@ protected function addCastAttributesToArray(array $attributes, array $mutatedAtt
                 $attributes[$key] = $this->serializeDate($attributes[$key]);
             }
 
-            if ($attributes[$key] && Str::startsWith($value, ['date:', 'datetime:'])) {
+            if ($attributes[$key] && $this->isCustomDateTimeCast($value)) {
                 $attributes[$key] = $attributes[$key]->format(explode(':', $value, 2)[1]);
             }
         }
@@ -509,13 +509,25 @@ protected function castAttribute($key, $value)
      */
     protected function getCastType($key)
     {
-        if (Str::startsWith($this->getCasts()[$key], ['date:', 'datetime:'])) {
+        if ($this->isCustomDateTimeCast($this->getCasts()[$key])) {
             return 'custom_datetime';
         }
 
         return trim(strtolower($this->getCasts()[$key]));
     }
 
+    /**
+     * Determine if the cast type is a custom date time cast.
+     *
+     * @param  string  $cast
+     * @return bool
+     */
+    protected function isCustomDateTimeCast($cast)
+    {
+        return strncmp($cast, 'date:', 5) === 0 ||
+               strncmp($cast, 'datetime:', 9) === 0;
+    }
+
     /**
      * Set a given attribute on the model.
      *

diff --git a/tests/Integration/Database/EloquentModelDateCastingTest.php b/tests/Integration/Database/EloquentModelDateCastingTest.php
@@ -23,7 +23,7 @@ public function setUp()
         });
     }
 
-    public function test_user_can_update_nullable_date()
+    public function test_dates_are_custom_castable()
     {
         $user = TestModel1::create([
             'date_field' => '2019-10-01',