Commit cdaa291

committed

feat: treat void as null for null coalescing operator

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>

1 parent e95f537 commit cdaa291Copy full SHA for cdaa291

File tree

+39

-2

lines changed

+39

-2

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`use PHPStan\Rules\Rule;`
`9`	`9`	`use PHPStan\Type\NullType;`
`10`	`10`	`use PHPStan\Type\Type;`
	`11`	`+use PHPStan\Type\VoidType;`
`11`	`12`
`12`	`13`	`/**`
`13`	`14`	`* @implements Rule<Node\Expr>`
`@@ -27,12 +28,13 @@ public function getNodeType(): string`
`27`	`28`	`public function processNode(Node $node, Scope $scope): array`
`28`	`29`	`{`
`29`	`30`	`$typeMessageCallback = static function (Type $type): ?string {`
	`31`	`+ $isVoid = (new VoidType())->isSuperTypeOf($type);`
`30`	`32`	`$isNull = (new NullType())->isSuperTypeOf($type);`
`31`		`- if ($isNull->maybe()) {`
	`33`	`+ if ($isNull->maybe() \|\| $isVoid->maybe()) {`
`32`	`34`	`return null;`
`33`	`35`	`}`
`34`	`36`
`35`		`- if ($isNull->yes()) {`
	`37`	`+ if ($isNull->yes() \|\| $isVoid->yes()) {`
`36`	`38`	`return 'is always null';`
`37`	`39`	`}`
`38`	`40`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -368,4 +368,17 @@ public function testBug8084(): void`
`368`	`368`	`$this->analyse([__DIR__ . '/data/bug-8084.php'], []);`
`369`	`369`	`}`
`370`	`370`
	`371`	`+ public function testVoid(): void`
	`372`	`+ {`
	`373`	`+ $this->treatPhpDocTypesAsCertain = true;`
	`374`	`+ $this->strictUnnecessaryNullsafePropertyFetch = true;`
	`375`	`+`
	`376`	`+ $this->analyse([__DIR__ . '/data/null-coalesce-void.php'], [`
	`377`	`+ [`
	`378`	`+ 'Expression on left side of ?? is always null.',`
	`379`	`+ 22,`
	`380`	`+ ],`
	`381`	`+ ]);`
	`382`	`+ }`
	`383`	`+`
`371`	`384`	`}`

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,22 @@`
	`1`	`+<?php // lint >= 8.0`
	`2`	`+`
	`3`	`+namespace CoalesceRuleVoid;`
	`4`	`+`
	`5`	`+/** @return array\|void */`
	`6`	`+function get_post_custom_keys($maybe = false)`
	`7`	`+{`
	`8`	`+ if ($maybe) {`
	`9`	`+ return;`
	`10`	`+ }`
	`11`	`+`
	`12`	`+ return [];`
	`13`	`+}`
	`14`	`+`
	`15`	`+function foo_bar(): void`
	`16`	`+{`
	`17`	`+ return;`
	`18`	`+}`
	`19`	`+`
	`20`	`+$test1 = get_post_custom_keys(true) ?? 'foo';`
	`21`	`+`
	`22`	`+$test2 = foo_bar() ?? 'bar';`

Comments

(0)