Merge branch 'main' into field-type-deprecated-translated-category

mglaman · web-flow · commit 249707a0896d · 2024-09-27T02:43:44.000-05:00
diff --git a/src/Rules/Deprecations/SymfonyCmfRoutingInClassMethodSignatureRule.php b/src/Rules/Deprecations/SymfonyCmfRoutingInClassMethodSignatureRule.php
@@ -46,7 +46,11 @@ public function processNode(Node $node, Scope $scope): array
         // @phpstan-ignore-next-line
         $cmfLazyRouteCollectionType = new ObjectType(LazyRouteCollection::class);
 
-        $methodSignature = ParametersAcceptorSelector::selectSingle($method->getVariants());
+        $methodSignature = ParametersAcceptorSelector::selectFromArgs(
+            $scope,
+            [],
+            $method->getVariants()
+        );
 
         $errors = [];
         $errorMessage = 'Parameter $%s of method %s() uses deprecated %s and removed in Drupal 10. Use %s instead.';
diff --git a/src/Type/ContainerDynamicReturnTypeExtension.php b/src/Type/ContainerDynamicReturnTypeExtension.php
@@ -43,7 +43,11 @@ public function getTypeFromMethodCall(
         MethodCall $methodCall,
         Scope $scope
     ): Type {
-        $returnType = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+        $returnType = ParametersAcceptorSelector::selectFromArgs(
+            $scope,
+            $methodCall->getArgs(),
+            $methodReflection->getVariants()
+        )->getReturnType();
         $methodName = $methodReflection->getName();
 
         if ($methodName === 'has') {
diff --git a/src/Type/DrupalClassResolverDynamicReturnTypeExtension.php b/src/Type/DrupalClassResolverDynamicReturnTypeExtension.php
@@ -40,7 +40,11 @@ public function getTypeFromMethodCall(
         Scope $scope
     ): Type {
         if (0 === count($methodCall->getArgs())) {
-            return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+            return ParametersAcceptorSelector::selectFromArgs(
+                $scope,
+                $methodCall->getArgs(),
+                $methodReflection->getVariants()
+            )->getReturnType();
         }
 
         return DrupalClassResolverReturnType::getType($methodReflection, $methodCall, $scope, $this->serviceMap);
diff --git a/src/Type/DrupalClassResolverReturnType.php b/src/Type/DrupalClassResolverReturnType.php
@@ -25,7 +25,11 @@ public static function getType(
     ): Type {
         $arg1 = $scope->getType($methodCall->getArgs()[0]->value);
         if (count($arg1->getConstantStrings()) === 0) {
-            return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+            return ParametersAcceptorSelector::selectFromArgs(
+                $scope,
+                $methodCall->getArgs(),
+                $methodReflection->getVariants()
+            )->getReturnType();
         }
 
         $serviceName = $arg1->getConstantStrings()[0];
diff --git a/src/Type/DrupalServiceDynamicReturnTypeExtension.php b/src/Type/DrupalServiceDynamicReturnTypeExtension.php
@@ -44,7 +44,11 @@ public function getTypeFromStaticMethodCall(
         StaticCall $methodCall,
         Scope $scope
     ): Type {
-        $returnType = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+        $returnType = ParametersAcceptorSelector::selectFromArgs(
+            $scope,
+            $methodCall->getArgs(),
+            $methodReflection->getVariants()
+        )->getReturnType();
         if (!isset($methodCall->args[0])) {
             return $returnType;
         }
diff --git a/src/Type/DrupalStaticEntityQueryDynamicReturnTypeExtension.php b/src/Type/DrupalStaticEntityQueryDynamicReturnTypeExtension.php
@@ -45,7 +45,11 @@ public function getTypeFromStaticMethodCall(
         StaticCall $methodCall,
         Scope $scope
     ): Type {
-        $returnType = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+        $returnType = ParametersAcceptorSelector::selectFromArgs(
+            $scope,
+            $methodCall->getArgs(),
+            $methodReflection->getVariants()
+        )->getReturnType();
         if (!$returnType instanceof ObjectType) {
             return $returnType;
         }
diff --git a/src/Type/EntityQuery/AccessCheckTypeSpecifyingExtension.php b/src/Type/EntityQuery/AccessCheckTypeSpecifyingExtension.php
@@ -40,7 +40,11 @@ public function specifyTypes(
         Scope $scope,
         TypeSpecifierContext $context
     ): SpecifiedTypes {
-        $returnType = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+        $returnType = ParametersAcceptorSelector::selectFromArgs(
+            $scope,
+            [],
+            $methodReflection->getVariants()
+        )->getReturnType();
         $expr = $node->var;
         if (!$returnType instanceof EntityQueryType) {
             return new SpecifiedTypes([]);
diff --git a/src/Type/EntityQuery/EntityQueryAccessCheckDynamicReturnTypeExtension.php b/src/Type/EntityQuery/EntityQueryAccessCheckDynamicReturnTypeExtension.php
@@ -32,7 +32,11 @@ public function getTypeFromMethodCall(
         $varType = $scope->getType($methodCall->var);
 
         if (!$varType instanceof EntityQueryType) {
-            return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+            return ParametersAcceptorSelector::selectFromArgs(
+                $scope,
+                $methodCall->getArgs(),
+                $methodReflection->getVariants()
+            )->getReturnType();
         }
 
         return $varType->withAccessCheck();
diff --git a/src/Type/EntityQuery/EntityQueryDynamicReturnTypeExtension.php b/src/Type/EntityQuery/EntityQueryDynamicReturnTypeExtension.php
@@ -36,7 +36,11 @@ public function getTypeFromMethodCall(
         MethodCall $methodCall,
         Scope $scope
     ): Type {
-        $defaultReturnType = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+        $defaultReturnType = ParametersAcceptorSelector::selectFromArgs(
+            $scope,
+            $methodCall->getArgs(),
+            $methodReflection->getVariants()
+        )->getReturnType();
         $varType = $scope->getType($methodCall->var);
         $methodName = $methodReflection->getName();
 
diff --git a/src/Type/EntityRepositoryReturnTypeExtension.php b/src/Type/EntityRepositoryReturnTypeExtension.php
@@ -61,7 +61,11 @@ public function getTypeFromMethodCall(
     ): ?Type {
         $methodName = $methodReflection->getName();
         $methodArgs = $methodCall->getArgs();
-        $returnType = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+        $returnType = ParametersAcceptorSelector::selectFromArgs(
+            $scope,
+            $methodCall->getArgs(),
+            $methodReflection->getVariants()
+        )->getReturnType();
 
         if (count($methodArgs) === 0) {
             return $returnType;
diff --git a/src/Type/EntityStorage/EntityStorageDynamicReturnTypeExtension.php b/src/Type/EntityStorage/EntityStorageDynamicReturnTypeExtension.php
@@ -58,21 +58,33 @@ public function getTypeFromMethodCall(
     ): Type {
         $callerType = $scope->getType($methodCall->var);
         if (!$callerType instanceof ObjectType) {
-            return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+            return ParametersAcceptorSelector::selectFromArgs(
+                $scope,
+                $methodCall->getArgs(),
+                $methodReflection->getVariants()
+            )->getReturnType();
         }
 
         if (!$callerType instanceof EntityStorageType) {
             $resolvedEntityType = $this->entityDataRepository->resolveFromStorage($callerType);
             if ($resolvedEntityType === null) {
-                return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+                return ParametersAcceptorSelector::selectFromArgs(
+                    $scope,
+                    $methodCall->getArgs(),
+                    $methodReflection->getVariants()
+                )->getReturnType();
             }
             $type = $resolvedEntityType->getClassType();
         } else {
             $type = $this->entityDataRepository->get($callerType->getEntityTypeId())->getClassType();
         }
 
         if ($type === null) {
-            return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+            return ParametersAcceptorSelector::selectFromArgs(
+                $scope,
+                $methodCall->getArgs(),
+                $methodReflection->getVariants()
+            )->getReturnType();
         }
         if (in_array($methodReflection->getName(), ['load', 'loadUnchanged'], true)) {
             return TypeCombinator::addNull($type);
@@ -90,6 +102,10 @@ public function getTypeFromMethodCall(
             return $type;
         }
 
-        return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+        return ParametersAcceptorSelector::selectFromArgs(
+            $scope,
+            $methodCall->getArgs(),
+            $methodReflection->getVariants()
+        )->getReturnType();
     }
 }
diff --git a/src/Type/EntityStorage/GetQueryReturnTypeExtension.php b/src/Type/EntityStorage/GetQueryReturnTypeExtension.php
@@ -38,7 +38,11 @@ public function getTypeFromMethodCall(
         MethodCall $methodCall,
         Scope $scope
     ): Type {
-        $returnType = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+        $returnType = ParametersAcceptorSelector::selectFromArgs(
+            $scope,
+            $methodCall->getArgs(),
+            $methodReflection->getVariants()
+        )->getReturnType();
         if (!$returnType instanceof ObjectType) {
             return $returnType;
         }
diff --git a/src/Type/EntityTypeManagerGetStorageDynamicReturnTypeExtension.php b/src/Type/EntityTypeManagerGetStorageDynamicReturnTypeExtension.php
@@ -48,7 +48,11 @@ public function getTypeFromMethodCall(
         MethodCall $methodCall,
         Scope $scope
     ): Type {
-        $returnType = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
+        $returnType = ParametersAcceptorSelector::selectFromArgs(
+            $scope,
+            $methodCall->getArgs(),
+            $methodReflection->getVariants()
+        )->getReturnType();
         if (!isset($methodCall->args[0])) {
             // Parameter is required.
             throw new ShouldNotHappenException();
