Commit a06d509

schlndhondrejmirtes

authored and

committed

fix type of $a?->b::c() and $a?->b::$c

1 parent ca55346 commit a06d509Copy full SHA for a06d509

File tree

+31

-2

lines changed

+31

-2

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1802,7 +1802,7 @@ private function resolveType(string $exprString, Expr $node): Type`
`1802`	`1802`	`if ($node->class instanceof Name) {`
`1803`	`1803`	`$staticMethodCalledOnType = $this->resolveTypeByName($node->class);`
`1804`	`1804`	`} else {`
`1805`		`- $staticMethodCalledOnType = $this->getType($node->class)->getObjectTypeOrClassStringObjectType();`
	`1805`	`+ $staticMethodCalledOnType = TypeCombinator::removeNull($this->getType($node->class))->getObjectTypeOrClassStringObjectType();`
`1806`	`1806`	`}`
`1807`	`1807`
`1808`	`1808`	`$returnType = $this->methodCallReturnType(`
`@@ -1894,7 +1894,7 @@ private function resolveType(string $exprString, Expr $node): Type`
`1894`	`1894`	`if ($node->class instanceof Name) {`
`1895`	`1895`	`$staticPropertyFetchedOnType = $this->resolveTypeByName($node->class);`
`1896`	`1896`	`} else {`
`1897`		`- $staticPropertyFetchedOnType = $this->getType($node->class)->getObjectTypeOrClassStringObjectType();`
	`1897`	`+ $staticPropertyFetchedOnType = TypeCombinator::removeNull($this->getType($node->class))->getObjectTypeOrClassStringObjectType();`
`1898`	`1898`	`}`
`1899`	`1899`
`1900`	`1900`	`$returnType = $this->propertyFetchType(`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1232,6 +1232,7 @@ public function dataFileAsserts(): iterable`
`1232`	`1232`	`if (PHP_VERSION_ID >= 80000) {`
`1233`	`1233`	`yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-10071.php');`
`1234`	`1234`	`yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-9394.php');`
	`1235`	`+ yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-nullsafe-prop-static-access.php');`
`1235`	`1236`	`}`
`1236`	`1237`
`1237`	`1238`	`yield from $this->gatherAssertTypes(__DIR__ . '/data/allowed-subtypes-datetime.php');`

Lines changed: 28 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,28 @@`
	`1`	`+<?php declare(strict_types=1); // lint >= 8.0`
	`2`	`+`
	`3`	`+namespace BugNullsafePropStaticAccess;`
	`4`	`+`
	`5`	`+class A`
	`6`	`+{`
	`7`	`+ public function __construct(public readonly B $b)`
	`8`	`+ {}`
	`9`	`+}`
	`10`	`+`
	`11`	`+class B`
	`12`	`+{`
	`13`	`+ public static int $value = 0;`
	`14`	`+`
	`15`	`+ public static function get(): string`
	`16`	`+ {`
	`17`	`+ return 'B';`
	`18`	`+ }`
	`19`	`+}`
	`20`	`+`
	`21`	`+function foo(?A $a): void`
	`22`	`+{`
	`23`	`+ \PHPStan\Testing\assertType('string\|null', $a?->b::get());`
	`24`	`+ \PHPStan\Testing\assertType('string\|null', $a?->b->get());`
	`25`	`+`
	`26`	`+ \PHPStan\Testing\assertType('int\|null', $a?->b::$value);`
	`27`	`+ \PHPStan\Testing\assertType('int\|null', $a?->b->value);`
	`28`	`+}`

Comments

(0)