Bleeding edge - check existing classes in @param-closure-this

Author: ondrejmirtes

src/Rules/FunctionDefinitionCheck.php

@@ -584,15 +584,20 @@ private function getParameterReferencedClasses(ParameterReflection $parameter):
 			return $parameter->getNativeType()->getReferencedClasses();
 		}
 
-		$outTypeClasses = [];
-		if ($parameter->getOutType() !== null && $this->absentTypeChecks) {
-			$outTypeClasses = $parameter->getOutType()->getReferencedClasses();
+		$moreClasses = [];
+		if ($this->absentTypeChecks) {
+			if ($parameter->getOutType() !== null) {
+				$moreClasses = array_merge($moreClasses, $parameter->getOutType()->getReferencedClasses());
+			}
+			if ($parameter->getClosureThisType() !== null) {
+				$moreClasses = array_merge($moreClasses, $parameter->getClosureThisType()->getReferencedClasses());
+			}
 		}
 
 		return array_merge(
 			$parameter->getNativeType()->getReferencedClasses(),
 			$parameter->getPhpDocType()->getReferencedClasses(),
-			$outTypeClasses,
+			$moreClasses,
 		);
 	}
 

tests/PHPStan/Rules/Functions/ExistingClassesInTypehintsRuleTest.php

@@ -470,4 +470,22 @@ public function testParamOutClasses(): void
 		]);
 	}
 
+	public function testParamClosureThisClasses(): void
+	{
+		$this->analyse([__DIR__ . '/data/param-closure-this-classes.php'], [
+			[
+				'Parameter $a of method ParamClosureThisClasses\Bar::doFoo() has invalid type ParamClosureThisClasses\Nonexistent.',
+				24,
+			],
+			[
+				'Parameter $b of method ParamClosureThisClasses\Bar::doFoo() has invalid type ParamClosureThisClasses\FooTrait.',
+				25,
+			],
+			[
+				'Class ParamClosureThisClasses\Foo referenced with incorrect case: ParamClosureThisClasses\fOO.',
+				26,
+			],
+		]);
+	}
+
 }

tests/PHPStan/Rules/Functions/data/param-closure-this-classes.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace ParamClosureThisClassesFunctions;
+
+trait FooTrait
+{
+
+}
+
+class Foo
+{
+
+}
+
+/**
+ * @param-closure-this Nonexistent $a
+ * @param-closure-this FooTrait $b
+ * @param-closure-this fOO $c
+ */
+function doFoo(
+	callable $a,
+	callable $b,
+	callable $c
+): void
+{
+
+}

tests/PHPStan/Rules/Methods/ExistingClassesInTypehintsRuleTest.php

@@ -490,4 +490,22 @@ public function testParamOutClasses(): void
 		]);
 	}
 
+	public function testParamClosureThisClasses(): void
+	{
+		$this->analyse([__DIR__ . '/data/param-closure-this-classes.php'], [
+			[
+				'Parameter $a of method ParamClosureThisClasses\Bar::doFoo() has invalid type ParamClosureThisClasses\Nonexistent.',
+				24,
+			],
+			[
+				'Parameter $b of method ParamClosureThisClasses\Bar::doFoo() has invalid type ParamClosureThisClasses\FooTrait.',
+				25,
+			],
+			[
+				'Class ParamClosureThisClasses\Foo referenced with incorrect case: ParamClosureThisClasses\fOO.',
+				26,
+			],
+		]);
+	}
+
 }

tests/PHPStan/Rules/Methods/data/param-closure-this-classes.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace ParamClosureThisClasses;
+
+trait FooTrait
+{
+
+}
+
+class Foo
+{
+
+}
+
+class Bar
+{
+
+	/**
+	 * @param-closure-this Nonexistent $a
+	 * @param-closure-this FooTrait $b
+	 * @param-closure-this fOO $c
+	 */
+	public function doFoo(
+		callable $a,
+		callable $b,
+		callable $c
+	): void
+	{
+
+	}
+
+}