CompactFunctionReturnTypeExtension - observe checkMaybeUndefinedVariables

ondrejmirtes · ondrejmirtes · commit de58f9a72ce0 · 2021-02-01T14:12:28.000+01:00
diff --git a/conf/config.neon b/conf/config.neon
@@ -900,6 +900,8 @@ services:
 		class: PHPStan\Type\Php\CompactFunctionReturnTypeExtension
 		tags:
 			- phpstan.broker.dynamicFunctionReturnTypeExtension
+		arguments:
+			checkMaybeUndefinedVariables: %checkMaybeUndefinedVariables%
 
 	-
 		class: PHPStan\Type\Php\CountFunctionReturnTypeExtension
diff --git a/src/Type/Php/CompactFunctionReturnTypeExtension.php b/src/Type/Php/CompactFunctionReturnTypeExtension.php
@@ -15,6 +15,13 @@
 class CompactFunctionReturnTypeExtension implements DynamicFunctionReturnTypeExtension
 {
 
+	private bool $checkMaybeUndefinedVariables;
+
+	public function __construct(bool $checkMaybeUndefinedVariables)
+	{
+		$this->checkMaybeUndefinedVariables = $checkMaybeUndefinedVariables;
+	}
+
 	public function isFunctionSupported(FunctionReflection $functionReflection): bool
 	{
 		return $functionReflection->getName() === 'compact';
@@ -31,7 +38,7 @@ public function getTypeFromFunctionCall(
 			return $defaultReturnType;
 		}
 
-		if ($scope->canAnyVariableExist()) {
+		if ($scope->canAnyVariableExist() && !$this->checkMaybeUndefinedVariables) {
 			return $defaultReturnType;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -900,6 +900,8 @@ services:`
`900`	`900`	`class: PHPStan\Type\Php\CompactFunctionReturnTypeExtension`
`901`	`901`	`tags:`
`902`	`902`	`- phpstan.broker.dynamicFunctionReturnTypeExtension`
	`903`	`+ arguments:`
	`904`	`+ checkMaybeUndefinedVariables: %checkMaybeUndefinedVariables%`
`903`	`905`
`904`	`906`	`-`
`905`	`907`	`class: PHPStan\Type\Php\CountFunctionReturnTypeExtension`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,13 @@`
`15`	`15`	`class CompactFunctionReturnTypeExtension implements DynamicFunctionReturnTypeExtension`
`16`	`16`	`{`
`17`	`17`
	`18`	`+ private bool $checkMaybeUndefinedVariables;`
	`19`	`+`
	`20`	`+ public function __construct(bool $checkMaybeUndefinedVariables)`
	`21`	`+ {`
	`22`	`+ $this->checkMaybeUndefinedVariables = $checkMaybeUndefinedVariables;`
	`23`	`+ }`
	`24`	`+`
`18`	`25`	`public function isFunctionSupported(FunctionReflection $functionReflection): bool`
`19`	`26`	`{`
`20`	`27`	`return $functionReflection->getName() === 'compact';`
`@@ -31,7 +38,7 @@ public function getTypeFromFunctionCall(`
`31`	`38`	`return $defaultReturnType;`
`32`	`39`	`}`
`33`	`40`
`34`		`- if ($scope->canAnyVariableExist()) {`
	`41`	`+ if ($scope->canAnyVariableExist() && !$this->checkMaybeUndefinedVariables) {`
`35`	`42`	`return $defaultReturnType;`
`36`	`43`	`}`
`37`	`44`