Skip to content

Commit fee1250

Browse files
herndlmherndlm
committed
Narrow type on setting offsets of properties
1 parent c586014 commit fee1250

11 files changed

+171
-83
lines changed

‎src/Analyser/MutatingScope.php

-10
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
use PHPStan\Node\Expr\GetIterableKeyTypeExpr;
3535
use PHPStan\Node\Expr\GetIterableValueTypeExpr;
3636
use PHPStan\Node\Expr\GetOffsetValueTypeExpr;
37-
use PHPStan\Node\Expr\OriginalPropertyTypeExpr;
3837
use PHPStan\Node\Expr\ParameterVariableOriginalValueExpr;
3938
use PHPStan\Node\Expr\PropertyInitializationExpr;
4039
use PHPStan\Node\Expr\SetExistingOffsetValueTypeExpr;
@@ -689,15 +688,6 @@ public function getType(Expr $node): Type
689688
return $node->getExprType();
690689
}
691690

692-
if ($node instanceof OriginalPropertyTypeExpr) {
693-
$propertyReflection = $this->propertyReflectionFinder->findPropertyReflectionFromNode($node->getPropertyFetch(), $this);
694-
if ($propertyReflection === null) {
695-
return new ErrorType();
696-
}
697-
698-
return $propertyReflection->getReadableType();
699-
}
700-
701691
$key = $this->getNodeKey($node);
702692

703693
if (!array_key_exists($key, $this->resolvedTypes)) {

‎src/Analyser/NodeScopeResolver.php

+2-11
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@
8484
use PHPStan\Node\Expr\GetIterableKeyTypeExpr;
8585
use PHPStan\Node\Expr\GetIterableValueTypeExpr;
8686
use PHPStan\Node\Expr\GetOffsetValueTypeExpr;
87-
use PHPStan\Node\Expr\OriginalPropertyTypeExpr;
8887
use PHPStan\Node\Expr\PropertyInitializationExpr;
8988
use PHPStan\Node\Expr\SetExistingOffsetValueTypeExpr;
9089
use PHPStan\Node\Expr\SetOffsetValueTypeExpr;
@@ -5022,12 +5021,8 @@ private function processAssignVar(
50225021
$originalVar = $var;
50235022
$assignedPropertyExpr = $assignedExpr;
50245023
while ($var instanceof ArrayDimFetch) {
5025-
$varForSetOffsetValue = $var->var;
5026-
if ($varForSetOffsetValue instanceof PropertyFetch || $varForSetOffsetValue instanceof StaticPropertyFetch) {
5027-
$varForSetOffsetValue = new OriginalPropertyTypeExpr($varForSetOffsetValue);
5028-
}
50295024
$assignedPropertyExpr = new SetOffsetValueTypeExpr(
5030-
$varForSetOffsetValue,
5025+
$var->var,
50315026
$var->dim,
50325027
$assignedPropertyExpr,
50335028
);
@@ -5342,12 +5337,8 @@ static function (): void {
53425337
$dimFetchStack = [];
53435338
$assignedPropertyExpr = $assignedExpr;
53445339
while ($var instanceof ExistingArrayDimFetch) {
5345-
$varForSetOffsetValue = $var->getVar();
5346-
if ($varForSetOffsetValue instanceof PropertyFetch || $varForSetOffsetValue instanceof StaticPropertyFetch) {
5347-
$varForSetOffsetValue = new OriginalPropertyTypeExpr($varForSetOffsetValue);
5348-
}
53495340
$assignedPropertyExpr = new SetExistingOffsetValueTypeExpr(
5350-
$varForSetOffsetValue,
5341+
$var->getVar(),
53515342
$var->getDim(),
53525343
$assignedPropertyExpr,
53535344
);

‎src/Node/Printer/Printer.php

-6
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
use PHPStan\Node\Expr\GetIterableKeyTypeExpr;
99
use PHPStan\Node\Expr\GetIterableValueTypeExpr;
1010
use PHPStan\Node\Expr\GetOffsetValueTypeExpr;
11-
use PHPStan\Node\Expr\OriginalPropertyTypeExpr;
1211
use PHPStan\Node\Expr\ParameterVariableOriginalValueExpr;
1312
use PHPStan\Node\Expr\PropertyInitializationExpr;
1413
use PHPStan\Node\Expr\SetExistingOffsetValueTypeExpr;
@@ -57,11 +56,6 @@ protected function pPHPStan_Node_ExistingArrayDimFetch(ExistingArrayDimFetch $ex
5756
return sprintf('__phpstanExistingArrayDimFetch(%s, %s)', $this->p($expr->getVar()), $this->p($expr->getDim()));
5857
}
5958

60-
protected function pPHPStan_Node_OriginalPropertyTypeExpr(OriginalPropertyTypeExpr $expr): string // phpcs:ignore
61-
{
62-
return sprintf('__phpstanOriginalPropertyType(%s)', $this->p($expr->getPropertyFetch()));
63-
}
64-
6559
protected function pPHPStan_Node_SetOffsetValueTypeExpr(SetOffsetValueTypeExpr $expr): string // phpcs:ignore
6660
{
6761
return sprintf('__phpstanSetOffsetValueType(%s, %s, %s)', $this->p($expr->getVar()), $expr->getDim() !== null ? $this->p($expr->getDim()) : 'null', $this->p($expr->getValue()));

‎tests/PHPStan/Rules/Arrays/AppendedArrayItemTypeRuleTest.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -28,35 +28,35 @@ public function testAppendedArrayItemType(): void
2828
[
2929
[
3030
'Array (array<int>) does not accept string.',
31-
18,
31+
25,
3232
],
3333
[
3434
'Array (array<callable(): mixed>) does not accept array{1, 2, 3}.',
35-
20,
35+
26,
3636
],
3737
[
3838
'Array (array<callable(): mixed>) does not accept array{\'AppendedArrayItem\\\\Foo\', \'classMethod\'}.',
39-
23,
39+
31,
4040
],
4141
[
4242
'Array (array<callable(): mixed>) does not accept array{\'Foo\', \'Hello world\'}.',
43-
25,
43+
37,
4444
],
4545
[
4646
'Array (array<int>) does not accept string.',
47-
27,
47+
39,
4848
],
4949
[
5050
'Array (array<int>) does not accept string.',
51-
32,
51+
44,
5252
],
5353
[
5454
'Array (array<callable(): string>) does not accept Closure(): 1.',
55-
45,
55+
57,
5656
],
5757
[
5858
'Array (array<AppendedArrayItem\Lorem>) does not accept AppendedArrayItem\Baz.',
59-
79,
59+
91,
6060
],
6161
],
6262
);

‎tests/PHPStan/Rules/Arrays/AppendedArrayKeyTypeRuleTest.php

+10-10
Original file line numberDiff line numberDiff line change
@@ -24,36 +24,36 @@ public function testRule(): void
2424
{
2525
$this->analyse([__DIR__ . '/data/appended-array-key.php'], [
2626
[
27-
'Array (array<int, mixed>) does not accept key int|string.',
28-
28,
27+
'Array (array<int, mixed>) does not accept key string.',
28+
25,
2929
],
3030
[
31-
'Array (array<int, mixed>) does not accept key string.',
32-
30,
31+
'Array (array<int, mixed>) does not accept key int|string.',
32+
26,
3333
],
3434
[
3535
'Array (array<string, mixed>) does not accept key int.',
36-
31,
36+
27,
3737
],
3838
[
3939
'Array (array<string, mixed>) does not accept key int|string.',
40-
33,
40+
28,
4141
],
4242
[
4343
'Array (array<string, mixed>) does not accept key 0.',
44-
38,
44+
33,
4545
],
4646
[
4747
'Array (array<string, mixed>) does not accept key 1.',
48-
46,
48+
52,
4949
],
5050
[
5151
'Array (array<1|2|3, string>) does not accept key int.',
52-
80,
52+
86,
5353
],
5454
[
5555
'Array (array<1|2|3, string>) does not accept key 4.',
56-
85,
56+
91,
5757
],
5858
]);
5959
}

‎tests/PHPStan/Rules/Arrays/data/appended-array-item.php

+16-4
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,28 @@ class Foo
1111
/** @var callable[] */
1212
private $callables;
1313

14-
public function doFoo()
14+
public function accepted()
1515
{
1616
$this->integers[] = 4;
1717
$this->integers['foo'] = 5;
18-
$this->integers[] = 'foo';
19-
$this->callables[] = [$this, 'doFoo'];
20-
$this->callables[] = [1, 2, 3];
2118
$this->callables[] = ['Closure', 'bind'];
2219
$this->callables[] = 'strpos';
20+
$this->callables[] = [$this, 'accepted'];
21+
}
22+
23+
public function notAccepted1()
24+
{
25+
$this->integers[] = 'foo';
26+
$this->callables[] = [1, 2, 3];
27+
}
28+
29+
public function notAccepted2()
30+
{
2331
$this->callables[] = [__CLASS__, 'classMethod'];
32+
}
33+
34+
public function notAccepted3()
35+
{
2436
$world = 'world';
2537
$this->callables[] = ['Foo', "Hello $world"];
2638

‎tests/PHPStan/Rules/Arrays/data/appended-array-key.php

+19-13
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,34 @@ class Foo
1414
/** @var array<int|string, mixed> */
1515
private $bothArray;
1616

17-
/**
18-
* @param int|string $intOrString
19-
*/
20-
public function doFoo(
21-
int $int,
22-
string $string,
23-
$intOrString,
24-
?string $stringOrNull
25-
)
17+
public function invalid()
2618
{
2719
$this->intArray[new \DateTimeImmutable()] = 1;
28-
$this->intArray[$intOrString] = 1;
29-
$this->intArray[$int] = 1;
20+
}
21+
22+
/** @param int|string $intOrString */
23+
public function notAccepted(int $int, string $string, $intOrString,)
24+
{
3025
$this->intArray[$string] = 1;
26+
$this->intArray[$intOrString] = 1;
3127
$this->stringArray[$int] = 1;
32-
$this->stringArray[$string] = 1;
3328
$this->stringArray[$intOrString] = 1;
29+
}
30+
31+
public function notAcceptedStringIntCase()
32+
{
33+
$this->stringArray['0'] = 1;
34+
}
35+
36+
/** @param int|string $intOrString */
37+
public function accepted(int $int, string $string, $intOrString, ?string $stringOrNull)
38+
{
39+
$this->intArray[$int] = 1;
40+
$this->stringArray[$string] = 1;
3441
$this->bothArray[$int] = 1;
3542
$this->bothArray[$intOrString] = 1;
3643
$this->bothArray[$string] = 1;
3744
$this->stringArray[$stringOrNull] = 1; // will be cast to string
38-
$this->stringArray['0'] = 1;
3945
}
4046

4147
public function checkRewrittenArray()

‎tests/PHPStan/Rules/Properties/TypesAssignedToPropertiesRuleTest.php

+39-21
Original file line numberDiff line numberDiff line change
@@ -253,35 +253,35 @@ public function testAppendendArrayKey(): void
253253
$this->analyse([__DIR__ . '/../Arrays/data/appended-array-key.php'], [
254254
[
255255
'Property AppendedArrayKey\Foo::$intArray (array<int, mixed>) does not accept array<int|string, mixed>.',
256-
28,
256+
25,
257257
],
258258
[
259259
'Property AppendedArrayKey\Foo::$intArray (array<int, mixed>) does not accept array<int|string, mixed>.',
260-
30,
260+
26,
261261
],
262262
[
263263
'Property AppendedArrayKey\Foo::$stringArray (array<string, mixed>) does not accept array<int|string, mixed>.',
264-
31,
264+
27,
265265
],
266266
[
267267
'Property AppendedArrayKey\Foo::$stringArray (array<string, mixed>) does not accept array<int|string, mixed>.',
268-
33,
268+
28,
269269
],
270270
[
271271
'Property AppendedArrayKey\Foo::$stringArray (array<string, mixed>) does not accept array<int|string, mixed>.',
272-
38,
272+
33,
273273
],
274274
[
275-
'Property AppendedArrayKey\Foo::$stringArray (array<string, mixed>) does not accept array<int|string, mixed>.',
276-
46,
275+
'Property AppendedArrayKey\Foo::$stringArray (array<string, mixed>) does not accept array<int, false>.',
276+
52,
277277
],
278278
[
279279
'Property AppendedArrayKey\MorePreciseKey::$test (array<1|2|3, string>) does not accept non-empty-array<int, string>.',
280-
80,
280+
86,
281281
],
282282
[
283283
'Property AppendedArrayKey\MorePreciseKey::$test (array<1|2|3, string>) does not accept non-empty-array<1|2|3|4, string>.',
284-
85,
284+
91,
285285
],
286286
]);
287287
}
@@ -303,35 +303,35 @@ public function testAppendedArrayItemType(): void
303303
[
304304
[
305305
'Property AppendedArrayItem\Foo::$integers (array<int>) does not accept array<int|string>.',
306-
18,
306+
25,
307307
],
308308
[
309309
'Property AppendedArrayItem\Foo::$callables (array<callable(): mixed>) does not accept non-empty-array<array{1, 2, 3}|(callable(): mixed)>.',
310-
20,
310+
26,
311311
],
312312
[
313313
'Property AppendedArrayItem\Foo::$callables (array<callable(): mixed>) does not accept non-empty-array<array{\'AppendedArrayItem\\\\Foo\', \'classMethod\'}|(callable(): mixed)>.',
314-
23,
314+
31,
315315
],
316316
[
317317
'Property AppendedArrayItem\Foo::$callables (array<callable(): mixed>) does not accept non-empty-array<array{\'Foo\', \'Hello world\'}|(callable(): mixed)>.',
318-
25,
318+
37,
319319
],
320320
[
321321
'Property AppendedArrayItem\Foo::$integers (array<int>) does not accept array<int|string>.',
322-
27,
322+
39,
323323
],
324324
[
325325
'Property AppendedArrayItem\Foo::$integers (array<int>) does not accept array<int|string>.',
326-
32,
326+
44,
327327
],
328328
[
329329
'Property AppendedArrayItem\Bar::$stringCallables (array<callable(): string>) does not accept non-empty-array<(callable(): string)|(Closure(): 1)>.',
330-
45,
330+
57,
331331
],
332332
[
333333
'Property AppendedArrayItem\Baz::$staticProperty (array<AppendedArrayItem\Lorem>) does not accept array<AppendedArrayItem\Baz>.',
334-
79,
334+
91,
335335
],
336336
],
337337
);
@@ -358,7 +358,7 @@ public function testBug6286(): void
358358
}
359359
$this->analyse([__DIR__ . '/data/bug-6286.php'], [
360360
[
361-
'Property Bug6286\HelloWorld::$details (array{name: string, age: int}) does not accept array{name: string, age: \'Forty-two\'}.',
361+
'Property Bug6286\HelloWorld::$details (array{name: string, age: int}) does not accept array{name: \'Douglas Adams\', age: \'Forty-two\'}.',
362362
19,
363363
"Offset 'age' (int) does not accept type string.",
364364
],
@@ -392,7 +392,7 @@ public function testBug3703(): void
392392
18,
393393
],
394394
[
395-
'Property Bug3703\Foo::$bar (array<string, array<string, array<int>>>) does not accept array<string, array<string, array<int>>|string>.',
395+
'Property Bug3703\Foo::$bar (array<string, array<string, array<int>>>) does not accept array<string, array<string, array<int|string>|int>|string>.',
396396
21,
397397
],
398398
]);
@@ -498,7 +498,7 @@ public function testBug6356b(): void
498498
$this->checkExplicitMixed = true;
499499
$this->analyse([__DIR__ . '/data/bug-6356b.php'], [
500500
[
501-
'Property Bug6356b\HelloWorld2::$details (array{name: string, age: int}) does not accept array{name: string, age: \'Forty-two\'}.',
501+
'Property Bug6356b\HelloWorld2::$details (array{name: string, age: int}) does not accept array{name: \'Douglas Adams\', age: \'Forty-two\'}.',
502502
19,
503503
"Offset 'age' (int) does not accept type string.",
504504
],
@@ -508,7 +508,7 @@ public function testBug6356b(): void
508508
"Offset 'age' (int) does not accept type int|string.",
509509
],
510510
[
511-
'Property Bug6356b\HelloWorld2::$nestedDetails (array<array{name: string, age: int}>) does not accept non-empty-array<array{name: string, age: \'Twelve\'|int}>.',
511+
'Property Bug6356b\HelloWorld2::$nestedDetails (array<array{name: string, age: int}>) does not accept non-empty-array<array{name: string, age: \'Eleventy-one\'|\'Twelve\'|int}>.',
512512
26,
513513
"Offset 'age' (int) does not accept type int|string.",
514514
],
@@ -704,4 +704,22 @@ public function testBug12131(): void
704704
]);
705705
}
706706

707+
public function testBug6398(): void
708+
{
709+
$this->checkExplicitMixed = true;
710+
$this->analyse([__DIR__ . '/data/bug-6398.php'], []);
711+
}
712+
713+
public function testBug6571(): void
714+
{
715+
$this->checkExplicitMixed = true;
716+
$this->analyse([__DIR__ . '/data/bug-6571.php'], []);
717+
}
718+
719+
public function testBug7880(): void
720+
{
721+
$this->checkExplicitMixed = true;
722+
$this->analyse([__DIR__ . '/data/bug-7880.php'], []);
723+
}
724+
707725
}

0 commit comments

Comments
 (0)