Commit 8e6eaf1

rvanvelzenondrejmirtes

authored and

committed

Fix resolving nested conditional types with union subjects

1 parent 3334735 commit 8e6eaf1Copy full SHA for 8e6eaf1

File tree

+56

-7

lines changed

+56

-7

lines changed

Lines changed: 17 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -113,15 +113,29 @@ protected function getResult(): Type`
`113`	`113`	`{`
`114`	`114`	`$isSuperType = $this->target->isSuperTypeOf($this->subject);`
`115`	`115`
	`116`	`+ $yesType = fn () => TypeTraverser::map(!$this->negated ? $this->if : $this->else, function (Type $type, callable $traverse) {`
	`117`	`+ if ($type->equals($this->subject)) {`
	`118`	`+ return !$this->negated ? TypeCombinator::intersect($type, $this->target) : TypeCombinator::remove($type, $this->target);`
	`119`	`+ }`
	`120`	`+ return $traverse($type);`
	`121`	`+ });`
	`122`	`+`
	`123`	`+ $noType = fn () => TypeTraverser::map(!$this->negated ? $this->else : $this->if, function (Type $type, callable $traverse) {`
	`124`	`+ if ($type->equals($this->subject)) {`
	`125`	`+ return !$this->negated ? TypeCombinator::remove($type, $this->target) : TypeCombinator::intersect($type, $this->target);`
	`126`	`+ }`
	`127`	`+ return $traverse($type);`
	`128`	`+ });`
	`129`	`+`
`116`	`130`	`if ($isSuperType->yes()) {`
`117`		`- return !$this->negated ? $this->if : $this->else;`
	`131`	`+ return $yesType();`
`118`	`132`	`}`
`119`	`133`
`120`	`134`	`if ($isSuperType->no()) {`
`121`		`- return !$this->negated ? $this->else : $this->if;`
	`135`	`+ return $noType();`
`122`	`136`	`}`
`123`	`137`
`124`		`- return TypeCombinator::union($this->if, $this->else);`
	`138`	`+ return TypeCombinator::union($yesType(), $noType());`
`125`	`139`	`}`
`126`	`140`
`127`	`141`	`public function traverse(callable $cb): Type`

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -409,13 +409,11 @@ public static function containsTemplateType(Type $type): bool`
`409`	`409`	`public static function resolveLateResolvableTypes(Type $type, bool $resolveUnresolvableTypes = true): Type`
`410`	`410`	`{`
`411`	`411`	`return TypeTraverser::map($type, static function (Type $type, callable $traverse) use ($resolveUnresolvableTypes): Type {`
`412`		`- $type = $traverse($type);`
`413`		`-`
`414`		`- if ($type instanceof LateResolvableType && ($resolveUnresolvableTypes \|\| $type->isResolvable())) {`
	`412`	`+ while ($type instanceof LateResolvableType && ($resolveUnresolvableTypes \|\| $type->isResolvable())) {`
`415`	`413`	`$type = $type->resolve();`
`416`	`414`	`}`
`417`	`415`
`418`		`- return $type;`
	`416`	`+ return $traverse($type);`
`419`	`417`	`});`
`420`	`418`	`}`
`421`	`419`

Lines changed: 37 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,37 @@`
	`1`	`+<?php declare(strict_types = 1);`
	`2`	`+`
	`3`	`+namespace Bug9860;`
	`4`	`+`
	`5`	`+use function PHPStan\Testing\assertType;`
	`6`	`+`
	`7`	`+class A {}`
	`8`	`+class B {}`
	`9`	`+class C {}`
	`10`	`+`
	`11`	`+class ANode {}`
	`12`	`+class BNode {}`
	`13`	`+class CNode {}`
	`14`	`+`
	`15`	`+class HelloWorld`
	`16`	`+{`
	`17`	`+ public function a(): A\|B {`
	`18`	`+ return new A();`
	`19`	`+ }`
	`20`	`+`
	`21`	`+ /**`
	`22`	`+ * @return ($b is A ? ANode : ($b is B ? BNode : CNode))`
	`23`	`+ */`
	`24`	`+ public function b(A\|B\|C $b): ANode\|BNode\|CNode {`
	`25`	`+ return match(true) {`
	`26`	`+ $b instanceof A => new ANode(),`
	`27`	`+ $b instanceof B => new BNode(),`
	`28`	`+ default => new CNode(),`
	`29`	`+ };`
	`30`	`+ }`
	`31`	`+`
	`32`	`+ public function test(): void {`
	`33`	`+ assertType('Bug9860\\ANode', $this->b(new A()));`
	`34`	`+ assertType('Bug9860\\BNode', $this->b(new B()));`
	`35`	`+ assertType('Bug9860\\ANode\|Bug9860\\BNode', $this->b($this->a()));`
	`36`	`+ }`
	`37`	`+}`

Comments

(0)