Renamed NamingConventionRule to ClassTypeNamingRule

ViniTou · ViniTou · commit 4f25a0290daf · 2025-10-21T13:32:00.000+02:00
diff --git a/extension.neon b/extension.neon
@@ -7,5 +7,4 @@ parameters:
 		- stubs/Money/MoneyParser.stub
 rules:
     - Ibexa\PHPStan\Rules\NoConfigResolverParametersInConstructorRule
-    - Ibexa\PHPStan\Rules\RequireInterfaceInDependenciesRule
-    - Ibexa\PHPStan\Rules\NamingConventionRule
+    - Ibexa\PHPStan\Rules\ClassTypeNamingRule
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -1,16 +0,0 @@
-parameters:
-	ignoreErrors:
-		-
-			message: "#^Property Ibexa\\\\Tests\\\\PHPStan\\\\Rules\\\\Fixtures\\\\RequireInterfaceInDependenciesFixture\\:\\:\\$classWithoutInterface is never read, only written\\.$#"
-			count: 1
-			path: tests/rules/Fixtures/RequireInterfaceInDependenciesFixture.php
-
-		-
-			message: "#^Property Ibexa\\\\Tests\\\\PHPStan\\\\Rules\\\\Fixtures\\\\RequireInterfaceInDependenciesFixture\\:\\:\\$concreteClass is never read, only written\\.$#"
-			count: 1
-			path: tests/rules/Fixtures/RequireInterfaceInDependenciesFixture.php
-
-		-
-			message: "#^Property Ibexa\\\\Tests\\\\PHPStan\\\\Rules\\\\Fixtures\\\\RequireInterfaceInDependenciesFixture\\:\\:\\$testInterface is never read, only written\\.$#"
-			count: 1
-			path: tests/rules/Fixtures/RequireInterfaceInDependenciesFixture.php
diff --git a/rules/ClassTypeNamingRule.php b/rules/ClassTypeNamingRule.php
@@ -16,7 +16,7 @@
 /**
  * @implements \PHPStan\Rules\Rule<\PhpParser\Node\Stmt\ClassLike>
  */
-final class NamingConventionRule implements Rule
+final class ClassTypeNamingRule implements Rule
 {
     public function getNodeType(): string
     {
diff --git a/tests/rules/ClassTypeNamingRuleTest.php b/tests/rules/ClassTypeNamingRuleTest.php
@@ -8,30 +8,30 @@
 
 namespace Ibexa\Tests\PHPStan\Rules;
 
-use Ibexa\PHPStan\Rules\NamingConventionRule;
+use Ibexa\PHPStan\Rules\ClassTypeNamingRule;
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
 
 /**
- * @extends \PHPStan\Testing\RuleTestCase<\Ibexa\PHPStan\Rules\NamingConventionRule>
+ * @extends \PHPStan\Testing\RuleTestCase<\Ibexa\PHPStan\Rules\ClassTypeNamingRule>
  */
-final class NamingConventionRuleTest extends RuleTestCase
+final class ClassTypeNamingRuleTest extends RuleTestCase
 {
     protected function getRule(): Rule
     {
-       return new NamingConventionRule();
+       return new ClassTypeNamingRule();
     }
 
     public function testRule(): void
     {
         $this->analyse(
             [
-                __DIR__ . '/Fixtures/NamingConvention/WrongName.php',
-                __DIR__ . '/Fixtures/NamingConvention/SimpleThing.php',
-                __DIR__ . '/Fixtures/NamingConvention/SimpleClass.php',
-                __DIR__ . '/Fixtures/NamingConvention/CorrectNameInterface.php',
-                __DIR__ . '/Fixtures/NamingConvention/CorrectNameTrait.php',
-                __DIR__ . '/Fixtures/NamingConvention/AbstractCorrectClass.php',
+                __DIR__ . '/Fixtures/ClassTypeNaming/WrongName.php',
+                __DIR__ . '/Fixtures/ClassTypeNaming/SimpleThing.php',
+                __DIR__ . '/Fixtures/ClassTypeNaming/SimpleClass.php',
+                __DIR__ . '/Fixtures/ClassTypeNaming/CorrectNameInterface.php',
+                __DIR__ . '/Fixtures/ClassTypeNaming/CorrectNameTrait.php',
+                __DIR__ . '/Fixtures/ClassTypeNaming/AbstractCorrectClass.php',
             ],
             [
                 [
diff --git a/tests/rules/Fixtures/ClassTypeNaming/AbstractCorrectClass.php b/tests/rules/Fixtures/ClassTypeNaming/AbstractCorrectClass.php
@@ -6,7 +6,7 @@
  */
 declare(strict_types=1);
 
-namespace Ibexa\Tests\PHPStan\Rules\Fixtures\NamingConvention;
+namespace Ibexa\Tests\PHPStan\Rules\Fixtures\ClassTypeNaming;
 
 abstract class AbstractCorrectClass
 {
diff --git a/tests/rules/Fixtures/ClassTypeNaming/CorrectNameInterface.php b/tests/rules/Fixtures/ClassTypeNaming/CorrectNameInterface.php
@@ -6,7 +6,7 @@
  */
 declare(strict_types=1);
 
-namespace Ibexa\Tests\PHPStan\Rules\Fixtures\NamingConvention;
+namespace Ibexa\Tests\PHPStan\Rules\Fixtures\ClassTypeNaming;
 
 interface CorrectNameInterface
 {
diff --git a/tests/rules/Fixtures/ClassTypeNaming/CorrectNameTrait.php b/tests/rules/Fixtures/ClassTypeNaming/CorrectNameTrait.php
@@ -6,7 +6,7 @@
  */
 declare(strict_types=1);
 
-namespace Ibexa\Tests\PHPStan\Rules\Fixtures\NamingConvention;
+namespace Ibexa\Tests\PHPStan\Rules\Fixtures\ClassTypeNaming;
 
 trait CorrectNameTrait
 {
diff --git a/tests/rules/Fixtures/ClassTypeNaming/SimpleClass.php b/tests/rules/Fixtures/ClassTypeNaming/SimpleClass.php
@@ -6,7 +6,7 @@
  */
 declare(strict_types=1);
 
-namespace Ibexa\Tests\PHPStan\Rules\Fixtures\NamingConvention;
+namespace Ibexa\Tests\PHPStan\Rules\Fixtures\ClassTypeNaming;
 
 abstract class SimpleClass
 {
diff --git a/tests/rules/Fixtures/ClassTypeNaming/SimpleThing.php b/tests/rules/Fixtures/ClassTypeNaming/SimpleThing.php
@@ -6,7 +6,7 @@
  */
 declare(strict_types=1);
 
-namespace Ibexa\Tests\PHPStan\Rules\Fixtures\NamingConvention;
+namespace Ibexa\Tests\PHPStan\Rules\Fixtures\ClassTypeNaming;
 
 trait SimpleThing
 {
diff --git a/tests/rules/Fixtures/ClassTypeNaming/WrongName.php b/tests/rules/Fixtures/ClassTypeNaming/WrongName.php
@@ -6,7 +6,7 @@
  */
 declare(strict_types=1);
 
-namespace Ibexa\Tests\PHPStan\Rules\Fixtures\NamingConvention;
+namespace Ibexa\Tests\PHPStan\Rules\Fixtures\ClassTypeNaming;
 
 interface WrongName
 {

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`/**`
`17`	`17`	`* @implements \PHPStan\Rules\Rule<\PhpParser\Node\Stmt\ClassLike>`
`18`	`18`	`*/`
`19`		`-final class NamingConventionRule implements Rule`
	`19`	`+final class ClassTypeNamingRule implements Rule`
`20`	`20`	`{`
`21`	`21`	`public function getNodeType(): string`
`22`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,30 +8,30 @@`
`8`	`8`
`9`	`9`	`namespace Ibexa\Tests\PHPStan\Rules;`
`10`	`10`
`11`		`-use Ibexa\PHPStan\Rules\NamingConventionRule;`
	`11`	`+use Ibexa\PHPStan\Rules\ClassTypeNamingRule;`
`12`	`12`	`use PHPStan\Rules\Rule;`
`13`	`13`	`use PHPStan\Testing\RuleTestCase;`
`14`	`14`
`15`	`15`	`/**`
`16`		`- * @extends \PHPStan\Testing\RuleTestCase<\Ibexa\PHPStan\Rules\NamingConventionRule>`
	`16`	`+ * @extends \PHPStan\Testing\RuleTestCase<\Ibexa\PHPStan\Rules\ClassTypeNamingRule>`
`17`	`17`	`*/`
`18`		`-final class NamingConventionRuleTest extends RuleTestCase`
	`18`	`+final class ClassTypeNamingRuleTest extends RuleTestCase`
`19`	`19`	`{`
`20`	`20`	`protected function getRule(): Rule`
`21`	`21`	`{`
`22`		`- return new NamingConventionRule();`
	`22`	`+ return new ClassTypeNamingRule();`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public function testRule(): void`
`26`	`26`	`{`
`27`	`27`	`$this->analyse(`
`28`	`28`	`[`
`29`		`- __DIR__ . '/Fixtures/NamingConvention/WrongName.php',`
`30`		`- __DIR__ . '/Fixtures/NamingConvention/SimpleThing.php',`
`31`		`- __DIR__ . '/Fixtures/NamingConvention/SimpleClass.php',`
`32`		`- __DIR__ . '/Fixtures/NamingConvention/CorrectNameInterface.php',`
`33`		`- __DIR__ . '/Fixtures/NamingConvention/CorrectNameTrait.php',`
`34`		`- __DIR__ . '/Fixtures/NamingConvention/AbstractCorrectClass.php',`
	`29`	`+ __DIR__ . '/Fixtures/ClassTypeNaming/WrongName.php',`
	`30`	`+ __DIR__ . '/Fixtures/ClassTypeNaming/SimpleThing.php',`
	`31`	`+ __DIR__ . '/Fixtures/ClassTypeNaming/SimpleClass.php',`
	`32`	`+ __DIR__ . '/Fixtures/ClassTypeNaming/CorrectNameInterface.php',`
	`33`	`+ __DIR__ . '/Fixtures/ClassTypeNaming/CorrectNameTrait.php',`
	`34`	`+ __DIR__ . '/Fixtures/ClassTypeNaming/AbstractCorrectClass.php',`
`35`	`35`	`],`
`36`	`36`	`[`
`37`	`37`	`[`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*/`
`7`	`7`	`declare(strict_types=1);`
`8`	`8`
`9`		`-namespace Ibexa\Tests\PHPStan\Rules\Fixtures\NamingConvention;`
	`9`	`+namespace Ibexa\Tests\PHPStan\Rules\Fixtures\ClassTypeNaming;`
`10`	`10`
`11`	`11`	`abstract class AbstractCorrectClass`
`12`	`12`	`{`