cleanup

phpstan · Feb 23, 2024 · e1cf9c3 · e1cf9c3
1 parent 2767ab1
commit e1cf9c3
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 11 deletions.
diff --git a/src/Rules/ClassForbiddenNameCheck.php b/src/Rules/ClassForbiddenNameCheck.php
@@ -4,6 +4,8 @@
 
 use function sprintf;
 use function str_starts_with;
+use function strpos;
+use function substr;
 
 class ClassForbiddenNameCheck
 {
@@ -36,11 +38,16 @@ public function checkClassNames(array $pairs): array
 				continue;
 			}
 
+			$tip = sprintf(
+				'This is most likely unintentional. Did you mean to type %s?',
+				substr($className, strpos($className, '\\')),
+			);
+
 			$errors[] = RuleErrorBuilder::message(sprintf(
-				'Internal %s Class cannot be referenced: %s.',
+				'Referencing prefixed %s class: %s.',
 				$projectName,
 				$className,
-			))->line($pair->getNode()->getLine())->build();
+			))->line($pair->getNode()->getLine())->tip($tip)->nonIgnorable()->build();
 		}
 
 		return $errors;

diff --git a/src/Rules/ClassNameCheck.php b/src/Rules/ClassNameCheck.php
@@ -21,9 +21,13 @@ public function checkClassNames(array $pairs, bool $checkClassCaseSensitivity =
 		$errors = [];
 
 		if ($checkClassCaseSensitivity) {
-			$errors += $this->classCaseSensitivityCheck->checkClassNames($pairs);
+			foreach ($this->classCaseSensitivityCheck->checkClassNames($pairs) as $error) {
+				$errors[] = $error;
+			}
+		}
+		foreach ($this->classForbiddenNameCheck->checkClassNames($pairs) as $error) {
+			$errors[] = $error;
 		}
-		$errors += $this->classForbiddenNameCheck->checkClassNames($pairs);
 
 		return $errors;
 	}

diff --git a/tests/PHPStan/Rules/Classes/ClassConstantRuleTest.php b/tests/PHPStan/Rules/Classes/ClassConstantRuleTest.php
@@ -408,11 +408,14 @@ public function testClassConstFetchDefined(): void
 
 	public function testPhpstanInternalClass(): void
 	{
+		$tip = 'This is most likely unintentional. Did you mean to type \AClass?';
+
 		$this->phpVersion = PHP_VERSION_ID;
 		$this->analyse([__DIR__ . '/data/phpstan-internal-class.php'], [
 			[
-				'Internal PHPStan Class cannot be referenced: _PHPStan_156ee64ba\AClass.',
+				'Referencing prefixed PHPStan class: _PHPStan_156ee64ba\AClass.',
 				28,
+				$tip,
 			],
 		]);
 	}

diff --git a/tests/PHPStan/Rules/Classes/ExistingClassInClassExtendsRuleTest.php b/tests/PHPStan/Rules/Classes/ExistingClassInClassExtendsRuleTest.php
@@ -98,18 +98,23 @@ public function testEnums(): void
 
 	public function testPhpstanInternalClass(): void
 	{
+		$tip = 'This is most likely unintentional. Did you mean to type \AClass?';
+
 		$this->analyse([__DIR__ . '/data/phpstan-internal-class.php'], [
 			[
-				'Internal PHPStan Class cannot be referenced: _PHPStan_156ee64ba\AClass.',
+				'Referencing prefixed PHPStan class: _PHPStan_156ee64ba\AClass.',
 				34,
+				$tip,
 			],
 			[
-				'Internal Rector Class cannot be referenced: RectorPrefix202302\AClass.',
+				'Referencing prefixed Rector class: RectorPrefix202302\AClass.',
 				52,
+				$tip,
 			],
 			[
-				'Internal PHP-Scoper Class cannot be referenced: _PhpScoper19ae93be897e\AClass.',
+				'Referencing prefixed PHP-Scoper class: _PhpScoper19ae93be897e\AClass.',
 				55,
+				$tip,
 			],
 		]);
 	}

diff --git a/tests/PHPStan/Rules/Classes/InstantiationRuleTest.php b/tests/PHPStan/Rules/Classes/InstantiationRuleTest.php
@@ -478,10 +478,13 @@ public function testBug10324(): void
 
 	public function testPhpstanInternalClass(): void
 	{
+		$tip = 'This is most likely unintentional. Did you mean to type \AClass?';
+
 		$this->analyse([__DIR__ . '/data/phpstan-internal-class.php'], [
 			[
-				'Internal PHPStan Class cannot be referenced: _PHPStan_156ee64ba\AClass.',
+				'Referencing prefixed PHPStan class: _PHPStan_156ee64ba\AClass.',
 				30,
+				$tip,
 			],
 		]);
 	}

diff --git a/tests/PHPStan/Rules/Exceptions/CaughtExceptionExistenceRuleTest.php b/tests/PHPStan/Rules/Exceptions/CaughtExceptionExistenceRuleTest.php
@@ -59,10 +59,13 @@ public function testBug3690(): void
 
 	public function testPhpstanInternalClass(): void
 	{
+		$tip = 'This is most likely unintentional. Did you mean to type \PrefixedRuntimeException?';
+
 		$this->analyse([__DIR__ . '/../Classes/data/phpstan-internal-class.php'], [
 			[
-				'Internal PHPStan Class cannot be referenced: _PHPStan_156ee64ba\PrefixedRuntimeException.',
+				'Referencing prefixed PHPStan class: _PHPStan_156ee64ba\PrefixedRuntimeException.',
 				19,
+				$tip,
 			],
 		]);
 	}

diff --git a/tests/PHPStan/Rules/Namespaces/ExistingNamesInUseRuleTest.php b/tests/PHPStan/Rules/Namespaces/ExistingNamesInUseRuleTest.php
@@ -58,10 +58,13 @@ public function testRule(): void
 
 	public function testPhpstanInternalClass(): void
 	{
+		$tip = 'This is most likely unintentional. Did you mean to type \PrefixedRuntimeException?';
+
 		$this->analyse([__DIR__ . '/../Classes/data/phpstan-internal-class.php'], [
 			[
-				'Internal PHPStan Class cannot be referenced: _PHPStan_156ee64ba\PrefixedRuntimeException.',
+				'Referencing prefixed PHPStan class: _PHPStan_156ee64ba\PrefixedRuntimeException.',
 				14,
+				$tip,
 			],
 		]);
 	}