fix getOriginal with custom casts

Author: taylorotwell

src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php

@@ -476,7 +476,7 @@ protected function mutateAttribute($key, $value)
     protected function mutateAttributeForArray($key, $value)
     {
         $value = $this->isClassCastable($key)
-                    ? $this->getClassCastableAttributeValue($key)
+                    ? $this->getClassCastableAttributeValue($key, $value)
                     : $this->mutateAttribute($key, $value);
 
         return $value instanceof Arrayable ? $value->toArray() : $value;
@@ -540,7 +540,7 @@ protected function castAttribute($key, $value)
         }
 
         if ($this->isClassCastable($key)) {
-            return $this->getClassCastableAttributeValue($key);
+            return $this->getClassCastableAttributeValue($key, $value);
         }
 
         return $value;
@@ -550,18 +550,19 @@ protected function castAttribute($key, $value)
      * Cast the given attribute using a custom cast class.
      *
      * @param  string  $key
+     * @param  mixed  $value
      * @return mixed
      */
-    protected function getClassCastableAttributeValue($key)
+    protected function getClassCastableAttributeValue($key, $value)
     {
         if (isset($this->classCastCache[$key])) {
             return $this->classCastCache[$key];
         } else {
             $caster = $this->resolveCasterClass($key);
 
             return $this->classCastCache[$key] = $caster instanceof CastsInboundAttributes
-                ? ($this->attributes[$key] ?? null)
-                : $caster->get($this, $key, $this->attributes[$key] ?? null, $this->attributes);
+                ? $value
+                : $caster->get($this, $key, $value, $this->attributes);
         }
     }
 

tests/Integration/Database/DatabaseEloquentModelCustomCastingTest.php

@@ -27,6 +27,10 @@ public function testBasicCustomCasting()
         $this->assertSame('TAYLOR', $unserializedModel->getAttributes()['uppercase']);
         $this->assertSame('TAYLOR', $unserializedModel->toArray()['uppercase']);
 
+        $model->syncOriginal();
+        $model->uppercase = 'dries';
+        $this->assertEquals('TAYLOR', $model->getOriginal('uppercase'));
+
         $model = new TestEloquentModelWithCustomCast;
 
         $model->address = $address = new Address('110 Kingsbrook St.', 'My Childhood House');