Merge pull request #1513 from rossriley/hotfix/class-exists-order

Fix - change the order of instantiation checks
schmittjoh · Oct 8, 2023 · 9b8dc5b · 9b8dc5b
2 parents 544ff69 + e349907
commit 9b8dc5b
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Metadata/Driver/DocBlockDriver/DocBlockTypeResolver.php b/src/Metadata/Driver/DocBlockDriver/DocBlockTypeResolver.php
@@ -249,10 +249,6 @@ private function resolveTypeFromTypeNode(TypeNode $typeNode, $reflector): string
      */
     private function expandClassNameUsingUseStatements(string $typeHint, \ReflectionClass $declaringClass, $reflector): string
     {
-        if ($this->isClassOrInterface($typeHint)) {
-            return $typeHint;
-        }
-
         $expandedClassName = $declaringClass->getNamespaceName() . '\\' . $typeHint;
         if ($this->isClassOrInterface($expandedClassName)) {
             return $expandedClassName;
@@ -282,6 +278,10 @@ private function expandClassNameUsingUseStatements(string $typeHint, \Reflection
             }
         }
 
+        if ($this->isClassOrInterface($typeHint)) {
+            return $typeHint;
+        }
+
         throw new \InvalidArgumentException(sprintf("Can't use incorrect type %s for collection in %s:%s", $typeHint, $declaringClass->getName(), $reflector->getName()));
     }