add to tests

taylorotwell · taylorotwell · commit 33d7f2fe80af · 2020-01-04T18:51:56.000-06:00
diff --git a/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php b/src/Illuminate/Database/Eloquent/Concerns/HasAttributes.php
@@ -546,7 +546,7 @@ protected function castUsingClass($key)
              return $this->classCastCache[$key];
          } else {
              return $this->classCastCache[$key] = forward_static_call(
-                 [$this->getCasts()[$key], 'fromModelAttributes'], $this, $key, $this->attributes
+                 [$this->getCasts()[$key], 'fromModelAttributes'], $this, $key, $this->attributes[$key] ?? null, $this->attributes
              );
          }
      }
@@ -702,7 +702,11 @@ protected function setClassCastableAttribute($key, $value)
      {
          if (is_null($value)) {
              $this->attributes = array_merge($this->attributes, array_map(
-                 function () { return null; }, $this->castToClass($key)->toModelAttributes($this)
+                 function () { return null; },
+                 forward_static_call(
+                    [$this->getCasts()[$key], 'toModelAttributes'],
+                    $this, $key, $this->{$key}, $this->attributes
+                )
              ));
 
              unset($this->classCastCache[$key]);
diff --git a/tests/Integration/Database/DatabaseEloquentModelCustomCastingTest.php b/tests/Integration/Database/DatabaseEloquentModelCustomCastingTest.php
@@ -41,6 +41,11 @@ public function testBasicCustomCasting()
 
         $this->assertEquals('117 Spencer St.', json_decode($model->toJson(), true)['address_line_one']);
         $this->assertEquals('My House', json_decode($model->toJson(), true)['address_line_two']);
+
+        $model->address = null;
+
+        $this->assertNull($model->toArray()['address_line_one']);
+        $this->assertNull($model->toArray()['address_line_two']);
     }
 }
 
@@ -72,7 +77,7 @@ public static function toModelAttributes($model, $key, $value, $attributes)
 
 class AddressCaster
 {
-    public static function fromModelAttributes($model, $key, $attributes)
+    public static function fromModelAttributes($model, $key, $value, $attributes)
     {
         return new Address($attributes['address_line_one'], $attributes['address_line_two']);
     }

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,11 @@ public function testBasicCustomCasting()`
`41`	`41`
`42`	`42`	`$this->assertEquals('117 Spencer St.', json_decode($model->toJson(), true)['address_line_one']);`
`43`	`43`	`$this->assertEquals('My House', json_decode($model->toJson(), true)['address_line_two']);`
	`44`	`+`
	`45`	`+ $model->address = null;`
	`46`	`+`
	`47`	`+ $this->assertNull($model->toArray()['address_line_one']);`
	`48`	`+ $this->assertNull($model->toArray()['address_line_two']);`
`44`	`49`	`}`
`45`	`50`	`}`
`46`	`51`
`@@ -72,7 +77,7 @@ public static function toModelAttributes($model, $key, $value, $attributes)`
`72`	`77`
`73`	`78`	`class AddressCaster`
`74`	`79`	`{`
`75`		`- public static function fromModelAttributes($model, $key, $attributes)`
	`80`	`+ public static function fromModelAttributes($model, $key, $value, $attributes)`
`76`	`81`	`{`
`77`	`82`	`return new Address($attributes['address_line_one'], $attributes['address_line_two']);`
`78`	`83`	`}`