Skip to content

Commit 2cfa07c

Browse files
herndlmherndlm
committed
Narrow type on setting offsets of properties
1 parent ef6cc0a commit 2cfa07c

File tree

9 files changed

+153
-61
lines changed

9 files changed

+153
-61
lines changed

‎src/Analyser/MutatingScope.php‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
use PHPStan\Node\Expr\GetIterableKeyTypeExpr;
3838
use PHPStan\Node\Expr\GetIterableValueTypeExpr;
3939
use PHPStan\Node\Expr\GetOffsetValueTypeExpr;
40-
use PHPStan\Node\Expr\OriginalPropertyTypeExpr;
4140
use PHPStan\Node\Expr\ParameterVariableOriginalValueExpr;
4241
use PHPStan\Node\Expr\PropertyInitializationExpr;
4342
use PHPStan\Node\Expr\SetExistingOffsetValueTypeExpr;
@@ -693,15 +692,6 @@ public function getType(Expr $node): Type
693692
return $node->getExprType();
694693
}
695694

696-
if ($node instanceof OriginalPropertyTypeExpr) {
697-
$propertyReflection = $this->propertyReflectionFinder->findPropertyReflectionFromNode($node->getPropertyFetch(), $this);
698-
if ($propertyReflection === null) {
699-
return new ErrorType();
700-
}
701-
702-
return $propertyReflection->getReadableType();
703-
}
704-
705695
$key = $this->getNodeKey($node);
706696

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

‎src/Analyser/NodeScopeResolver.php‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@
8585
use PHPStan\Node\Expr\GetIterableKeyTypeExpr;
8686
use PHPStan\Node\Expr\GetIterableValueTypeExpr;
8787
use PHPStan\Node\Expr\GetOffsetValueTypeExpr;
88-
use PHPStan\Node\Expr\OriginalPropertyTypeExpr;
8988
use PHPStan\Node\Expr\PropertyInitializationExpr;
9089
use PHPStan\Node\Expr\SetExistingOffsetValueTypeExpr;
9190
use PHPStan\Node\Expr\SetOffsetValueTypeExpr;
@@ -5344,12 +5343,8 @@ private function processAssignVar(
53445343
$originalVar = $var;
53455344
$assignedPropertyExpr = $assignedExpr;
53465345
while ($var instanceof ArrayDimFetch) {
5347-
$varForSetOffsetValue = $var->var;
5348-
if ($varForSetOffsetValue instanceof PropertyFetch || $varForSetOffsetValue instanceof StaticPropertyFetch) {
5349-
$varForSetOffsetValue = new OriginalPropertyTypeExpr($varForSetOffsetValue);
5350-
}
53515346
$assignedPropertyExpr = new SetOffsetValueTypeExpr(
5352-
$varForSetOffsetValue,
5347+
$var->var,
53535348
$var->dim,
53545349
$assignedPropertyExpr,
53555350
);
@@ -5682,12 +5677,8 @@ static function (): void {
56825677
$dimFetchStack = [];
56835678
$assignedPropertyExpr = $assignedExpr;
56845679
while ($var instanceof ExistingArrayDimFetch) {
5685-
$varForSetOffsetValue = $var->getVar();
5686-
if ($varForSetOffsetValue instanceof PropertyFetch || $varForSetOffsetValue instanceof StaticPropertyFetch) {
5687-
$varForSetOffsetValue = new OriginalPropertyTypeExpr($varForSetOffsetValue);
5688-
}
56895680
$assignedPropertyExpr = new SetExistingOffsetValueTypeExpr(
5690-
$varForSetOffsetValue,
5681+
$var->getVar(),
56915682
$var->getDim(),
56925683
$assignedPropertyExpr,
56935684
);

‎src/Node/Expr/OriginalPropertyTypeExpr.php‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎src/Node/Printer/Printer.php‎

Lines changed: 0 additions & 6 deletions
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;
@@ -55,11 +54,6 @@ protected function pPHPStan_Node_ExistingArrayDimFetch(ExistingArrayDimFetch $ex
5554
return sprintf('__phpstanExistingArrayDimFetch(%s, %s)', $this->p($expr->getVar()), $this->p($expr->getDim()));
5655
}
5756

58-
protected function pPHPStan_Node_OriginalPropertyTypeExpr(OriginalPropertyTypeExpr $expr): string // phpcs:ignore
59-
{
60-
return sprintf('__phpstanOriginalPropertyType(%s)', $this->p($expr->getPropertyFetch()));
61-
}
62-
6357
protected function pPHPStan_Node_SetOffsetValueTypeExpr(SetOffsetValueTypeExpr $expr): string // phpcs:ignore
6458
{
6559
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/Properties/TypesAssignedToPropertiesRuleTest.php‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -689,6 +689,30 @@ public function testBug12131(): void
689689
]);
690690
}
691691

692+
public function testBug6398(): void
693+
{
694+
$this->checkExplicitMixed = true;
695+
$this->analyse([__DIR__ . '/data/bug-6398.php'], []);
696+
}
697+
698+
public function testBug6571(): void
699+
{
700+
$this->checkExplicitMixed = true;
701+
$this->analyse([__DIR__ . '/data/bug-6571.php'], []);
702+
}
703+
704+
public function testBug7880(): void
705+
{
706+
$this->checkExplicitMixed = true;
707+
$this->analyse([__DIR__ . '/data/bug-7880.php'], []);
708+
}
709+
710+
public function testBug12565(): void
711+
{
712+
$this->checkExplicitMixed = true;
713+
$this->analyse([__DIR__ . '/data/bug-12565.php'], []);
714+
}
715+
692716
public function testShortBodySetHook(): void
693717
{
694718
if (PHP_VERSION_ID < 80400) {

‎tests/PHPStan/Rules/Properties/data/bug-12565.php‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<?php declare(strict_types = 1);
2+
3+
namespace Bug12565;
4+
5+
class EntryType {
6+
public string $title = '';
7+
public string $subTitle = '';
8+
}
9+
/**
10+
* @implements \ArrayAccess<int, EntryType>
11+
*/
12+
class ArrayLike implements \ArrayAccess {
13+
14+
/** @var EntryType[] */
15+
private array $values = [];
16+
public function offsetExists(mixed $offset): bool
17+
{
18+
return isset($this->values[$offset]);
19+
}
20+
21+
public function offsetGet(mixed $offset): EntryType
22+
{
23+
return $this->values[$offset] ?? new EntryType();
24+
}
25+
26+
public function offsetSet(mixed $offset, mixed $value): void
27+
{
28+
$this->values[$offset] = $value;
29+
}
30+
31+
public function offsetUnset(mixed $offset): void
32+
{
33+
unset($this->values[$offset]);
34+
}
35+
}
36+
37+
class Wrapper {
38+
public ?ArrayLike $myArrayLike;
39+
40+
public function __construct()
41+
{
42+
$this->myArrayLike = new ArrayLike();
43+
44+
}
45+
}
46+
47+
$baz = new Wrapper();
48+
$baz->myArrayLike = new ArrayLike();
49+
$baz->myArrayLike[1] = new EntryType();
50+
$baz->myArrayLike[1]->title = "Test";

‎tests/PHPStan/Rules/Properties/data/bug-6398.php‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?php
2+
3+
namespace Bug6398;
4+
5+
class AsyncTask{
6+
/**
7+
* @phpstan-var \ArrayObject<int, array<string, mixed>>|null
8+
*/
9+
private static $threadLocalStorage = null;
10+
11+
/**
12+
* @param mixed $complexData the data to store
13+
*/
14+
protected function storeLocal(string $key, $complexData) : void{
15+
if(self::$threadLocalStorage === null){
16+
self::$threadLocalStorage = new \ArrayObject();
17+
}
18+
self::$threadLocalStorage[spl_object_id($this)][$key] = $complexData;
19+
}
20+
21+
/**
22+
* @return mixed
23+
*/
24+
protected function fetchLocal(string $key){
25+
$id = spl_object_id($this);
26+
if(self::$threadLocalStorage === null or !isset(self::$threadLocalStorage[$id][$key])){
27+
throw new \InvalidArgumentException("No matching thread-local data found on this thread");
28+
}
29+
30+
return self::$threadLocalStorage[$id][$key];
31+
}
32+
}

‎tests/PHPStan/Rules/Properties/data/bug-6571.php‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?php declare(strict_types = 1); // lint >= 7.4
2+
3+
namespace Bug6571;
4+
5+
interface ClassLoader{}
6+
7+
class HelloWorld
8+
{
9+
/** @var \Threaded|\ClassLoader[]|null */
10+
private ?\Threaded $classLoaders = null;
11+
12+
/**
13+
* @param \ClassLoader[] $autoloaders
14+
*/
15+
public function setClassLoaders(?array $autoloaders = null) : void{
16+
if($autoloaders === null){
17+
$autoloaders = [];
18+
}
19+
20+
if($this->classLoaders === null){
21+
$this->classLoaders = new \Threaded();
22+
}else{
23+
foreach($this->classLoaders as $k => $autoloader){
24+
unset($this->classLoaders[$k]);
25+
}
26+
}
27+
foreach($autoloaders as $autoloader){
28+
$this->classLoaders[] = $autoloader;
29+
}
30+
}
31+
}

‎tests/PHPStan/Rules/Properties/data/bug-7880.php‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?php declare(strict_types = 1);
2+
3+
namespace Bug7880;
4+
5+
class C {
6+
/** @var array{a: string, b: string}|null */
7+
private $a = null;
8+
9+
public function foo(): void {
10+
if ($this->a !== null) {
11+
$this->a['b'] = "baz";
12+
}
13+
}
14+
}

0 commit comments

Comments
 (0)