Skip to content

Commit 24653d2

Browse files
pindab0terpindab0ter
committed
Read attribute mutator type from parameter
1 parent 79bdd94 commit 24653d2

File tree

3 files changed

+170
-39
lines changed

3 files changed

+170
-39
lines changed

‎src/Console/ModelsCommand.php

+30-25
Original file line numberDiff line numberDiff line change
@@ -591,22 +591,15 @@ public function getPropertiesFromMethods($model)
591591
$this->setProperty($name, $type, true, null, $comment);
592592
}
593593
} elseif ($isAttribute) {
594-
$name = Str::snake($method);
595-
$types = $this->getAttributeReturnType($model, $method);
596-
$comment = $this->getCommentFromDocBlock($reflection);
597-
598-
if ($types->has('get')) {
599-
$type = $this->getTypeInModel($model, $types['get']);
600-
$this->setProperty($name, $type, true, null, $comment);
601-
}
602-
603-
if ($types->has('set')) {
604-
$this->setProperty($name, null, null, true, $comment);
605-
}
606-
607-
if (!$types->hasAny('get', 'set')) {
608-
$this->setProperty($name, null, true, null, $comment);
609-
}
594+
$types = $this->getAttributeTypes($model, $method);
595+
$type = $this->getTypeInModel($model, $types->get('get') ?: $types->get('set')) ?: null;
596+
$this->setProperty(
597+
Str::snake($method),
598+
$type,
599+
$types->has('get'),
600+
$types->has('set'),
601+
$this->getCommentFromDocBlock($reflection)
602+
);
610603
} elseif (
611604
Str::startsWith($method, 'set') && Str::endsWith(
612605
$method,
@@ -1085,19 +1078,31 @@ protected function hasCamelCaseModelProperties()
10851078
return $this->laravel['config']->get('ide-helper.model_camel_case_properties', false);
10861079
}
10871080

1088-
protected function getAttributeReturnType(Model $model, string $method): Collection
1081+
protected function getAttributeTypes(Model $model, string $method): Collection
10891082
{
10901083
/** @var Attribute $attribute */
10911084
$attribute = $model->{$method}();
10921085

1093-
return collect([
1094-
'get' => $attribute->get ? optional(new \ReflectionFunction($attribute->get))->getReturnType() : null,
1095-
'set' => $attribute->set ? optional(new \ReflectionFunction($attribute->set))->getReturnType() : null,
1096-
])
1097-
->filter()
1086+
$methods = new Collection();
1087+
1088+
if ($attribute->get) {
1089+
$methods['get'] = optional(new \ReflectionFunction($attribute->get))->getReturnType();
1090+
}
1091+
if ($attribute->set) {
1092+
$function = optional(new \ReflectionFunction($attribute->set));
1093+
if ($function->getNumberOfParameters() === 0) {
1094+
$methods['set'] = null;
1095+
} else {
1096+
$methods['set'] = $function->getParameters()[0]->getType();
1097+
}
1098+
}
1099+
1100+
return $methods
10981101
->map(function ($type) {
1099-
if ($type instanceof \ReflectionUnionType) {
1100-
$types =collect($type->getTypes())
1102+
if ($type === null) {
1103+
$types = collect([]);
1104+
} elseif ($type instanceof \ReflectionUnionType) {
1105+
$types = collect($type->getTypes())
11011106
/** @var ReflectionType $reflectionType */
11021107
->map(function ($reflectionType) {
11031108
return collect($this->extractReflectionTypes($reflectionType));
@@ -1107,7 +1112,7 @@ protected function getAttributeReturnType(Model $model, string $method): Collect
11071112
$types = collect($this->extractReflectionTypes($type));
11081113
}
11091114

1110-
if ($type->allowsNull()) {
1115+
if ($type && $type->allowsNull()) {
11111116
$types->push('null');
11121117
}
11131118

‎tests/Console/ModelsCommand/Attributes/Models/Simple.php

+66-6
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,89 @@
99

1010
class Simple extends Model
1111
{
12+
// With a backed property
1213
public function name(): Attribute
1314
{
1415
return new Attribute(
1516
function (?string $name): ?string {
1617
return $name;
1718
},
1819
function (?string $name): ?string {
19-
return $name === null ? null : ucfirst($name);
20+
return $name;
21+
}
22+
);
23+
}
24+
25+
// Without backed properties
26+
27+
public function typeHintedGetAndSet(): Attribute
28+
{
29+
return new Attribute(
30+
function (): ?string {
31+
return $this->name;
32+
},
33+
function (?string $name) {
34+
$this->name = $name;
2035
}
2136
);
2237
}
2338

24-
public function uppercaseName(): Attribute
39+
public function divergingTypeHintedGetAndSet(): Attribute
2540
{
26-
return Attribute::get(function (): string {
27-
return strtoupper($this->name);
41+
return new Attribute(
42+
function (): int {
43+
return strlen($this->name);
44+
},
45+
function (?string $name) {
46+
$this->name = $name;
47+
}
48+
);
49+
}
50+
51+
public function typeHintedGet(): Attribute
52+
{
53+
return Attribute::get(function (): ?string {
54+
return $this->name;
2855
});
2956
}
3057

31-
public function lowercaseName(): Attribute
58+
public function typeHintedSet(): Attribute
59+
{
60+
return Attribute::set(function (?string $name) {
61+
$this->name = $name;
62+
});
63+
}
64+
65+
public function nonTypeHintedGetAndSet(): Attribute
66+
{
67+
return new Attribute(
68+
function () {
69+
return $this->name;
70+
},
71+
function ($name) {
72+
$this->name = $name;
73+
}
74+
);
75+
}
76+
77+
public function nonTypeHintedGet(): Attribute
3278
{
3379
return Attribute::get(function () {
34-
return strtolower($this->name);
80+
return $this->name;
81+
});
82+
}
83+
84+
public function nonTypeHintedSet(): Attribute
85+
{
86+
return Attribute::set(function ($name) {
87+
$this->name = $name;
88+
});
89+
}
90+
91+
public function parameterlessSet(): Attribute
92+
{
93+
return Attribute::set(function () {
94+
$this->name = null;
3595
});
3696
}
3797

‎tests/Console/ModelsCommand/Attributes/__snapshots__/Test__test__1.php

+74-8
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,15 @@
1111
* Barryvdh\LaravelIdeHelper\Tests\Console\ModelsCommand\Attributes\Models\Simple
1212
*
1313
* @property integer $id
14-
* @property-read mixed $lowercase_name
14+
* @property int $diverging_type_hinted_get_and_set
1515
* @property string|null $name
16-
* @property-read string $uppercase_name
16+
* @property-read mixed $non_type_hinted_get
17+
* @property mixed $non_type_hinted_get_and_set
18+
* @property-write mixed $non_type_hinted_set
19+
* @property-write mixed $parameterless_set
20+
* @property-read string|null $type_hinted_get
21+
* @property string|null $type_hinted_get_and_set
22+
* @property-write string|null $type_hinted_set
1723
* @method static \Illuminate\Database\Eloquent\Builder|Simple newModelQuery()
1824
* @method static \Illuminate\Database\Eloquent\Builder|Simple newQuery()
1925
* @method static \Illuminate\Database\Eloquent\Builder|Simple query()
@@ -22,29 +28,89 @@
2228
*/
2329
class Simple extends Model
2430
{
31+
// With a backed property
2532
public function name(): Attribute
2633
{
2734
return new Attribute(
2835
function (?string $name): ?string {
2936
return $name;
3037
},
3138
function (?string $name): ?string {
32-
return $name === null ? null : ucfirst($name);
39+
return $name;
40+
}
41+
);
42+
}
43+
44+
// Without backed properties
45+
46+
public function typeHintedGetAndSet(): Attribute
47+
{
48+
return new Attribute(
49+
function (): ?string {
50+
return $this->name;
51+
},
52+
function (?string $name) {
53+
$this->name = $name;
3354
}
3455
);
3556
}
3657

37-
public function uppercaseName(): Attribute
58+
public function divergingTypeHintedGetAndSet(): Attribute
3859
{
39-
return Attribute::get(function (): string {
40-
return strtoupper($this->name);
60+
return new Attribute(
61+
function (): int {
62+
return strlen($this->name);
63+
},
64+
function (?string $name) {
65+
$this->name = $name;
66+
}
67+
);
68+
}
69+
70+
public function typeHintedGet(): Attribute
71+
{
72+
return Attribute::get(function (): ?string {
73+
return $this->name;
4174
});
4275
}
4376

44-
public function lowercaseName(): Attribute
77+
public function typeHintedSet(): Attribute
78+
{
79+
return Attribute::set(function (?string $name) {
80+
$this->name = $name;
81+
});
82+
}
83+
84+
public function nonTypeHintedGetAndSet(): Attribute
85+
{
86+
return new Attribute(
87+
function () {
88+
return $this->name;
89+
},
90+
function ($name) {
91+
$this->name = $name;
92+
}
93+
);
94+
}
95+
96+
public function nonTypeHintedGet(): Attribute
4597
{
4698
return Attribute::get(function () {
47-
return strtolower($this->name);
99+
return $this->name;
100+
});
101+
}
102+
103+
public function nonTypeHintedSet(): Attribute
104+
{
105+
return Attribute::set(function ($name) {
106+
$this->name = $name;
107+
});
108+
}
109+
110+
public function parameterlessSet(): Attribute
111+
{
112+
return Attribute::set(function () {
113+
$this->name = null;
48114
});
49115
}
50116

0 commit comments

Comments
 (0)