misc: simplify alias handling

CuyZ · Sep 18, 2024 · ae0f5bd · ae0f5bd
1 parent 594d5cd
commit ae0f5bd
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 244 deletions.
diff --git a/src/Type/Parser/Factory/Specifications/AliasSpecification.php b/src/Type/Parser/Factory/Specifications/AliasSpecification.php
@@ -53,32 +53,27 @@ public function manipulateToken(TraversingToken $token): TraversingToken
 
  private function resolveAlias(string $symbol): string
  {
- $alias = $symbol;
+ $aliases = PhpParser::parseUseStatements($this->reflection);
 
  $namespaceParts = explode('\\', $symbol);
- $firstPart = array_shift($namespaceParts);
 
- if ($firstPart) {
- $alias = strtolower($firstPart);
+ $lastPart = strtolower(end($namespaceParts));
+
+ if (isset($aliases[$lastPart])) {
+ return $aliases[$lastPart];
  }
 
- $aliases = PhpParser::parseUseStatements($this->reflection);
+ $alias = strtolower(array_shift($namespaceParts));
 
  if (! isset($aliases[$alias])) {
  return $symbol;
  }
 
- $fqcn = $aliases[$alias]['fqcn'];
-
  if ($namespaceParts === []) {
- return $fqcn;
- }
-
- if (! $aliases[$alias]['isExplicitAlias']) {
- return $symbol;
+ return $aliases[$alias];
  }
 
- return $fqcn . '\\' . implode('\\', $namespaceParts);
+ return $aliases[$alias] . '\\' . implode('\\', $namespaceParts);
  }
 
  private function resolveNamespaced(string $symbol): string

diff --git a/src/Utility/Reflection/PhpParser.php b/src/Utility/Reflection/PhpParser.php
@@ -17,12 +17,12 @@
  */
 final class PhpParser
 {
- /** @var array<string, array<non-empty-string, array{fqcn: non-empty-string, isExplicitAlias: bool}>> */
+ /** @var array<string, array<string, string>> */
  private static array $statements = [];
 
  /**
  * @param ReflectionClass<object>|ReflectionFunction|ReflectionMethod $reflection
- * @return array<non-empty-string, array{fqcn: non-empty-string, isExplicitAlias: bool}>
+ * @return array<string, string>
  */
  public static function parseUseStatements(\ReflectionClass|\ReflectionFunction|\ReflectionMethod $reflection): array
  {
@@ -34,7 +34,7 @@ public static function parseUseStatements(\ReflectionClass|\ReflectionFunction|\
 
  /**
  * @param ReflectionClass<object>|ReflectionFunction|ReflectionMethod $reflection
- * @return array<non-empty-string, array{fqcn: non-empty-string, isExplicitAlias: bool}>
+ * @return array<string, string>
  */
  private static function fetchUseStatements(\ReflectionClass|\ReflectionFunction|\ReflectionMethod $reflection): array
  {

diff --git a/src/Utility/Reflection/TokenParser.php b/src/Utility/Reflection/TokenParser.php
@@ -29,7 +29,7 @@ public function __construct(string $content)
  }
 
  /**
- * @return array<non-empty-string, array{fqcn: non-empty-string, isExplicitAlias: bool}>
+ * @return array<string, string>
  */
  public function parseUseStatements(string $namespaceName): array
  {
@@ -58,7 +58,7 @@ public function parseUseStatements(string $namespaceName): array
  }
 
  /**
- * @return array<non-empty-string, array{fqcn: non-empty-string, isExplicitAlias: bool}>
+ * @return array<string, string>
  */
  private function parseUseStatement(): array
  {
@@ -86,18 +86,12 @@ private function parseUseStatement(): array
  $explicitAlias = true;
  $alias = '';
  } elseif ($name === ',') {
- $statements[strtolower($alias)] = [
- 'fqcn' => $groupRoot . $class,
- 'isExplicitAlias' => $explicitAlias,
- ];
+ $statements[strtolower($alias)] = $groupRoot . $class;
  $class = $alias = '';
  $explicitAlias = false;
  } elseif ($name === ';') {
  if ($alias !== '') {
- $statements[strtolower($alias)] = [
- 'fqcn' => $groupRoot . $class,
- 'isExplicitAlias' => $explicitAlias,
- ];
+ $statements[strtolower($alias)] = $groupRoot . $class;
  }
  break;
  } elseif ($name === '{') {
@@ -106,7 +100,6 @@ private function parseUseStatement(): array
  }
  }
 
- /** @var array<non-empty-string, array{fqcn: non-empty-string, isExplicitAlias: bool}> */
  return $statements;
  }