Method extensions class name is case-insensitive

phpstan · Aug 5, 2023 · 1c9e90f · 1c9e90f
1 parent 4f6b051
commit 1c9e90f
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 2 deletions.
diff --git a/src/Type/DynamicReturnTypeExtensionRegistry.php b/src/Type/DynamicReturnTypeExtensionRegistry.php
@@ -6,6 +6,7 @@
 use PHPStan\Reflection\BrokerAwareExtension;
 use PHPStan\Reflection\ReflectionProvider;
 use function array_merge;
+use function strtolower;
 
 class DynamicReturnTypeExtensionRegistry
 {
@@ -46,7 +47,7 @@ public function getDynamicMethodReturnTypeExtensionsForClass(string $className):
 		if ($this->dynamicMethodReturnTypeExtensionsByClass === null) {
 			$byClass = [];
 			foreach ($this->dynamicMethodReturnTypeExtensions as $extension) {
-				$byClass[$extension->getClass()][] = $extension;
+				$byClass[strtolower($extension->getClass())][] = $extension;
 			}
 
 			$this->dynamicMethodReturnTypeExtensionsByClass = $byClass;
@@ -62,7 +63,7 @@ public function getDynamicStaticMethodReturnTypeExtensionsForClass(string $class
 		if ($this->dynamicStaticMethodReturnTypeExtensionsByClass === null) {
 			$byClass = [];
 			foreach ($this->dynamicStaticMethodReturnTypeExtensions as $extension) {
-				$byClass[$extension->getClass()][] = $extension;
+				$byClass[strtolower($extension->getClass())][] = $extension;
 			}
 
 			$this->dynamicStaticMethodReturnTypeExtensionsByClass = $byClass;
@@ -83,6 +84,7 @@ private function getDynamicExtensionsForType(array $extensions, string $classNam
 		$extensionsForClass = [[]];
 		$class = $this->reflectionProvider->getClass($className);
 		foreach (array_merge([$className], $class->getParentClassesNames(), $class->getNativeReflection()->getInterfaceNames()) as $extensionClassName) {
+			$extensionClassName = strtolower($extensionClassName);
 			if (!isset($extensions[$extensionClassName])) {
 				continue;
 			}

diff --git a/tests/PHPStan/Analyser/NodeScopeResolverTest.php b/tests/PHPStan/Analyser/NodeScopeResolverTest.php
@@ -1318,6 +1318,7 @@ public function dataFileAsserts(): iterable
 		}
 
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7915.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-9714.php');
 	}
 
 	/**

diff --git a/tests/PHPStan/Analyser/data/bug-9714.php b/tests/PHPStan/Analyser/data/bug-9714.php
@@ -0,0 +1,16 @@
+<?php declare(strict_types=1);
+
+namespace Bug9714;
+
+use function PHPStan\Testing\assertType;
+
+class ExampleClass
+{
+	public function exampleFunction(): void
+	{
+		$xml = new \SimpleXmlElement('');
+		$elements = $xml->xpath('//data');
+		assertType('array<SimpleXmlElement>', $elements);
+	}
+}
+
diff --git a/tests/PHPStan/Analyser/data/closure-return-type-extensions.php b/tests/PHPStan/Analyser/data/closure-return-type-extensions.php
@@ -18,3 +18,6 @@
 
 $returnType = $closure->call($newThis, new class {});
 assertType('true', $returnType);
+
+$staticallyBoundClosureCaseInsensitive = \closure::bind($closure, $newThis);
+assertType('Closure(object): true', $staticallyBoundClosureCaseInsensitive);
diff --git a/tests/PHPStan/Analyser/data/enum-from.php b/tests/PHPStan/Analyser/data/enum-from.php
@@ -83,4 +83,10 @@ public function subsetToSuperset(FooIntegerEnumSubset $foo): void
 		assertType('EnumFrom\FooIntegerEnum::BAR', FooIntegerEnum::from($foo->value));
 	}
 
+	public function doCaseInsensitive(): void
+	{
+		assertType('1', FooInTeGerEnum::BAR->value);
+		assertType('null', FooInTeGerEnum::tryFrom(0));
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Exceptions/CatchWithUnthrownExceptionRuleTest.php b/tests/PHPStan/Rules/Exceptions/CatchWithUnthrownExceptionRuleTest.php
@@ -108,6 +108,10 @@ public function testRule(): void
 				'Dead catch - Exception is never thrown in the try block.',
 				532,
 			],
+			[
+				'Dead catch - Exception is never thrown in the try block.',
+				555,
+			],
 		]);
 	}
 

diff --git a/tests/PHPStan/Rules/Exceptions/data/missing-exception-method-throws.php b/tests/PHPStan/Rules/Exceptions/data/missing-exception-method-throws.php
@@ -95,4 +95,9 @@ public function dateTimeZoneDoesThrows(string $tz): void
 		new \DateTimeZone($tz);
 	}
 
+	public function dateTimeZoneDoesNotThrowCaseInsensitive(): void
+	{
+		new \DaTetImezOnE('UTC');
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Exceptions/data/unthrown-exception.php b/tests/PHPStan/Rules/Exceptions/data/unthrown-exception.php
@@ -544,3 +544,35 @@ public function doBar(string $s)
 	}
 
 }
+
+class TestCaseInsensitiveClassNames
+{
+
+	public function doFoo(): void
+	{
+		try {
+			new \SimpleXmlElement('<?xml version="1.0" encoding="UTF-8"?><root></root>');
+		} catch (\Exception $e) {
+
+		}
+	}
+
+	public function doBar(): void
+	{
+		try {
+			new \SimpleXmlElement('foo');
+		} catch (\Exception $e) {
+
+		}
+	}
+
+	public function doBaz(string $string): void
+	{
+		try {
+			new \SimpleXmlElement($string);
+		} catch (\Exception $e) {
+
+		}
+	}
+
+}