Fix internal ServiceLocatorDynamicReturnTypeExtension

phpstan · Aug 30, 2023 · 373e8cc · 373e8cc
1 parent c1ad4ce
commit 373e8cc
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/build/PHPStan/Build/ServiceLocatorDynamicReturnTypeExtension.php b/build/PHPStan/Build/ServiceLocatorDynamicReturnTypeExtension.php
@@ -6,7 +6,6 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
-use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 
@@ -34,10 +33,14 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 
 		$returnType = ParametersAcceptorSelector::selectFromArgs($scope, $methodCall->getArgs(), $methodReflection->getVariants())->getReturnType();
 
-		if ($methodReflection->getName() === 'getByType' && count($methodCall->getArgs()) >= 2) {
-			$argType = $scope->getType($methodCall->getArgs()[1]->value);
-			if ($argType->isTrue()->yes()) {
-				$returnType = TypeCombinator::addNull($returnType);
+		if ($methodReflection->getName() === 'getByType') {
+			if (count($methodCall->getArgs()) < 2) {
+				$returnType = TypeCombinator::removeNull($returnType);
+			} else {
+				$argType = $scope->getType($methodCall->getArgs()[1]->value);
+				if ($argType->isTrue()->yes()) {
+					$returnType = TypeCombinator::removeNull($returnType);
+				}
 			}
 		}