Native method reflection - look in stubs first, then into native runtime PHP reflection

ondrejmirtes · ondrejmirtes · commit 09f0bebde608 · 2020-06-16T16:28:36.000+02:00
diff --git a/src/Reflection/Php/PhpClassReflectionExtension.php b/src/Reflection/Php/PhpClassReflectionExtension.php
@@ -415,13 +415,13 @@ private function createMethod(
 			$stubPhpDocString = null;
 			$variants = [];
 			$reflectionMethod = null;
-			if (class_exists($classReflection->getName(), false)) {
+			if ($classReflection->getNativeReflection()->hasMethod($methodReflection->getName())) {
+				$reflectionMethod = $classReflection->getNativeReflection()->getMethod($methodReflection->getName());
+			} elseif (class_exists($classReflection->getName(), false)) {
 				$reflectionClass = new \ReflectionClass($classReflection->getName());
 				if ($reflectionClass->hasMethod($methodReflection->getName())) {
 					$reflectionMethod = $reflectionClass->getMethod($methodReflection->getName());
 				}
-			} else {
-				$reflectionMethod = $classReflection->getNativeReflection()->getMethod($methodReflection->getName());
 			}
 			foreach ($variantNames as $innerVariantName) {
 				$methodSignature = $this->signatureMapProvider->getFunctionSignature($innerVariantName, $declaringClassName);
diff --git a/tests/PHPStan/Rules/Methods/OverridingMethodRuleTest.php b/tests/PHPStan/Rules/Methods/OverridingMethodRuleTest.php
@@ -336,4 +336,10 @@ public function testBug3443(): void
 		$this->analyse([__DIR__ . '/data/bug-3443.php'], []);
 	}
 
+	public function testBug3478(): void
+	{
+		$this->phpVersionId = PHP_VERSION_ID;
+		$this->analyse([__DIR__ . '/data/bug-3478.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Methods/data/bug-3478.php b/tests/PHPStan/Rules/Methods/data/bug-3478.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Bug3478;
+
+class ExtendedDocument extends \DOMDocument
+{
+	public function saveHTML(\DOMNode $node = null)
+	{
+		return parent::saveHTML($node);
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -336,4 +336,10 @@ public function testBug3443(): void`
`336`	`336`	`$this->analyse([__DIR__ . '/data/bug-3443.php'], []);`
`337`	`337`	`}`
`338`	`338`
	`339`	`+ public function testBug3478(): void`
	`340`	`+ {`
	`341`	`+ $this->phpVersionId = PHP_VERSION_ID;`
	`342`	`+ $this->analyse([__DIR__ . '/data/bug-3478.php'], []);`
	`343`	`+ }`
	`344`	`+`
`339`	`345`	`}`