[11.x] Increment/decrement with cast value (#47450)

* Increment/decrement with cast value

* Fix test

* wip

* wip

* wip

Author: gdebrauwer

src/Illuminate/Database/Eloquent/Model.php

@@ -967,6 +967,10 @@ protected function incrementOrDecrement($column, $amount, $extra, $method)
             return false;
         }
 
+        if ($this->isClassDeviable($column)) {
+            $amount = (clone $this)->setAttribute($column, $amount)->getAttributeFromArray($column);
+        }
+
         return tap($this->setKeysForSaveQuery($query)->{$method}($column, $amount, $extra), function () use ($column) {
             $this->syncChanges();
 

tests/Integration/Database/DatabaseEloquentModelCustomCastingTest.php

@@ -167,6 +167,14 @@ public function testDeviableCasts()
         $model->decrement('price', '333.333');
 
         $this->assertSame((new Decimal('320.988'))->getValue(), $model->price->getValue());
+
+        $model->increment('price', new Decimal('100.001'));
+
+        $this->assertSame((new Decimal('420.989'))->getValue(), $model->price->getValue());
+
+        $model->decrement('price', new Decimal('200.002'));
+
+        $this->assertSame((new Decimal('220.987'))->getValue(), $model->price->getValue());
     }
 
     public function testSerializableCasts()
@@ -427,12 +435,12 @@ public function set($model, $key, $value, $attributes)
 
     public function increment($model, $key, $value, $attributes)
     {
-        return new Decimal($attributes[$key] + $value);
+        return new Decimal($attributes[$key] + ($value instanceof Decimal ? (string) $value : $value));
     }
 
     public function decrement($model, $key, $value, $attributes)
     {
-        return new Decimal($attributes[$key] - $value);
+        return new Decimal($attributes[$key] - ($value instanceof Decimal ? (string) $value : $value));
     }
 
     public function serialize($model, $key, $value, $attributes)

tests/Integration/Database/EloquentModelCustomCastingTest.php

@@ -181,7 +181,7 @@ public function testModelWithCustomCastsWorkWithCustomIncrementDecrement()
         $this->assertInstanceOf(Euro::class, $model->amount);
         $this->assertEquals('2', $model->amount->value);
 
-        $model->incrementAmount(new Euro('1'));
+        $model->increment('amount', new Euro('1'));
         $this->assertEquals('3.00', $model->amount->value);
     }
 
@@ -394,19 +394,19 @@ public function get($model, $key, $value, $attributes)
 
     public function set($model, $key, $value, $attributes)
     {
-        return $value->value;
+        return $value instanceof Euro ? $value->value : $value;
     }
 
-    public function increment($model, $key, string $value, $attributes)
+    public function increment($model, $key, $value, $attributes)
     {
-        $model->$key = new Euro((string) BigNumber::of($model->$key->value)->plus($value)->toScale(2));
+        $model->$key = new Euro((string) BigNumber::of($model->$key->value)->plus($value->value)->toScale(2));
 
         return $model->$key;
     }
 
-    public function decrement($model, $key, string $value, $attributes)
+    public function decrement($model, $key, $value, $attributes)
     {
-        $model->$key = new Euro((string) BigNumber::of($model->$key->value)->subtract($value)->toScale(2));
+        $model->$key = new Euro((string) BigNumber::of($model->$key->value)->subtract($value->value)->toScale(2));
 
         return $model->$key;
     }
@@ -418,9 +418,4 @@ class Member extends Model
     protected $casts = [
         'amount' => Euro::class,
     ];
-
-    public function incrementAmount(Euro $amount)
-    {
-        $this->increment('amount', $amount->value);
-    }
 }