refactor and enhancement of importers.

Author: hsehszroc

Src/Helper/ImportBuilder.php

@@ -42,8 +42,8 @@ public function import(): bool {
 
 	public function getAlias(): ?string {
 		return match ( true ) {
-			$this->globalContains()    => $this->getGlobalAlias(),
-			$this->namespaceContains() => $this->getNamespaceAlias(),
+			$this->globalContains()    => $this->findAliasAsIndexIn( $this->globalImports() ),
+			$this->namespaceContains() => $this->findAliasAsIndexIn( $this->namespaceImports() ),
 			default                    => null,
 		};
 	}

Src/Traits/GlobalImporter.php

@@ -9,6 +9,9 @@
 trait GlobalImporter {
 	use AliasResolver;
 
+	/** @var array<string,string> */
+	private array $globalImports;
+
 	/** @return PhpGlobal<TType,array<string,string>> */
 	abstract protected function inGlobal(): PhpGlobal;
 
@@ -20,17 +23,9 @@ final protected function importGlobal(): bool {
 		return $isImportable;
 	}
 
-	protected function getGlobalAlias(): ?string {
-		return $this->findAliasAsIndexIn( $this->globalTypeImports() );
-	}
-
-	/** @return array<string,string> */
-	private function globalTypeImports(): array {
-		return $this->inGlobal()[ $this->forType() ] ?? array();
-	}
-
 	private function globalContains(): bool {
-		return ( $imports = $this->globalTypeImports() ) && in_array( $this->forImport(), $imports, strict: true );
+		return ( $this->globalImports = $this->inGlobal()[ $this->forType() ] ?? array() )
+			&& in_array( $this->forImport(), $this->globalImports, strict: true );
 	}
 
 	private function globalImportable(): bool {
@@ -40,6 +35,11 @@ private function globalImportable(): bool {
 	/** @return array<string,string> */
 	private function withGlobalImport(): array {
 		// phpcs:ignore WordPress.Arrays.ArrayDeclarationSpacing.AssociativeArrayFound
-		return array( ...$this->globalTypeImports(), $this->forImport() => $this->forImport() );
+		return array( ...$this->globalImports(), $this->forImport() => $this->forImport() );
+	}
+
+	/** @return array<string,string> */
+	private function globalImports(): array {
+		return $this->globalImports ?? array();
 	}
 }

Src/Traits/NamespaceImporter.php

@@ -9,9 +9,8 @@
 trait NamespaceImporter {
 	use AliasResolver;
 
-	private string $aliasOfImport;
 	/** @var array<string,string> */
-	private array $currentTypeImports = array();
+	private array $namespaceImports;
 
 	abstract protected function inNamespace(): PhpNamespace;
 
@@ -22,30 +21,21 @@ protected function importNamespace(): bool {
 		return $isImportable;
 	}
 
-	/**
-	 * Gets the alias of a namespace item, if it has been imported to the current namespace.
-	 * Always check with `NamespaceImporter::namespaceContains()` before using this method.
-	 */
-	protected function getNamespaceAlias(): ?string {
-		return $this->findAliasAsIndexIn( imports: $this->namespaceTypeImports() );
-	}
-
 	private function namespaceContains(): bool {
-		return ( $this->currentTypeImports = $this->inNamespace()->getUses( $this->forType() ) )
-			&& in_array( $this->forImport(), $this->currentTypeImports, strict: true );
+		return ( $this->namespaceImports = $this->inNamespace()->getUses( $this->forType() ) )
+			&& in_array( $this->forImport(), $this->namespaceImports, strict: true );
 	}
 
 	private function withNamespaceAlias(): string {
-		$alias             = Helpers::extractShortName( $this->forImport() );
-		$namespaceLastPart = isset( $this->namespaceTypeImports()[ $alias ] )
-			? Helpers::extractShortName( Helpers::extractNamespace( $this->forImport() ) )
-			: '';
+		$alias = Helpers::extractShortName( $this->forImport() );
 
-		return $namespaceLastPart . $alias;
+		return ( isset( $this->namespaceImports()[ $alias ] )
+			? Helpers::extractShortName( Helpers::extractNamespace( $this->forImport() ) )
+			: '' ) . $alias;
 	}
 
 	/** @return array<string,string> */
-	private function namespaceTypeImports(): array {
-		return $this->currentTypeImports ?? array();
+	private function namespaceImports(): array {
+		return $this->namespaceImports ?? array();
 	}
 }

phpstan.dist.neon

@@ -25,6 +25,6 @@ parameters:
 			count: 1
 		- # PhpNamespace::getUses() method's return value is legit.
 			path: Src/Traits/NamespaceImporter.php
-			message: '|\$currentTypeImports \(array\<string, string\>\) does not accept array\<string\>|'
+			message: '|\$namespaceImports \(array\<string, string\>\) does not accept array\<string\>|'
 			identifier: assign.propertyType
 			count: 1