adjust getoriginal

Author: taylorotwell

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

@@ -1185,12 +1185,22 @@ public function setRawAttributes(array $attributes, $sync = false)
      */
     public function getOriginal($key = null, $default = null)
     {
-        if ($key && $this->isClassCastable($key) && $this->isDirty()) {
-            return (new static)->setRawAttributes(
-                $this->original, $sync = true
-            )->getOriginal($key, $default);
-        }
+        return (new static)->setRawAttributes(
+            $this->original, $sync = true
+        )->getOriginalWithoutRewindingModel($key, $default);
+    }
 
+    /**
+     * Get the model's original attribute values.
+     *
+     * This should not be called by the end user / developer.
+     *
+     * @param  string|null  $key
+     * @param  mixed  $default
+     * @return mixed|array
+     */
+    public function getOriginalWithoutRewindingModel($key = null, $default = null)
+    {
         if ($key) {
             return $this->transformModelValue(
                 $key, Arr::get($this->original, $key, $default)

tests/Integration/Database/DatabaseEloquentModelCustomCastingTest.php

@@ -103,10 +103,26 @@ public function testGetOriginalWithCastValueObjects()
 
         $model->address = new Address('117 Spencer St.', 'Another house.');
 
+        $this->assertEquals('117 Spencer St.', $model->address->lineOne);
         $this->assertEquals('110 Kingsbrook St.', $model->getOriginal('address')->lineOne);
         $this->assertEquals('117 Spencer St.', $model->address->lineOne);
 
 
+
+        $model = new TestEloquentModelWithCustomCast([
+            'address' => new Address('110 Kingsbrook St.', 'My Childhood House')
+        ]);
+
+        $model->syncOriginal();
+
+        $model->address = new Address('117 Spencer St.', 'Another house.');
+
+        $this->assertEquals('117 Spencer St.', $model->address->lineOne);
+        $this->assertEquals('110 Kingsbrook St.', $model->getOriginal()['address_line_one']);
+        $this->assertEquals('117 Spencer St.', $model->address->lineOne);
+
+
+
         $model = new TestEloquentModelWithCustomCast([
             'address' => new Address('110 Kingsbrook St.', 'My Childhood House')
         ]);