Merge remote-tracking branch 'origin/1.12.x' into 2.1.x

Author: ondrejmirtes

src/Type/CallableType.php

@@ -171,8 +171,14 @@ private function isSuperTypeOfInternal(Type $type, bool $treatMixedAsAny): IsSup
 			return $isCallable;
 		}
 
+		$parameterTypes = array_map(static fn ($parameter) => $parameter->getType(), $this->getParameters());
+
 		$variantsResult = null;
 		foreach ($type->getCallableParametersAcceptors($scope) as $variant) {
+			$variant = ParametersAcceptorSelector::selectFromTypes($parameterTypes, [$variant], false);
+			if (!$variant instanceof CallableParametersAcceptor) {
+				return IsSuperTypeOfResult::createNo([]);
+			}
 			$isSuperType = CallableTypeHelper::isParametersAcceptorSuperTypeOf($this, $variant, $treatMixedAsAny);
 			if ($variantsResult === null) {
 				$variantsResult = $isSuperType;

src/Type/ClosureType.php

@@ -211,9 +211,14 @@ public function isSuperTypeOf(Type $type): IsSuperTypeOfResult
 	private function isSuperTypeOfInternal(Type $type, bool $treatMixedAsAny): IsSuperTypeOfResult
 	{
 		if ($type instanceof self) {
+			$parameterTypes = array_map(static fn ($parameter) => $parameter->getType(), $this->getParameters());
+			$variant = ParametersAcceptorSelector::selectFromTypes($parameterTypes, [$type], false);
+			if (!$variant instanceof CallableParametersAcceptor) {
+				return IsSuperTypeOfResult::createNo([]);
+			}
 			return CallableTypeHelper::isParametersAcceptorSuperTypeOf(
 				$this,
-				$type,
+				$variant,
 				$treatMixedAsAny,
 			);
 		}

tests/PHPStan/Rules/Methods/CallMethodsRuleTest.php

@@ -3519,6 +3519,16 @@ public function testBug12544(): void
 		]);
 	}
 
+	public function testBug12691(): void
+	{
+		$this->checkThisOnly = false;
+		$this->checkNullables = true;
+		$this->checkUnionTypes = true;
+		$this->checkExplicitMixed = true;
+
+		$this->analyse([__DIR__ . '/../../Analyser/nsrt/bug-12691.php'], []);
+	}
+
 	public function testBug12422(): void
 	{
 		if (PHP_VERSION_ID < 80100) {