more tests

phpstan · Jan 6, 2024 · 8d326eb · 8d326eb
1 parent ec8e11c
commit 8d326eb
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 15 deletions.
diff --git a/src/Reflection/RequireExtension/RequireExtendsMethodsClassReflectionExtension.php b/src/Reflection/RequireExtension/RequireExtendsMethodsClassReflectionExtension.php
@@ -32,6 +32,10 @@ public function getMethod(ClassReflection $classReflection, string $methodName):
 
 	private function findMethod(ClassReflection $classReflection, string $methodName): ?MethodReflection
 	{
+		if (!$classReflection->isInterface()) {
+			return null;
+		}
+
 		$extendsTags = $classReflection->getRequireExtendsTags();
 		foreach ($extendsTags as $extendsTag) {
 			$type = $extendsTag->getType();
@@ -55,14 +59,12 @@ private function findMethod(ClassReflection $classReflection, string $methodName
 			return $method;
 		}
 
-		$parentClass = $classReflection->getParentClass();
-		while ($parentClass !== null) {
-			$method = $this->findMethod($parentClass, $methodName);
+		$interfaces = $classReflection->getInterfaces();
+		foreach ($interfaces as $interface) {
+			$method = $this->findMethod($interface, $methodName);
 			if ($method !== null) {
 				return $method;
 			}
-
-			$parentClass = $parentClass->getParentClass();
 		}
 
 		return null;

diff --git a/src/Reflection/RequireExtension/RequireExtendsPropertiesClassReflectionExtension.php b/src/Reflection/RequireExtension/RequireExtendsPropertiesClassReflectionExtension.php
@@ -32,7 +32,10 @@ public function getProperty(ClassReflection $classReflection, string $propertyNa
 
 	private function findProperty(ClassReflection $classReflection, string $propertyName): ?PropertyReflection
 	{
-		// XXX require-implements cannot grant access to properties?
+		if (!$classReflection->isInterface()) {
+			return null;
+		}
+
 		$requireExtendsTags = $classReflection->getRequireExtendsTags();
 		foreach ($requireExtendsTags as $requireExtendsTag) {
 			$type = $requireExtendsTag->getType();
@@ -55,14 +58,12 @@ private function findProperty(ClassReflection $classReflection, string $property
 			return $property;
 		}
 
-		$parentClass = $classReflection->getParentClass();
-		while ($parentClass !== null) {
-			$property = $this->findProperty($parentClass, $propertyName);
+		$interfaces = $classReflection->getInterfaces();
+		foreach ($interfaces as $interface) {
+			$property = $this->findProperty($interface, $propertyName);
 			if ($property !== null) {
 				return $property;
 			}
-
-			$parentClass = $parentClass->getParentClass();
 		}
 
 		return null;

diff --git a/tests/PHPStan/Analyser/data/bug-10302-interface-extends.php b/tests/PHPStan/Analyser/data/bug-10302-interface-extends.php
@@ -30,3 +30,24 @@ function test(SampleInterface $test): void
 
 	assertType('int', $test->doFoo());
 }
+
+function testExtendedInterface(AnotherInterface $test): void
+{
+	assertType('int', $test->x);
+	assertType('string', $test->y);
+	assertType('array', $test->z);
+
+	assertType('int', $test->doFoo());
+}
+
+interface AnotherInterface extends SampleInterface
+{
+}
+
+class SomeSubClass extends SomeClass {}
+
+class ValidClass extends SomeClass implements SampleInterface {}
+
+class ValidSubClass extends SomeSubClass implements SampleInterface {}
+
+class InvalidClass implements SampleInterface {}
diff --git a/tests/PHPStan/Analyser/data/bug-10302-trait-extends.php b/tests/PHPStan/Analyser/data/bug-10302-trait-extends.php
@@ -9,13 +9,24 @@
  */
 trait myTrait
 {
+	function test(): void
+	{
+		assertType('int', $this->x);
+		assertType('string', $this->y);
+		assertType('*ERROR*', $this->z);
+	}
 }
 
-class SomeClass {
-	use myTrait;
+/**
+ * @phpstan-require-extends SomeClass
+ */
+trait anotherTrait
+{
+}
 
-	public int $x;
-	protected string $y;
+class SomeClass {
+	public int $x = 1;
+	protected string $y = 'foo';
 	private array $z = [];
 }
 
@@ -25,3 +36,17 @@ function test(SomeClass $test): void
 	assertType('string', $test->y);
 	assertType('array', $test->z);
 }
+
+class SomeSubClass extends SomeClass {}
+
+class ValidClass extends SomeClass {
+	use myTrait;
+}
+
+class ValidSubClass extends SomeSubClass {
+	use myTrait;
+}
+
+class InvalidClass {
+	use anotherTrait;
+}
diff --git a/tests/PHPStan/Analyser/data/bug-10302-trait-implements.php b/tests/PHPStan/Analyser/data/bug-10302-trait-implements.php
@@ -9,6 +9,10 @@
  */
 trait myTrait
 {
+	protected function doIt() {
+		$this->foo();
+		$this->doesNotExist();
+	}
 }
 
 interface SomeInterface
@@ -37,3 +41,14 @@ function test(SomeClass $test): void
 
 	assertType('string', $test->foo());
 }
+
+class ValidImplements implements SomeInterface {
+	public function foo(): string
+	{
+		return "hallo";
+	}
+}
+
+class InvalidClass {
+	use myTrait;
+}