cleanup some names

ViniTou · ViniTou · commit 9041841a9f49 · 2025-10-10T15:50:18.000+02:00
diff --git a/rules/FinalClassRule.php b/rules/FinalClassRule.php
@@ -10,9 +10,9 @@
 
 use PhpParser\Node;
 use PHPStan\Analyser\Scope;
+use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
-use PHPStan\Reflection\ReflectionProvider;
 
 /**
  * @implements \PHPStan\Rules\Rule<\PhpParser\Node\Stmt\Class_>
@@ -71,7 +71,7 @@ public function processNode(Node $node, Scope $scope): array
             )
                 ->identifier('class.notFinal')
                 ->tip('Add "final" keyword to the class declaration.')
-                ->build()
+                ->build(),
         ];
     }
 }
diff --git a/tests/rules/FinalClassRuleTest.php b/tests/rules/FinalClassRuleTest.php
@@ -26,11 +26,11 @@ public function testRule(): void
     {
         $this->analyse(
             [
-                __DIR__ . '/Fixtures/FinalRule/NonFinalClass.php',
+                __DIR__ . '/Fixtures/FinalClass/NonFinalClass.php',
             ],
             [
                 [
-                    'Class Ibexa\Tests\PHPStan\Rules\Fixtures\FinalRule\NonFinalClass is not final. All non-abstract classes should be final.',
+                    'Class Ibexa\Tests\PHPStan\Rules\Fixtures\FinalClass\NonFinalClass is not final. All non-abstract classes should be final.',
                     11,
                     'Add "final" keyword to the class declaration.',
                 ],
@@ -42,10 +42,10 @@ public function testNoErrorsOnFinalAndAbstractClassesAndInterfaces(): void
     {
         $this->analyse(
             [
-                __DIR__ . '/Fixtures/FinalRule/FinalClass.php',
-                __DIR__ . '/Fixtures/FinalRule/AbstractClass.php',
-                __DIR__ . '/Fixtures/FinalRule/SomeInterface.php',
-                __DIR__ . '/Fixtures/FinalRule/SomeTrait.php',
+                __DIR__ . '/Fixtures/FinalClass/FinalClass.php',
+                __DIR__ . '/Fixtures/FinalClass/AbstractClass.php',
+                __DIR__ . '/Fixtures/FinalClass/SomeInterface.php',
+                __DIR__ . '/Fixtures/FinalClass/SomeTrait.php',
             ],
             []
         );
diff --git a/tests/rules/Fixtures/FinalClass/AbstractClass.php b/tests/rules/Fixtures/FinalClass/AbstractClass.php
@@ -6,6 +6,8 @@
  */
 declare(strict_types=1);
 
-namespace Ibexa\Tests\PHPStan\Rules\Fixtures\FinalRule;
+namespace Ibexa\Tests\PHPStan\Rules\Fixtures\FinalClass;
 
-abstract class AbstractClass {}
+abstract class AbstractClass
+{
+}
diff --git a/tests/rules/Fixtures/FinalClass/FinalClass.php b/tests/rules/Fixtures/FinalClass/FinalClass.php
@@ -6,6 +6,8 @@
  */
 declare(strict_types=1);
 
-namespace Ibexa\Tests\PHPStan\Rules\Fixtures\FinalRule;
+namespace Ibexa\Tests\PHPStan\Rules\Fixtures\FinalClass;
 
-final class FinalClass {}
+final class FinalClass
+{
+}
diff --git a/tests/rules/Fixtures/FinalClass/NonFinalClass.php b/tests/rules/Fixtures/FinalClass/NonFinalClass.php
@@ -6,6 +6,8 @@
  */
 declare(strict_types=1);
 
-namespace Ibexa\Tests\PHPStan\Rules\Fixtures\FinalRule;
+namespace Ibexa\Tests\PHPStan\Rules\Fixtures\FinalClass;
 
-class NonFinalClass {}
+class NonFinalClass
+{
+}
diff --git a/tests/rules/Fixtures/FinalClass/SomeInterface.php b/tests/rules/Fixtures/FinalClass/SomeInterface.php
@@ -6,6 +6,8 @@
  */
 declare(strict_types=1);
 
-namespace Ibexa\Tests\PHPStan\Rules\Fixtures\FinalRule;
+namespace Ibexa\Tests\PHPStan\Rules\Fixtures\FinalClass;
 
-interface SomeInterface {}
+interface SomeInterface
+{
+}
diff --git a/tests/rules/Fixtures/FinalClass/SomeTrait.php b/tests/rules/Fixtures/FinalClass/SomeTrait.php
@@ -6,6 +6,8 @@
  */
 declare(strict_types=1);
 
-namespace Ibexa\Tests\PHPStan\Rules\Fixtures\FinalRule;
+namespace Ibexa\Tests\PHPStan\Rules\Fixtures\FinalClass;
 
-trait SomeTrait {}
+trait SomeTrait
+{
+}
diff --git a/tests/rules/Fixtures/FinalClassFixture.php b/tests/rules/Fixtures/FinalClassFixture.php
diff --git a/tests/rules/Fixtures/NamingConvention/AbstractCorrectClass.php b/tests/rules/Fixtures/NamingConvention/AbstractCorrectClass.php
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\Tests\PHPStan\Rules\Fixtures\NamingConvention;
+
+abstract class AbstractCorrectClass
+{
+}
diff --git a/tests/rules/Fixtures/NamingConvention/CorrectNameInterface.php b/tests/rules/Fixtures/NamingConvention/CorrectNameInterface.php
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\Tests\PHPStan\Rules\Fixtures\NamingConvention;
+
+interface CorrectNameInterface
+{
+}
diff --git a/tests/rules/Fixtures/NamingConvention/CorrectNameTrait.php b/tests/rules/Fixtures/NamingConvention/CorrectNameTrait.php
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\Tests\PHPStan\Rules\Fixtures\NamingConvention;
+
+trait CorrectNameTrait
+{
+}
diff --git a/tests/rules/Fixtures/NamingConvention/SimpleClass.php b/tests/rules/Fixtures/NamingConvention/SimpleClass.php
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\Tests\PHPStan\Rules\Fixtures\NamingConvention;
+
+abstract class SimpleClass
+{
+}
diff --git a/tests/rules/Fixtures/NamingConvention/SimpleThing.php b/tests/rules/Fixtures/NamingConvention/SimpleThing.php
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\Tests\PHPStan\Rules\Fixtures\NamingConvention;
+
+trait SimpleThing
+{
+}
diff --git a/tests/rules/Fixtures/NamingConvention/WrongName.php b/tests/rules/Fixtures/NamingConvention/WrongName.php
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\Tests\PHPStan\Rules\Fixtures\NamingConvention;
+
+interface WrongName
+{
+}
diff --git a/tests/rules/Fixtures/NamingConventionFixture.php b/tests/rules/Fixtures/NamingConventionFixture.php
diff --git a/tests/rules/Fixtures/RequireInterfaceInDependencies/ClassWithoutInterface.php b/tests/rules/Fixtures/RequireInterfaceInDependencies/ClassWithoutInterface.php
@@ -6,7 +6,7 @@
  */
 declare(strict_types=1);
 
-namespace Ibexa\Tests\PHPStan\Rules\Fixtures\Dependencies;
+namespace Ibexa\Tests\PHPStan\Rules\Fixtures\RequireInterfaceInDependencies;
 
 class ClassWithoutInterface
 {
diff --git a/tests/rules/Fixtures/RequireInterfaceInDependencies/ConcreteClass.php b/tests/rules/Fixtures/RequireInterfaceInDependencies/ConcreteClass.php
@@ -6,7 +6,7 @@
  */
 declare(strict_types=1);
 
-namespace Ibexa\Tests\PHPStan\Rules\Fixtures\Dependencies;
+namespace Ibexa\Tests\PHPStan\Rules\Fixtures\RequireInterfaceInDependencies;
 
 class ConcreteClass implements TestInterface
 {
diff --git a/tests/rules/Fixtures/RequireInterfaceInDependencies/TestInterface.php b/tests/rules/Fixtures/RequireInterfaceInDependencies/TestInterface.php
@@ -6,7 +6,7 @@
  */
 declare(strict_types=1);
 
-namespace Ibexa\Tests\PHPStan\Rules\Fixtures\Dependencies;
+namespace Ibexa\Tests\PHPStan\Rules\Fixtures\RequireInterfaceInDependencies;
 
 interface TestInterface
 {
diff --git a/tests/rules/Fixtures/RequireInterfaceInDependenciesFixture.php b/tests/rules/Fixtures/RequireInterfaceInDependenciesFixture.php
@@ -8,9 +8,9 @@
 
 namespace Ibexa\Tests\PHPStan\Rules\Fixtures;
 
-use Ibexa\Tests\PHPStan\Rules\Fixtures\Dependencies\ClassWithoutInterface;
-use Ibexa\Tests\PHPStan\Rules\Fixtures\Dependencies\ConcreteClass;
-use Ibexa\Tests\PHPStan\Rules\Fixtures\Dependencies\TestInterface;
+use Ibexa\Tests\PHPStan\Rules\Fixtures\RequireInterfaceInDependencies\ClassWithoutInterface;
+use Ibexa\Tests\PHPStan\Rules\Fixtures\RequireInterfaceInDependencies\ConcreteClass;
+use Ibexa\Tests\PHPStan\Rules\Fixtures\RequireInterfaceInDependencies\TestInterface;
 
 final class RequireInterfaceInDependenciesFixture
 {
diff --git a/tests/rules/NamingConventionRuleTest.php b/tests/rules/NamingConventionRuleTest.php
@@ -26,7 +26,12 @@ public function testRule(): void
     {
         $this->analyse(
             [
-                __DIR__ . '/Fixtures/NamingConventionFixture.php',
+                __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',
             ],
             [
                 [
@@ -35,11 +40,11 @@ public function testRule(): void
                 ],
                 [
                     'Trait "SimpleThing" should have "Trait" suffix',
-                    19,
+                    11,
                 ],
                 [
                     'Abstract class "SimpleClass" should have "Abstract" prefix',
-                    27,
+                    11,
                 ],
             ]
         );
diff --git a/tests/rules/RequireInterfaceInDependenciesRuleTest.php b/tests/rules/RequireInterfaceInDependenciesRuleTest.php
@@ -30,11 +30,11 @@ public function testRule(): void
             ],
             [
                 [
-                    'Parameter $concreteClass uses concrete class Ibexa\Tests\PHPStan\Rules\Fixtures\Dependencies\ConcreteClass instead of an interface. Available interfaces: Ibexa\Tests\PHPStan\Rules\Fixtures\Dependencies\TestInterface',
+                    'Parameter $concreteClass uses concrete class Ibexa\Tests\PHPStan\Rules\Fixtures\RequireInterfaceInDependencies\ConcreteClass instead of an interface. Available interfaces: Ibexa\Tests\PHPStan\Rules\Fixtures\RequireInterfaceInDependencies\TestInterface',
                     23,
                 ],
                 [
-                    'Parameter $class uses concrete class Ibexa\Tests\PHPStan\Rules\Fixtures\Dependencies\ConcreteClass instead of an interface. Available interfaces: Ibexa\Tests\PHPStan\Rules\Fixtures\Dependencies\TestInterface',
+                    'Parameter $class uses concrete class Ibexa\Tests\PHPStan\Rules\Fixtures\RequireInterfaceInDependencies\ConcreteClass instead of an interface. Available interfaces: Ibexa\Tests\PHPStan\Rules\Fixtures\RequireInterfaceInDependencies\TestInterface',
                     33,
                 ],
             ]

Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@`
`10`	`10`
`11`	`11`	`use PhpParser\Node;`
`12`	`12`	`use PHPStan\Analyser\Scope;`
	`13`	`+use PHPStan\Reflection\ReflectionProvider;`
`13`	`14`	`use PHPStan\Rules\Rule;`
`14`	`15`	`use PHPStan\Rules\RuleErrorBuilder;`
`15`		`-use PHPStan\Reflection\ReflectionProvider;`
`16`	`16`
`17`	`17`	`/**`
`18`	`18`	`* @implements \PHPStan\Rules\Rule<\PhpParser\Node\Stmt\Class_>`
`@@ -71,7 +71,7 @@ public function processNode(Node $node, Scope $scope): array`
`71`	`71`	`)`
`72`	`72`	`->identifier('class.notFinal')`
`73`	`73`	`->tip('Add "final" keyword to the class declaration.')`
`74`		`- ->build()`
	`74`	`+ ->build(),`
`75`	`75`	`];`
`76`	`76`	`}`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,11 +26,11 @@ public function testRule(): void`
`26`	`26`	`{`
`27`	`27`	`$this->analyse(`
`28`	`28`	`[`
`29`		`- __DIR__ . '/Fixtures/FinalRule/NonFinalClass.php',`
	`29`	`+ __DIR__ . '/Fixtures/FinalClass/NonFinalClass.php',`
`30`	`30`	`],`
`31`	`31`	`[`
`32`	`32`	`[`
`33`		`- 'Class Ibexa\Tests\PHPStan\Rules\Fixtures\FinalRule\NonFinalClass is not final. All non-abstract classes should be final.',`
	`33`	`+ 'Class Ibexa\Tests\PHPStan\Rules\Fixtures\FinalClass\NonFinalClass is not final. All non-abstract classes should be final.',`
`34`	`34`	`11,`
`35`	`35`	`'Add "final" keyword to the class declaration.',`
`36`	`36`	`],`
`@@ -42,10 +42,10 @@ public function testNoErrorsOnFinalAndAbstractClassesAndInterfaces(): void`
`42`	`42`	`{`
`43`	`43`	`$this->analyse(`
`44`	`44`	`[`
`45`		`- __DIR__ . '/Fixtures/FinalRule/FinalClass.php',`
`46`		`- __DIR__ . '/Fixtures/FinalRule/AbstractClass.php',`
`47`		`- __DIR__ . '/Fixtures/FinalRule/SomeInterface.php',`
`48`		`- __DIR__ . '/Fixtures/FinalRule/SomeTrait.php',`
	`45`	`+ __DIR__ . '/Fixtures/FinalClass/FinalClass.php',`
	`46`	`+ __DIR__ . '/Fixtures/FinalClass/AbstractClass.php',`
	`47`	`+ __DIR__ . '/Fixtures/FinalClass/SomeInterface.php',`
	`48`	`+ __DIR__ . '/Fixtures/FinalClass/SomeTrait.php',`
`49`	`49`	`],`
`50`	`50`	`[]`
`51`	`51`	`);`