Skip to content

Commit 9cbf908

Browse files
committed
formatting
1 parent a81614f commit 9cbf908

File tree

3 files changed

+7
-19
lines changed

3 files changed

+7
-19
lines changed

src/Illuminate/Contracts/Database/Eloquent/HasCasterClass.php

-13
This file was deleted.

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
use Carbon\CarbonInterface;
66
use DateTimeInterface;
7+
use Illuminate\Contracts\Database\Eloquent\Castable;
78
use Illuminate\Contracts\Database\Eloquent\CastsInboundAttributes;
8-
use Illuminate\Contracts\Database\Eloquent\HasCasterClass;
99
use Illuminate\Contracts\Support\Arrayable;
1010
use Illuminate\Database\Eloquent\JsonEncodingException;
1111
use Illuminate\Database\Eloquent\Relations\Relation;
@@ -1073,8 +1073,8 @@ protected function resolveCasterClass($key)
10731073
$arguments = explode(',', $segments[1]);
10741074
}
10751075

1076-
if (is_subclass_of($castType, HasCasterClass::class)) {
1077-
$castType = $castType::getCasterClass();
1076+
if (is_subclass_of($castType, Castable::class)) {
1077+
$castType = $castType::castUsing();
10781078
}
10791079

10801080
return new $castType(...$arguments);

tests/Integration/Database/DatabaseEloquentModelCustomCastingTest.php

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Illuminate\Tests\Integration\Database;
44

5+
use Illuminate\Contracts\Database\Eloquent\Castable;
56
use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
67
use Illuminate\Contracts\Database\Eloquent\CastsInboundAttributes;
78
use Illuminate\Contracts\Database\Eloquent\HasCasterClass;
@@ -115,7 +116,7 @@ public function testSettingRawAttributesClearsTheCastCache()
115116
$this->assertSame('117 Spencer St.', $model->address->lineOne);
116117
}
117118

118-
public function testWithHasCasterClassInterface()
119+
public function testWithCastableInterface()
119120
{
120121
$model = new TestEloquentModelWithCustomCast;
121122

@@ -234,7 +235,7 @@ public function set($model, $key, $value, $attributes)
234235
}
235236
}
236237

237-
class ValueObject implements HasCasterClass
238+
class ValueObject implements Castable
238239
{
239240
public $name;
240241

@@ -243,7 +244,7 @@ public function __construct(string $name)
243244
$this->name = $name;
244245
}
245246

246-
public static function getCasterClass()
247+
public static function castUsing()
247248
{
248249
return ValueObjectCaster::class;
249250
}

0 commit comments

Comments
 (0)