Skip class name case check for type hints using explicit use ... as aliases (#5671)

phpstan-bot · claude · web-flow · commit 3c644c52bf08 · 2026-05-17T22:27:28.000+02:00
Co-authored-by: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/src/Parser/UseAliasVisitor.php b/src/Parser/UseAliasVisitor.php
@@ -0,0 +1,73 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Parser;
+
+use Override;
+use PhpParser\Node;
+use PhpParser\Node\Name;
+use PhpParser\Node\Stmt\GroupUse;
+use PhpParser\Node\Stmt\Use_;
+use PhpParser\NodeVisitorAbstract;
+use PHPStan\DependencyInjection\AutowiredService;
+use function count;
+use function strtolower;
+
+#[AutowiredService]
+final class UseAliasVisitor extends NodeVisitorAbstract
+{
+
+	public const ATTRIBUTE_NAME = 'isExplicitUseAlias';
+
+	/** @var array<string, string> alias name (original case) keyed by lowercase alias name */
+	private array $explicitAliases = [];
+
+	#[Override]
+	public function enterNode(Node $node): ?Node
+	{
+		if ($node instanceof Node\Stmt\Namespace_) {
+			$this->explicitAliases = [];
+		}
+
+		if ($node instanceof Use_ && $node->type === Use_::TYPE_NORMAL) {
+			foreach ($node->uses as $use) {
+				if ($use->alias === null) {
+					continue;
+				}
+
+				$this->explicitAliases[strtolower($use->alias->name)] = $use->alias->name;
+			}
+		}
+
+		if ($node instanceof GroupUse) {
+			foreach ($node->uses as $use) {
+				if ($use->type !== Use_::TYPE_NORMAL && $node->type !== Use_::TYPE_NORMAL) {
+					continue;
+				}
+				if ($use->alias === null) {
+					continue;
+				}
+
+				$this->explicitAliases[strtolower($use->alias->name)] = $use->alias->name;
+			}
+		}
+
+		if ($node instanceof Name) {
+			$originalName = $node->getAttribute('originalName');
+			if ($originalName instanceof Name) {
+				$originalParts = $originalName->getParts();
+				if (count($originalParts) === 1) {
+					$lowerOriginal = strtolower($originalParts[0]);
+					if (
+						isset($this->explicitAliases[$lowerOriginal])
+						&& $this->explicitAliases[$lowerOriginal] === $originalParts[0]
+					) {
+						$node->setAttribute(self::ATTRIBUTE_NAME, true);
+					}
+				}
+			}
+		}
+
+		return null;
+	}
+
+}
diff --git a/src/Rules/ClassCaseSensitivityCheck.php b/src/Rules/ClassCaseSensitivityCheck.php
@@ -4,6 +4,7 @@
 
 use PHPStan\DependencyInjection\AutowiredParameter;
 use PHPStan\DependencyInjection\AutowiredService;
+use PHPStan\Parser\UseAliasVisitor;
 use PHPStan\Reflection\ReflectionProvider;
 use function sprintf;
 use function strtolower;
@@ -38,7 +39,10 @@ public function checkClassNames(array $pairs): array
 			}
 			$realClassName = $classReflection->getName();
 			if (strtolower($realClassName) !== strtolower($className)) {
-				continue; // skip class alias
+				continue; // skip class_alias() where the alias is a completely different name
+			}
+			if ($pair->getNode()->getAttribute(UseAliasVisitor::ATTRIBUTE_NAME) === true) {
+				continue;
 			}
 			if ($realClassName === $className) {
 				continue;
diff --git a/src/Rules/FunctionDefinitionCheck.php b/src/Rules/FunctionDefinitionCheck.php
@@ -866,11 +866,6 @@ private function getOriginalClassNamePairsFromTypeNode(Identifier|Name|ComplexTy
 				$originalCaseClassName = $originalName->toString();
 			}
 
-			if (strtolower($originalCaseClassName) !== strtolower($resolvedName)) {
-				// use alias, not just a case difference
-				return [];
-			}
-
 			if ($originalCaseClassName === $resolvedName) {
 				return [];
 			}
diff --git a/tests/PHPStan/Rules/Classes/ExistingClassInClassExtendsRuleTest.php b/tests/PHPStan/Rules/Classes/ExistingClassInClassExtendsRuleTest.php
@@ -153,4 +153,9 @@ public function testReadonly(): void
 		]);
 	}
 
+	public function testBug14617(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-14617.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Classes/ExistingClassInInstanceOfRuleTest.php b/tests/PHPStan/Rules/Classes/ExistingClassInInstanceOfRuleTest.php
@@ -86,4 +86,9 @@ public function testRememberClassExistsFromConstructor(): void
 		$this->analyse([__DIR__ . '/data/remember-class-exists-from-constructor.php'], []);
 	}
 
+	public function testBug14617(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-14617.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Classes/ExistingClassesInClassImplementsRuleTest.php b/tests/PHPStan/Rules/Classes/ExistingClassesInClassImplementsRuleTest.php
@@ -95,4 +95,9 @@ public function testBug8889(): void
 		]);
 	}
 
+	public function testBug14617(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-14617.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Classes/data/bug-14617.php b/tests/PHPStan/Rules/Classes/data/bug-14617.php
@@ -0,0 +1,21 @@
+<?php declare(strict_types = 1);
+
+namespace Bug14617Classes;
+
+class MyClass {}
+
+interface MyInterface {}
+
+namespace Bug14617Classes\Consumer;
+
+use Bug14617Classes\MyClass as myclass;
+use Bug14617Classes\MyInterface as myinterface;
+
+class Foo extends myclass implements myinterface {
+	public myclass $prop;
+}
+
+function test(mixed $x): void {
+	if ($x instanceof myclass) {
+	}
+}
diff --git a/tests/PHPStan/Rules/Functions/CallToNonExistentFunctionRuleTest.php b/tests/PHPStan/Rules/Functions/CallToNonExistentFunctionRuleTest.php
@@ -69,6 +69,11 @@ public function testCallToIncorrectCaseFunctionName(): void
 		]);
 	}
 
+	public function testBug14617UseFunctionAlias(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-14617-use-function-alias.php'], []);
+	}
+
 	public function testMatchExprAnalysis(): void
 	{
 		$this->analyse([__DIR__ . '/data/match-expr-analysis.php'], [
diff --git a/tests/PHPStan/Rules/Functions/ExistingClassesInClosureTypehintsRuleTest.php b/tests/PHPStan/Rules/Functions/ExistingClassesInClosureTypehintsRuleTest.php
@@ -73,6 +73,21 @@ public function testExistingClassInTypehint(): void
 		]);
 	}
 
+	public function testBug14617(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-14617-closure.php'], []);
+	}
+
+	public function testBug14617GroupUse(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-14617-group-use.php'], []);
+	}
+
+	public function testClassAliasCaseSensitivity(): void
+	{
+		$this->analyse([__DIR__ . '/data/class-alias-case-sensitivity.php'], []);
+	}
+
 	public function testValidTypehintPhp71(): void
 	{
 		$this->analyse([__DIR__ . '/data/closure-7.1-typehints.php'], [
diff --git a/tests/PHPStan/Rules/Functions/data/bug-14617-closure.php b/tests/PHPStan/Rules/Functions/data/bug-14617-closure.php
@@ -0,0 +1,13 @@
+<?php declare(strict_types = 1);
+
+namespace Bug14617Closure;
+
+class MyClass {}
+
+namespace Bug14617Closure\Consumer;
+
+use Bug14617Closure\MyClass as myclass;
+
+$callback = function (myclass $a): myclass {
+	return $a;
+};
diff --git a/tests/PHPStan/Rules/Functions/data/bug-14617-group-use.php b/tests/PHPStan/Rules/Functions/data/bug-14617-group-use.php
@@ -0,0 +1,14 @@
+<?php declare(strict_types = 1);
+
+namespace Bug14617GroupUse;
+
+class MyClass {}
+class AnotherClass {}
+
+namespace Bug14617GroupUse\Consumer;
+
+use Bug14617GroupUse\{MyClass as myclass, AnotherClass as anotherclass};
+
+$callback = function (myclass $a): anotherclass {
+	return new anotherclass();
+};
diff --git a/tests/PHPStan/Rules/Functions/data/bug-14617-use-function-alias.php b/tests/PHPStan/Rules/Functions/data/bug-14617-use-function-alias.php
@@ -0,0 +1,14 @@
+<?php declare(strict_types = 1);
+
+namespace Bug14617UseFunctionAlias;
+
+function myFunction(): void {}
+function anotherFunction(): void {}
+
+namespace Bug14617UseFunctionAlias\Consumer;
+
+use function Bug14617UseFunctionAlias\myFunction as myfunction;
+use function Bug14617UseFunctionAlias\{anotherFunction as ANOTHERFUNCTION};
+
+myfunction();
+ANOTHERFUNCTION();
diff --git a/tests/PHPStan/Rules/Functions/data/class-alias-case-sensitivity.php b/tests/PHPStan/Rules/Functions/data/class-alias-case-sensitivity.php
@@ -0,0 +1,7 @@
+<?php declare(strict_types = 1);
+
+namespace ClassAliasCaseSensitivity;
+
+$callback = function (\ReturnTypes\FooAlias $a): \ReturnTypes\FooAlias {
+	return $a;
+};
diff --git a/tests/PHPStan/Rules/Methods/ExistingClassesInTypehintsRuleTest.php b/tests/PHPStan/Rules/Methods/ExistingClassesInTypehintsRuleTest.php
@@ -662,4 +662,15 @@ public function testBug14205(): void
 		$this->analyse([__DIR__ . '/data/bug-14205.php'], []);
 	}
 
+	#[RequiresPhp('>= 8.0.0')]
+	public function testBug14617(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-14617.php'], []);
+	}
+
+	public function testBug14617GroupUse(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-14617-group-use.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Methods/data/bug-14617-group-use.php b/tests/PHPStan/Rules/Methods/data/bug-14617-group-use.php
@@ -0,0 +1,16 @@
+<?php declare(strict_types = 1);
+
+namespace Bug14617GroupUseMethod;
+
+class MyClass {}
+class AnotherClass {}
+
+namespace Bug14617GroupUseMethod\Consumer;
+
+use Bug14617GroupUseMethod\{MyClass as myclass, AnotherClass as anotherclass};
+
+class Foo {
+	public function bar(myclass $a): anotherclass {
+		return new anotherclass();
+	}
+}
diff --git a/tests/PHPStan/Rules/Methods/data/bug-14617.php b/tests/PHPStan/Rules/Methods/data/bug-14617.php
@@ -0,0 +1,27 @@
+<?php declare(strict_types = 1);
+
+namespace Bug14617;
+
+class MyClass {}
+
+namespace Bug14617\Consumer;
+
+use Bug14617\MyClass as myclass;
+
+function test(): myclass {
+	return new myclass();
+}
+
+class Foo {
+	public function bar(myclass $a): myclass {
+		return $a;
+	}
+
+	public function nullable(?myclass $a): ?myclass {
+		return $a;
+	}
+
+	public function union(myclass|string $a): myclass|int {
+		return $a;
+	}
+}
diff --git a/tests/PHPStan/Rules/Namespaces/ExistingNamesInGroupUseRuleTest.php b/tests/PHPStan/Rules/Namespaces/ExistingNamesInGroupUseRuleTest.php
@@ -60,4 +60,9 @@ public function testRule(): void
 		]);
 	}
 
+	public function testBug14617UseFunctionGroupAlias(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-14617-use-function-group-alias.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Namespaces/ExistingNamesInUseRuleTest.php b/tests/PHPStan/Rules/Namespaces/ExistingNamesInUseRuleTest.php
@@ -60,6 +60,11 @@ public function testRule(): void
 		]);
 	}
 
+	public function testBug14617UseFunctionAlias(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-14617-use-function-alias.php'], []);
+	}
+
 	public function testPhpstanInternalClass(): void
 	{
 		$tip = 'This is most likely unintentional. Did you mean to type \PrefixedRuntimeException?';
diff --git a/tests/PHPStan/Rules/Namespaces/data/bug-14617-use-function-alias.php b/tests/PHPStan/Rules/Namespaces/data/bug-14617-use-function-alias.php
@@ -0,0 +1,9 @@
+<?php declare(strict_types = 1);
+
+namespace Bug14617UseFunctionAliasNs;
+
+function myFunction(): void {}
+
+namespace Bug14617UseFunctionAliasNs\Consumer;
+
+use function Bug14617UseFunctionAliasNs\myFunction as myfunction;
diff --git a/tests/PHPStan/Rules/Namespaces/data/bug-14617-use-function-group-alias.php b/tests/PHPStan/Rules/Namespaces/data/bug-14617-use-function-group-alias.php
@@ -0,0 +1,10 @@
+<?php declare(strict_types = 1);
+
+namespace Bug14617UseFunctionGroupAliasNs;
+
+function myFunction(): void {}
+function anotherFunction(): void {}
+
+namespace Bug14617UseFunctionGroupAliasNs\Consumer;
+
+use function Bug14617UseFunctionGroupAliasNs\{myFunction as myfunction, anotherFunction as ANOTHERFUNCTION};
diff --git a/tests/PHPStan/Rules/Properties/ExistingClassesInPropertiesRuleTest.php b/tests/PHPStan/Rules/Properties/ExistingClassesInPropertiesRuleTest.php
@@ -179,4 +179,9 @@ public function testIntersectionTypes(int $phpVersion, array $errors): void
 		$this->analyse([__DIR__ . '/data/intersection-types.php'], $errors);
 	}
 
+	public function testBug14617(): void
+	{
+		$this->analyse([__DIR__ . '/../Classes/data/bug-14617.php'], []);
+	}
+
 }

Original file line number	Diff line number	Diff line change
`@@ -866,11 +866,6 @@ private function getOriginalClassNamePairsFromTypeNode(Identifier\|Name\|ComplexTy`
`866`	`866`	`$originalCaseClassName = $originalName->toString();`
`867`	`867`	`}`
`868`	`868`
`869`		`- if (strtolower($originalCaseClassName) !== strtolower($resolvedName)) {`
`870`		`- // use alias, not just a case difference`
`871`		`- return [];`
`872`		`- }`
`873`		`-`
`874`	`869`	`if ($originalCaseClassName === $resolvedName) {`
`875`	`870`	`return [];`
`876`	`871`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,4 +153,9 @@ public function testReadonly(): void`
`153`	`153`	`]);`
`154`	`154`	`}`
`155`	`155`
	`156`	`+ public function testBug14617(): void`
	`157`	`+ {`
	`158`	`+ $this->analyse([__DIR__ . '/data/bug-14617.php'], []);`
	`159`	`+ }`
	`160`	`+`
`156`	`161`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,4 +86,9 @@ public function testRememberClassExistsFromConstructor(): void`
`86`	`86`	`$this->analyse([__DIR__ . '/data/remember-class-exists-from-constructor.php'], []);`
`87`	`87`	`}`
`88`	`88`
	`89`	`+ public function testBug14617(): void`
	`90`	`+ {`
	`91`	`+ $this->analyse([__DIR__ . '/data/bug-14617.php'], []);`
	`92`	`+ }`
	`93`	`+`
`89`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,4 +95,9 @@ public function testBug8889(): void`
`95`	`95`	`]);`
`96`	`96`	`}`
`97`	`97`
	`98`	`+ public function testBug14617(): void`
	`99`	`+ {`
	`100`	`+ $this->analyse([__DIR__ . '/data/bug-14617.php'], []);`
	`101`	`+ }`
	`102`	`+`
`98`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,11 @@ public function testCallToIncorrectCaseFunctionName(): void`
`69`	`69`	`]);`
`70`	`70`	`}`
`71`	`71`
	`72`	`+ public function testBug14617UseFunctionAlias(): void`
	`73`	`+ {`
	`74`	`+ $this->analyse([__DIR__ . '/data/bug-14617-use-function-alias.php'], []);`
	`75`	`+ }`
	`76`	`+`
`72`	`77`	`public function testMatchExprAnalysis(): void`
`73`	`78`	`{`
`74`	`79`	`$this->analyse([__DIR__ . '/data/match-expr-analysis.php'], [`