Fixes after PHPStan updates

phpstan · Sep 26, 2024 · c17a736 · c17a736
1 parent a110d8a
commit c17a736
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/src/Type/Doctrine/DBAL/QueryBuilder/QueryBuilderExecuteMethodExtension.php b/src/Type/Doctrine/DBAL/QueryBuilder/QueryBuilderExecuteMethodExtension.php
@@ -38,7 +38,11 @@ public function isMethodSupported(MethodReflection $methodReflection): bool
 
 	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
 	{
-		$defaultReturnType = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+		$defaultReturnType = ParametersAcceptorSelector::selectFromArgs(
+			$scope,
+			$methodCall->getArgs(),
+			$methodReflection->getVariants()
+		)->getReturnType();
 
 		$queryBuilderType = new ObjectType(QueryBuilder::class);
 		$var = $methodCall->var;

diff --git a/src/Type/Doctrine/DBAL/RowCountMethodDynamicReturnTypeExtension.php b/src/Type/Doctrine/DBAL/RowCountMethodDynamicReturnTypeExtension.php
@@ -8,7 +8,6 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Doctrine\Driver\DriverDetector;
 use PHPStan\Reflection\MethodReflection;
-use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Type\Doctrine\ObjectMetadataResolver;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
@@ -76,7 +75,7 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 		}
 
 		$rowCountMethod = $resultReflection->getNativeMethod('rowCount');
-		$variant = ParametersAcceptorSelector::selectSingle($rowCountMethod->getVariants());
+		$variant = $rowCountMethod->getOnlyVariant();
 
 		return $variant->getReturnType();
 	}

diff --git a/src/Type/Doctrine/Query/QueryResultDynamicReturnTypeExtension.php b/src/Type/Doctrine/Query/QueryResultDynamicReturnTypeExtension.php
@@ -68,8 +68,10 @@ public function getTypeFromMethodCall(
 		if (isset($args[$argIndex])) {
 			$hydrationMode = $scope->getType($args[$argIndex]->value);
 		} else {
-			$parametersAcceptor = ParametersAcceptorSelector::selectSingle(
-				$methodReflection->getVariants(),
+			$parametersAcceptor = ParametersAcceptorSelector::selectFromArgs(
+				$scope,
+				$methodCall->getArgs(),
+				$methodReflection->getVariants()
 			);
 			$parameter = $parametersAcceptor->getParameters()[$argIndex];
 			$hydrationMode = $parameter->getDefaultValue() ?? new NullType();

diff --git a/src/Type/Doctrine/Query/QueryResultTypeWalker.php b/src/Type/Doctrine/Query/QueryResultTypeWalker.php
@@ -609,7 +609,7 @@ public function walkFunction($function): string
 				if ($this->driverType === DriverDetector::MYSQLI || $this->driverType === DriverDetector::PDO_MYSQL || $this->driverType === DriverDetector::SQLITE3 || $this->driverType === DriverDetector::PDO_SQLITE) {
 					$type = new FloatType();
 
-					$cannotBeNegative = $exprType->isSmallerThan(new ConstantIntegerType(0))->no();
+					$cannotBeNegative = $exprType->isSmallerThan(new ConstantIntegerType(0), $this->phpVersion)->no();
 					$canBeNegative = !$cannotBeNegative;
 					if ($canBeNegative) {
 						$type = TypeCombinator::addNull($type);

diff --git a/src/Type/Doctrine/QueryBuilder/QueryBuilderMethodDynamicReturnTypeExtension.php b/src/Type/Doctrine/QueryBuilder/QueryBuilderMethodDynamicReturnTypeExtension.php
@@ -7,7 +7,6 @@
 use PhpParser\Node\Identifier;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
-use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Type\Doctrine\DoctrineTypeUtils;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
 use PHPStan\Type\MixedType;
@@ -39,9 +38,7 @@ public function getClass(): string
 
 	public function isMethodSupported(MethodReflection $methodReflection): bool
 	{
-		$returnType = ParametersAcceptorSelector::selectSingle(
-			$methodReflection->getVariants(),
-		)->getReturnType();
+		$returnType = $methodReflection->getVariants()[0]->getReturnType();
 		if ($returnType instanceof MixedType) {
 			return false;
 		}