Utilize null-default return to simplify extensions

clxmstaab · ondrejmirtes · commit fca08349c279 · 2022-12-29T20:35:13.000+01:00
diff --git a/src/Type/Symfony/CommandGetHelperDynamicReturnTypeExtension.php b/src/Type/Symfony/CommandGetHelperDynamicReturnTypeExtension.php
@@ -36,22 +36,20 @@ public function isMethodSupported(MethodReflection $methodReflection): bool
 		return $methodReflection->getName() === 'getHelper';
 	}
 
-	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
+	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): ?Type
 	{
-		$defaultReturnType = new ObjectType('Symfony\Component\Console\Helper\HelperInterface');
-
 		if (!isset($methodCall->getArgs()[0])) {
-			return $defaultReturnType;
+			return null;
 		}
 
 		$classReflection = $scope->getClassReflection();
 		if ($classReflection === null) {
-			return $defaultReturnType;
+			return null;
 		}
 
 		$argStrings = TypeUtils::getConstantStrings($scope->getType($methodCall->getArgs()[0]->value));
 		if (count($argStrings) !== 1) {
-			return $defaultReturnType;
+			return null;
 		}
 		$argName = $argStrings[0]->getValue();
 
@@ -65,7 +63,7 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 			}
 		}
 
-		return count($returnTypes) > 0 ? TypeCombinator::union(...$returnTypes) : $defaultReturnType;
+		return count($returnTypes) > 0 ? TypeCombinator::union(...$returnTypes) : null;
 	}
 
 }
diff --git a/src/Type/Symfony/InputInterfaceGetArgumentDynamicReturnTypeExtension.php b/src/Type/Symfony/InputInterfaceGetArgumentDynamicReturnTypeExtension.php
@@ -6,7 +6,6 @@
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
-use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Symfony\ConsoleApplicationResolver;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
@@ -38,22 +37,20 @@ public function isMethodSupported(MethodReflection $methodReflection): bool
 		return $methodReflection->getName() === 'getArgument';
 	}
 
-	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
+	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): ?Type
 	{
-		$defaultReturnType = ParametersAcceptorSelector::selectFromArgs($scope, $methodCall->getArgs(), $methodReflection->getVariants())->getReturnType();
-
 		if (!isset($methodCall->getArgs()[0])) {
-			return $defaultReturnType;
+			return null;
 		}
 
 		$classReflection = $scope->getClassReflection();
 		if ($classReflection === null) {
-			return $defaultReturnType;
+			return null;
 		}
 
 		$argStrings = TypeUtils::getConstantStrings($scope->getType($methodCall->getArgs()[0]->value));
 		if (count($argStrings) !== 1) {
-			return $defaultReturnType;
+			return null;
 		}
 		$argName = $argStrings[0]->getValue();
 
@@ -79,7 +76,7 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 			}
 		}
 
-		return count($argTypes) > 0 ? TypeCombinator::union(...$argTypes) : $defaultReturnType;
+		return count($argTypes) > 0 ? TypeCombinator::union(...$argTypes) : null;
 	}
 
 }
diff --git a/src/Type/Symfony/InputInterfaceGetOptionDynamicReturnTypeExtension.php b/src/Type/Symfony/InputInterfaceGetOptionDynamicReturnTypeExtension.php
@@ -6,7 +6,6 @@
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
-use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Symfony\ConsoleApplicationResolver;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
 use PHPStan\Type\Type;
@@ -39,22 +38,20 @@ public function isMethodSupported(MethodReflection $methodReflection): bool
 		return $methodReflection->getName() === 'getOption';
 	}
 
-	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
+	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): ?Type
 	{
-		$defaultReturnType = ParametersAcceptorSelector::selectFromArgs($scope, $methodCall->getArgs(), $methodReflection->getVariants())->getReturnType();
-
 		if (!isset($methodCall->getArgs()[0])) {
-			return $defaultReturnType;
+			return null;
 		}
 
 		$classReflection = $scope->getClassReflection();
 		if ($classReflection === null) {
-			return $defaultReturnType;
+			return null;
 		}
 
 		$optStrings = TypeUtils::getConstantStrings($scope->getType($methodCall->getArgs()[0]->value));
 		if (count($optStrings) !== 1) {
-			return $defaultReturnType;
+			return null;
 		}
 		$optName = $optStrings[0]->getValue();
 
@@ -69,7 +66,7 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 			}
 		}
 
-		return count($optTypes) > 0 ? TypeCombinator::union(...$optTypes) : $defaultReturnType;
+		return count($optTypes) > 0 ? TypeCombinator::union(...$optTypes) : null;
 	}
 
 }
diff --git a/src/Type/Symfony/InputInterfaceGetOptionsDynamicReturnTypeExtension.php b/src/Type/Symfony/InputInterfaceGetOptionsDynamicReturnTypeExtension.php
@@ -6,7 +6,6 @@
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
-use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Symfony\ConsoleApplicationResolver;
 use PHPStan\Type\Constant\ConstantArrayTypeBuilder;
 use PHPStan\Type\Constant\ConstantStringType;
@@ -40,12 +39,11 @@ public function isMethodSupported(MethodReflection $methodReflection): bool
 		return $methodReflection->getName() === 'getOptions';
 	}
 
-	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
+	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): ?Type
 	{
-		$defaultReturnType = ParametersAcceptorSelector::selectFromArgs($scope, $methodCall->getArgs(), $methodReflection->getVariants())->getReturnType();
 		$classReflection = $scope->getClassReflection();
 		if ($classReflection === null) {
-			return $defaultReturnType;
+			return null;
 		}
 
 		$optTypes = [];
@@ -65,7 +63,7 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 			}
 		}
 
-		return count($optTypes) > 0 ? TypeCombinator::union(...$optTypes) : $defaultReturnType;
+		return count($optTypes) > 0 ? TypeCombinator::union(...$optTypes) : null;
 	}
 
 }
diff --git a/src/Type/Symfony/InputInterfaceHasArgumentDynamicReturnTypeExtension.php b/src/Type/Symfony/InputInterfaceHasArgumentDynamicReturnTypeExtension.php
@@ -7,7 +7,6 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Symfony\ConsoleApplicationResolver;
-use PHPStan\Type\BooleanType;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
 use PHPStan\Type\Type;
@@ -36,22 +35,20 @@ public function isMethodSupported(MethodReflection $methodReflection): bool
 		return $methodReflection->getName() === 'hasArgument';
 	}
 
-	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
+	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): ?Type
 	{
-		$defaultReturnType = new BooleanType();
-
 		if (!isset($methodCall->getArgs()[0])) {
-			return $defaultReturnType;
+			return null;
 		}
 
 		$classReflection = $scope->getClassReflection();
 		if ($classReflection === null) {
-			return $defaultReturnType;
+			return null;
 		}
 
 		$argStrings = TypeUtils::getConstantStrings($scope->getType($methodCall->getArgs()[0]->value));
 		if (count($argStrings) !== 1) {
-			return $defaultReturnType;
+			return null;
 		}
 		$argName = $argStrings[0]->getValue();
 
@@ -67,11 +64,11 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 		}
 
 		if (count($returnTypes) === 0) {
-			return $defaultReturnType;
+			return null;
 		}
 
 		$returnTypes = array_unique($returnTypes);
-		return count($returnTypes) === 1 ? new ConstantBooleanType($returnTypes[0]) : $defaultReturnType;
+		return count($returnTypes) === 1 ? new ConstantBooleanType($returnTypes[0]) : null;
 	}
 
 }
diff --git a/src/Type/Symfony/InputInterfaceHasOptionDynamicReturnTypeExtension.php b/src/Type/Symfony/InputInterfaceHasOptionDynamicReturnTypeExtension.php
@@ -7,7 +7,6 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Symfony\ConsoleApplicationResolver;
-use PHPStan\Type\BooleanType;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
 use PHPStan\Type\Type;
@@ -36,22 +35,20 @@ public function isMethodSupported(MethodReflection $methodReflection): bool
 		return $methodReflection->getName() === 'hasOption';
 	}
 
-	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
+	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): ?Type
 	{
-		$defaultReturnType = new BooleanType();
-
 		if (!isset($methodCall->getArgs()[0])) {
-			return $defaultReturnType;
+			return null;
 		}
 
 		$classReflection = $scope->getClassReflection();
 		if ($classReflection === null) {
-			return $defaultReturnType;
+			return null;
 		}
 
 		$optStrings = TypeUtils::getConstantStrings($scope->getType($methodCall->getArgs()[0]->value));
 		if (count($optStrings) !== 1) {
-			return $defaultReturnType;
+			return null;
 		}
 		$optName = $optStrings[0]->getValue();
 
@@ -67,11 +64,11 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 		}
 
 		if (count($returnTypes) === 0) {
-			return $defaultReturnType;
+			return null;
 		}
 
 		$returnTypes = array_unique($returnTypes);
-		return count($returnTypes) === 1 ? new ConstantBooleanType($returnTypes[0]) : $defaultReturnType;
+		return count($returnTypes) === 1 ? new ConstantBooleanType($returnTypes[0]) : null;
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -36,22 +36,20 @@ public function isMethodSupported(MethodReflection $methodReflection): bool`
`36`	`36`	`return $methodReflection->getName() === 'getHelper';`
`37`	`37`	`}`
`38`	`38`
`39`		`- public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type`
	`39`	`+ public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): ?Type`
`40`	`40`	`{`
`41`		`- $defaultReturnType = new ObjectType('Symfony\Component\Console\Helper\HelperInterface');`
`42`		`-`
`43`	`41`	`if (!isset($methodCall->getArgs()[0])) {`
`44`		`- return $defaultReturnType;`
	`42`	`+ return null;`
`45`	`43`	`}`
`46`	`44`
`47`	`45`	`$classReflection = $scope->getClassReflection();`
`48`	`46`	`if ($classReflection === null) {`
`49`		`- return $defaultReturnType;`
	`47`	`+ return null;`
`50`	`48`	`}`
`51`	`49`
`52`	`50`	`$argStrings = TypeUtils::getConstantStrings($scope->getType($methodCall->getArgs()[0]->value));`
`53`	`51`	`if (count($argStrings) !== 1) {`
`54`		`- return $defaultReturnType;`
	`52`	`+ return null;`
`55`	`53`	`}`
`56`	`54`	`$argName = $argStrings[0]->getValue();`
`57`	`55`
`@@ -65,7 +63,7 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method`
`65`	`63`	`}`
`66`	`64`	`}`
`67`	`65`
`68`		`- return count($returnTypes) > 0 ? TypeCombinator::union(...$returnTypes) : $defaultReturnType;`
	`66`	`+ return count($returnTypes) > 0 ? TypeCombinator::union(...$returnTypes) : null;`
`69`	`67`	`}`
`70`	`68`
`71`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`use PhpParser\Node\Expr\MethodCall;`
`7`	`7`	`use PHPStan\Analyser\Scope;`
`8`	`8`	`use PHPStan\Reflection\MethodReflection;`
`9`		`-use PHPStan\Reflection\ParametersAcceptorSelector;`
`10`	`9`	`use PHPStan\Symfony\ConsoleApplicationResolver;`
`11`	`10`	`use PHPStan\Type\ArrayType;`
`12`	`11`	`use PHPStan\Type\DynamicMethodReturnTypeExtension;`
`@@ -38,22 +37,20 @@ public function isMethodSupported(MethodReflection $methodReflection): bool`
`38`	`37`	`return $methodReflection->getName() === 'getArgument';`
`39`	`38`	`}`
`40`	`39`
`41`		`- public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type`
	`40`	`+ public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): ?Type`
`42`	`41`	`{`
`43`		`- $defaultReturnType = ParametersAcceptorSelector::selectFromArgs($scope, $methodCall->getArgs(), $methodReflection->getVariants())->getReturnType();`
`44`		`-`
`45`	`42`	`if (!isset($methodCall->getArgs()[0])) {`
`46`		`- return $defaultReturnType;`
	`43`	`+ return null;`
`47`	`44`	`}`
`48`	`45`
`49`	`46`	`$classReflection = $scope->getClassReflection();`
`50`	`47`	`if ($classReflection === null) {`
`51`		`- return $defaultReturnType;`
	`48`	`+ return null;`
`52`	`49`	`}`
`53`	`50`
`54`	`51`	`$argStrings = TypeUtils::getConstantStrings($scope->getType($methodCall->getArgs()[0]->value));`
`55`	`52`	`if (count($argStrings) !== 1) {`
`56`		`- return $defaultReturnType;`
	`53`	`+ return null;`
`57`	`54`	`}`
`58`	`55`	`$argName = $argStrings[0]->getValue();`
`59`	`56`
`@@ -79,7 +76,7 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method`
`79`	`76`	`}`
`80`	`77`	`}`
`81`	`78`
`82`		`- return count($argTypes) > 0 ? TypeCombinator::union(...$argTypes) : $defaultReturnType;`
	`79`	`+ return count($argTypes) > 0 ? TypeCombinator::union(...$argTypes) : null;`
`83`	`80`	`}`
`84`	`81`
`85`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`use PHPStan\Analyser\Scope;`
`8`	`8`	`use PHPStan\Reflection\MethodReflection;`
`9`	`9`	`use PHPStan\Symfony\ConsoleApplicationResolver;`
`10`		`-use PHPStan\Type\BooleanType;`
`11`	`10`	`use PHPStan\Type\Constant\ConstantBooleanType;`
`12`	`11`	`use PHPStan\Type\DynamicMethodReturnTypeExtension;`
`13`	`12`	`use PHPStan\Type\Type;`
`@@ -36,22 +35,20 @@ public function isMethodSupported(MethodReflection $methodReflection): bool`
`36`	`35`	`return $methodReflection->getName() === 'hasArgument';`
`37`	`36`	`}`
`38`	`37`
`39`		`- public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type`
	`38`	`+ public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): ?Type`
`40`	`39`	`{`
`41`		`- $defaultReturnType = new BooleanType();`
`42`		`-`
`43`	`40`	`if (!isset($methodCall->getArgs()[0])) {`
`44`		`- return $defaultReturnType;`
	`41`	`+ return null;`
`45`	`42`	`}`
`46`	`43`
`47`	`44`	`$classReflection = $scope->getClassReflection();`
`48`	`45`	`if ($classReflection === null) {`
`49`		`- return $defaultReturnType;`
	`46`	`+ return null;`
`50`	`47`	`}`
`51`	`48`
`52`	`49`	`$argStrings = TypeUtils::getConstantStrings($scope->getType($methodCall->getArgs()[0]->value));`
`53`	`50`	`if (count($argStrings) !== 1) {`
`54`		`- return $defaultReturnType;`
	`51`	`+ return null;`
`55`	`52`	`}`
`56`	`53`	`$argName = $argStrings[0]->getValue();`
`57`	`54`
`@@ -67,11 +64,11 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method`
`67`	`64`	`}`
`68`	`65`
`69`	`66`	`if (count($returnTypes) === 0) {`
`70`		`- return $defaultReturnType;`
	`67`	`+ return null;`
`71`	`68`	`}`
`72`	`69`
`73`	`70`	`$returnTypes = array_unique($returnTypes);`
`74`		`- return count($returnTypes) === 1 ? new ConstantBooleanType($returnTypes[0]) : $defaultReturnType;`
	`71`	`+ return count($returnTypes) === 1 ? new ConstantBooleanType($returnTypes[0]) : null;`
`75`	`72`	`}`
`76`	`73`
`77`	`74`	`}`