Pass attribute key to object for reusability

Author: tillkruss

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

@@ -534,7 +534,7 @@ protected function castToClass($key)
             return $this->classCastCache[$key];
         } else {
             return $this->classCastCache[$key] = forward_static_call(
-                [$this->getCasts()[$key], 'fromModelAttributes'], $this, $this->attributes
+                [$this->getCasts()[$key], 'fromModelAttributes'], $this->attributes, $key, $this
             );
         }
     }
@@ -565,7 +565,8 @@ protected function mergeAttributesFromClassCasts()
     {
         foreach ($this->classCastCache as $key => $value) {
             $this->attributes = array_merge(
-                $this->attributes, $value->toModelAttributes($this, $this->attributes)
+                $this->attributes,
+                $value->toModelAttributes($this->attributes, $key, $this)
             );
         }
     }
@@ -640,7 +641,7 @@ protected function setClassCastableAttribute($key, $value)
                 function () {
                     return null;
                 },
-                $this->castToClass($key)->toModelAttributes($this)
+                $this->castToClass($key)->toModelAttributes($this->attributes, $key, $this)
             ));
 
             unset($this->classCastCache[$key]);

tests/Database/DatabaseEloquentIntegrationTest.php

@@ -1319,7 +1319,7 @@ public function __construct($lineOne, $lineTwo)
         $this->lineTwo = $lineTwo;
     }
 
-    public static function fromModelAttributes($model, $attributes)
+    public static function fromModelAttributes($attributes)
     {
         return new static($attributes['line_one'], $attributes['line_two']);
     }