Fix resolving tentative return type

phpstan · Nov 11, 2024 · 753fc4d · 753fc4d
1 parent 2da94f8
commit 753fc4d
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 2 deletions.
diff --git a/src/Reflection/Native/NativeMethodReflection.php b/src/Reflection/Native/NativeMethodReflection.php
@@ -81,7 +81,7 @@ public function getPrototype(): ClassMemberReflection
 
 			$tentativeReturnType = null;
 			if ($prototypeMethod->getTentativeReturnType() !== null) {
-				$tentativeReturnType = TypehintHelper::decideTypeFromReflection($prototypeMethod->getTentativeReturnType());
+				$tentativeReturnType = TypehintHelper::decideTypeFromReflection($prototypeMethod->getTentativeReturnType(), null, $prototypeDeclaringClass);
 			}
 
 			return new MethodPrototypeReflection(

diff --git a/src/Reflection/Php/PhpMethodReflection.php b/src/Reflection/Php/PhpMethodReflection.php
@@ -118,7 +118,7 @@ public function getPrototype(): ClassMemberReflection
 
 			$tentativeReturnType = null;
 			if ($prototypeMethod->getTentativeReturnType() !== null) {
-				$tentativeReturnType = TypehintHelper::decideTypeFromReflection($prototypeMethod->getTentativeReturnType());
+				$tentativeReturnType = TypehintHelper::decideTypeFromReflection($prototypeMethod->getTentativeReturnType(), null, $prototypeDeclaringClass);
 			}
 
 			return new MethodPrototypeReflection(

diff --git a/tests/PHPStan/Rules/Methods/OverridingMethodRuleTest.php b/tests/PHPStan/Rules/Methods/OverridingMethodRuleTest.php
@@ -812,4 +812,10 @@ public function testBug9524(): void
 		$this->analyse([__DIR__ . '/data/bug-9524.php'], []);
 	}
 
+	public function testSimpleXmlElementChildClass(): void
+	{
+		$this->phpVersionId = PHP_VERSION_ID;
+		$this->analyse([__DIR__ . '/data/simple-xml-element-child.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Methods/data/simple-xml-element-child.php b/tests/PHPStan/Rules/Methods/data/simple-xml-element-child.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace SimpleXmlElementChild;
+
+class CustomXMLElement extends \SimpleXMLElement
+{
+	#[\Override]
+	public function addChild(string $qualifiedName, ?string $value = null, ?string $namespace = null): ?static
+	{
+		return parent::addChild($qualifiedName, $this->escapeInput($value), $namespace);
+	}
+
+	private function escapeInput(?string $value): ?string
+	{
+		if ($value === null) {
+			return null;
+		}
+		return htmlspecialchars((string) normalizer_normalize($value), ENT_XML1, 'UTF-8');
+	}
+}