Fixes after PHPStan update

ondrejmirtes · ondrejmirtes · commit 5a256b668121 · 2024-09-26T20:10:02.000+02:00
diff --git a/src/Reflection/Nette/NetteObjectClassReflectionExtension.php b/src/Reflection/Nette/NetteObjectClassReflectionExtension.php
@@ -7,7 +7,6 @@
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\MethodsClassReflectionExtension;
-use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Reflection\PropertiesClassReflectionExtension;
 use PHPStan\Reflection\PropertyReflection;
 use function array_merge;
@@ -53,7 +52,7 @@ public function getProperty(ClassReflection $classReflection, string $propertyNa
 	{
 		/** @var MethodReflection $getterMethod */
 		$getterMethod = $this->getMethodByProperty($classReflection, $propertyName);
-		return new NetteObjectPropertyReflection($classReflection, ParametersAcceptorSelector::selectSingle($getterMethod->getVariants())->getReturnType());
+		return new NetteObjectPropertyReflection($classReflection, $getterMethod->getVariants()[0]->getReturnType());
 	}
 
 	public function hasMethod(ClassReflection $classReflection, string $methodName): bool
diff --git a/src/Type/Nette/ComponentGetPresenterDynamicReturnTypeExtension.php b/src/Type/Nette/ComponentGetPresenterDynamicReturnTypeExtension.php
@@ -26,7 +26,9 @@ public function isMethodSupported(MethodReflection $methodReflection): bool
 
 	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
 	{
-		$methodDefinition = ParametersAcceptorSelector::selectSingle(
+		$methodDefinition = ParametersAcceptorSelector::selectFromArgs(
+			$scope,
+			$methodCall->getArgs(),
 			$methodReflection->getVariants(),
 		);
 		$defaultReturnType = $methodDefinition->getReturnType();
diff --git a/src/Type/Nette/ComponentLookupDynamicReturnTypeExtension.php b/src/Type/Nette/ComponentLookupDynamicReturnTypeExtension.php
@@ -26,7 +26,9 @@ public function isMethodSupported(MethodReflection $methodReflection): bool
 
 	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
 	{
-		$defaultReturnType = ParametersAcceptorSelector::selectSingle(
+		$defaultReturnType = ParametersAcceptorSelector::selectFromArgs(
+			$scope,
+			$methodCall->getArgs(),
 			$methodReflection->getVariants(),
 		)->getReturnType();
 		if (count($methodCall->getArgs()) < 2) {
diff --git a/src/Type/Nette/ComponentModelArrayAccessDynamicReturnTypeExtension.php b/src/Type/Nette/ComponentModelArrayAccessDynamicReturnTypeExtension.php
@@ -2,7 +2,9 @@
 
 namespace PHPStan\Type\Nette;
 
+use PhpParser\Node\Arg;
 use PhpParser\Node\Expr\MethodCall;
+use PhpParser\Node\Scalar\String_;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
@@ -38,13 +40,13 @@ public function getTypeFromMethodCall(
 	): Type
 	{
 		$calledOnType = $scope->getType($methodCall->var);
-		$defaultType = ParametersAcceptorSelector::selectSingle($calledOnType->getMethod('createComponent', $scope)->getVariants())->getReturnType();
+		$defaultType = $calledOnType->getMethod('createComponent', $scope)->getVariants()[0]->getReturnType();
 		$defaultType = TypeCombinator::remove($defaultType, new NullType());
 		if ($defaultType->isSuperTypeOf(new ObjectType('Nette\ComponentModel\IComponent'))->yes()) {
 			$defaultType = new MixedType(false, new NullType());
 		}
 		$args = $methodCall->getArgs();
-		if (count($args) !== 1) {
+		if (count($args) < 1) {
 			return $defaultType;
 		}
 
@@ -64,7 +66,11 @@ public function getTypeFromMethodCall(
 
 			$method = $calledOnType->getMethod($methodName, $scope);
 
-			$types[] = ParametersAcceptorSelector::selectSingle($method->getVariants())->getReturnType();
+			$types[] = ParametersAcceptorSelector::selectFromArgs(
+				$scope,
+				[new Arg(new String_($componentName))],
+				$method->getVariants(),
+			)->getReturnType();
 		}
 
 		return TypeCombinator::union(...$types);
diff --git a/src/Type/Nette/ComponentModelDynamicReturnTypeExtension.php b/src/Type/Nette/ComponentModelDynamicReturnTypeExtension.php
@@ -2,7 +2,9 @@
 
 namespace PHPStan\Type\Nette;
 
+use PhpParser\Node\Arg;
 use PhpParser\Node\Expr\MethodCall;
+use PhpParser\Node\Scalar\String_;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
@@ -38,7 +40,7 @@ public function getTypeFromMethodCall(
 	): Type
 	{
 		$calledOnType = $scope->getType($methodCall->var);
-		$defaultType = ParametersAcceptorSelector::selectSingle($calledOnType->getMethod('createComponent', $scope)->getVariants())->getReturnType();
+		$defaultType = $calledOnType->getMethod('createComponent', $scope)->getVariants()[0]->getReturnType();
 		if ($defaultType->isSuperTypeOf(new ObjectType('Nette\ComponentModel\IComponent'))->yes()) {
 			$defaultType = new MixedType();
 		}
@@ -75,7 +77,11 @@ public function getTypeFromMethodCall(
 
 			$method = $calledOnType->getMethod($methodName, $scope);
 
-			$types[] = ParametersAcceptorSelector::selectSingle($method->getVariants())->getReturnType();
+			$types[] = ParametersAcceptorSelector::selectFromArgs(
+				$scope,
+				[new Arg(new String_($componentName))],
+				$method->getVariants(),
+			)->getReturnType();
 		}
 
 		return TypeCombinator::union(...$types);
diff --git a/src/Type/Nette/FormContainerUnsafeValuesDynamicReturnTypeExtension.php b/src/Type/Nette/FormContainerUnsafeValuesDynamicReturnTypeExtension.php
@@ -5,7 +5,6 @@
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
-use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
 use PHPStan\Type\MixedType;
@@ -27,10 +26,10 @@ public function isMethodSupported(MethodReflection $methodReflection): bool
 		return $methodReflection->getName() === 'getUnsafeValues';
 	}
 
-	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
+	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): ?Type
 	{
 		if (count($methodCall->getArgs()) === 0) {
-			return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+			return null;
 		}
 
 		$arg = $methodCall->getArgs()[0]->value;
@@ -43,7 +42,7 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 			return new ArrayType(new StringType(), new MixedType());
 		}
 
-		return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+		return null;
 	}
 
 }
diff --git a/src/Type/Nette/FormsBaseControlDynamicReturnTypeExtension.php b/src/Type/Nette/FormsBaseControlDynamicReturnTypeExtension.php
@@ -31,7 +31,11 @@ public function getTypeFromMethodCall(
 		Scope $scope
 	): Type
 	{
-		$returnType = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+		$returnType = ParametersAcceptorSelector::selectFromArgs(
+			$scope,
+			$methodCall->getArgs(),
+			$methodReflection->getVariants(),
+		)->getReturnType();
 		$referencedClasses = $returnType->getReferencedClasses();
 		if (
 			count($referencedClasses) === 1
diff --git a/tests/Reflection/Nette/HtmlClassReflectionExtensionTest.php b/tests/Reflection/Nette/HtmlClassReflectionExtensionTest.php
@@ -4,7 +4,6 @@
 
 use Nette\Utils\Html;
 use PHPStan\Broker\Broker;
-use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Testing\PHPStanTestCase;
 use PHPStan\Type\VerbosityLevel;
 use stdClass;
@@ -52,7 +51,7 @@ public function testGetMethod(): void
 	{
 		$classReflection = $this->broker->getClass(Html::class);
 		$methodReflection = $this->extension->getMethod($classReflection, 'href');
-		$parametersAcceptor = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants());
+		$parametersAcceptor = $methodReflection->getVariants()[0];
 		self::assertSame('href', $methodReflection->getName());
 		self::assertSame($classReflection, $methodReflection->getDeclaringClass());
 		self::assertFalse($methodReflection->isStatic());

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`use PhpParser\Node\Expr\MethodCall;`
`6`	`6`	`use PHPStan\Analyser\Scope;`
`7`	`7`	`use PHPStan\Reflection\MethodReflection;`
`8`		`-use PHPStan\Reflection\ParametersAcceptorSelector;`
`9`	`8`	`use PHPStan\Type\ArrayType;`
`10`	`9`	`use PHPStan\Type\DynamicMethodReturnTypeExtension;`
`11`	`10`	`use PHPStan\Type\MixedType;`
`@@ -27,10 +26,10 @@ public function isMethodSupported(MethodReflection $methodReflection): bool`
`27`	`26`	`return $methodReflection->getName() === 'getUnsafeValues';`
`28`	`27`	`}`
`29`	`28`
`30`		`- public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type`
	`29`	`+ public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): ?Type`
`31`	`30`	`{`
`32`	`31`	`if (count($methodCall->getArgs()) === 0) {`
`33`		`- return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();`
	`32`	`+ return null;`
`34`	`33`	`}`
`35`	`34`
`36`	`35`	`$arg = $methodCall->getArgs()[0]->value;`
`@@ -43,7 +42,7 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method`
`43`	`42`	`return new ArrayType(new StringType(), new MixedType());`
`44`	`43`	`}`
`45`	`44`
`46`		`- return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();`
	`45`	`+ return null;`
`47`	`46`	`}`
`48`	`47`
`49`	`48`	`}`