RestrictedInternalMethodUsageExtension - differentiate between internal method and internal declaring classlike

Author: ondrejmirtes

Diff for: phpstan-baseline.neon

@@ -1921,8 +1921,8 @@ parameters:
 			path: tests/PHPStan/Reflection/SignatureMap/Php8SignatureMapProviderTest.php
 
 		-
-			message: '#^Call to internal method PHPUnit\\Framework\\ExpectationFailedException\:\:getComparisonFailure\(\) from outside its root namespace PHPUnit\.$#'
-			identifier: method.internal
+			message: '#^Call to method getComparisonFailure\(\) of internal class PHPUnit\\Framework\\ExpectationFailedException from outside its root namespace PHPUnit\.$#'
+			identifier: method.internalClass
 			count: 2
 			path: tests/PHPStan/Testing/NonexistentAnalysedClassRuleTest.php
 

Diff for: src/Reflection/Php/PhpMethodReflection.php

@@ -379,7 +379,7 @@ public function isDeprecated(): TrinaryLogic
 
 	public function isInternal(): TrinaryLogic
 	{
-		return TrinaryLogic::createFromBoolean($this->isInternal || $this->declaringClass->isInternal());
+		return TrinaryLogic::createFromBoolean($this->isInternal);
 	}
 
 	public function isBuiltin(): TrinaryLogic

Diff for: src/Rules/InternalTag/RestrictedInternalMethodUsageExtension.php

@@ -10,6 +10,7 @@
 use function explode;
 use function sprintf;
 use function str_starts_with;
+use function strtolower;
 
 final class RestrictedInternalMethodUsageExtension implements RestrictedMethodUsageExtension
 {
@@ -19,33 +20,61 @@ public function isRestrictedMethodUsage(
 		Scope $scope,
 	): ?RestrictedUsage
 	{
-		if (!$methodReflection->isInternal()->yes()) {
+		$isMethodInternal = $methodReflection->isInternal()->yes();
+		$isDeclaringClassInternal = $methodReflection->getDeclaringClass()->isInternal();
+		if (!$isMethodInternal && !$isDeclaringClassInternal) {
 			return null;
 		}
 
 		$currentNamespace = $scope->getNamespace();
 		$declaringClassName = $methodReflection->getDeclaringClass()->getName();
 		$namespace = array_slice(explode('\\', $declaringClassName), 0, -1)[0] ?? null;
 		if ($currentNamespace === null) {
-			return $this->buildRestrictedUsage($methodReflection, $namespace);
+			return $this->buildRestrictedUsage($methodReflection, $namespace, $isMethodInternal);
 		}
 
 		$currentNamespace = explode('\\', $currentNamespace)[0];
 		if (str_starts_with($namespace . '\\', $currentNamespace . '\\')) {
 			return null;
 		}
 
-		return $this->buildRestrictedUsage($methodReflection, $namespace);
+		return $this->buildRestrictedUsage($methodReflection, $namespace, $isMethodInternal);
 	}
 
-	private function buildRestrictedUsage(ExtendedMethodReflection $methodReflection, ?string $namespace): RestrictedUsage
+	private function buildRestrictedUsage(ExtendedMethodReflection $methodReflection, ?string $namespace, bool $isMethodInternal): RestrictedUsage
 	{
 		if ($namespace === null) {
+			if (!$isMethodInternal) {
+				return RestrictedUsage::create(
+					sprintf(
+						'Call to method %s() of internal %s %s.',
+						$methodReflection->getName(),
+						strtolower($methodReflection->getDeclaringClass()->getClassTypeDescription()),
+						$methodReflection->getDeclaringClass()->getDisplayName(),
+					),
+					sprintf('method.internal%s', $methodReflection->getDeclaringClass()->getClassTypeDescription()),
+				);
+			}
+
 			return RestrictedUsage::create(
 				sprintf('Call to internal method %s::%s().', $methodReflection->getDeclaringClass()->getDisplayName(), $methodReflection->getName()),
 				'method.internal',
 			);
 		}
+
+		if (!$isMethodInternal) {
+			return RestrictedUsage::create(
+				sprintf(
+					'Call to method %s() of internal %s %s from outside its root namespace %s.',
+					$methodReflection->getName(),
+					strtolower($methodReflection->getDeclaringClass()->getClassTypeDescription()),
+					$methodReflection->getDeclaringClass()->getDisplayName(),
+					$namespace,
+				),
+				sprintf('method.internal%s', $methodReflection->getDeclaringClass()->getClassTypeDescription()),
+			);
+		}
+
 		return RestrictedUsage::create(
 			sprintf('Call to internal method %s::%s() from outside its root namespace %s.', $methodReflection->getDeclaringClass()->getDisplayName(), $methodReflection->getName(), $namespace),
 			'method.internal',

Diff for: tests/PHPStan/Rules/InternalTag/RestrictedInternalMethodUsageExtensionTest.php

@@ -25,7 +25,7 @@ public function testRule(): void
 				58,
 			],
 			[
-				'Call to internal method MethodInternalTagOne\FooInternal::doFoo() from outside its root namespace MethodInternalTagOne.',
+				'Call to method doFoo() of internal class MethodInternalTagOne\FooInternal from outside its root namespace MethodInternalTagOne.',
 				63,
 			],
 			[
@@ -34,23 +34,23 @@ public function testRule(): void
 			],
 
 			[
-				'Call to internal method MethodInternalTagOne\FooInternal::doFoo() from outside its root namespace MethodInternalTagOne.',
+				'Call to method doFoo() of internal class MethodInternalTagOne\FooInternal from outside its root namespace MethodInternalTagOne.',
 				76,
 			],
 			[
 				'Call to internal method FooWithInternalMethodWithoutNamespace::doInternal().',
 				107,
 			],
 			[
-				'Call to internal method FooInternalWithoutNamespace::doFoo().',
+				'Call to method doFoo() of internal class FooInternalWithoutNamespace.',
 				112,
 			],
 			[
 				'Call to internal method FooWithInternalMethodWithoutNamespace::doInternal().',
 				120,
 			],
 			[
-				'Call to internal method FooInternalWithoutNamespace::doFoo().',
+				'Call to method doFoo() of internal class FooInternalWithoutNamespace.',
 				125,
 			],
 		]);