DX: unify class/interface/trait naming

src/Fixer/Basic/BracesPositionFixer.php

@@ -17,7 +17,7 @@
 use PhpCsFixer\AbstractFixer;
 use PhpCsFixer\Fixer\ConfigurableFixerInterface;
 use PhpCsFixer\Fixer\ConfigurableFixerTrait;
-use PhpCsFixer\Fixer\Indentation;
+use PhpCsFixer\Fixer\IndentationTrait;
 use PhpCsFixer\Fixer\WhitespacesAwareFixerInterface;
 use PhpCsFixer\FixerConfiguration\FixerConfigurationResolver;
 use PhpCsFixer\FixerConfiguration\FixerConfigurationResolverInterface;
@@ -59,7 +59,7 @@ final class BracesPositionFixer extends AbstractFixer implements ConfigurableFix
     /** @use ConfigurableFixerTrait<_AutogeneratedInputConfiguration, _AutogeneratedComputedConfiguration> */
     use ConfigurableFixerTrait;
 
-    use Indentation;
+    use IndentationTrait;
 
     /**
      * @internal

src/Fixer/Basic/CurlyBracesPositionFixer.php

@@ -18,7 +18,7 @@
 use PhpCsFixer\Fixer\ConfigurableFixerInterface;
 use PhpCsFixer\Fixer\ConfigurableFixerTrait;
 use PhpCsFixer\Fixer\DeprecatedFixerInterface;
-use PhpCsFixer\Fixer\Indentation;
+use PhpCsFixer\Fixer\IndentationTrait;
 use PhpCsFixer\Fixer\WhitespacesAwareFixerInterface;
 use PhpCsFixer\FixerConfiguration\FixerConfigurationResolverInterface;
 use PhpCsFixer\FixerDefinition\FixerDefinition;
@@ -53,7 +53,7 @@ final class CurlyBracesPositionFixer extends AbstractProxyFixer implements Confi
     /** @use ConfigurableFixerTrait<_AutogeneratedInputConfiguration, _AutogeneratedComputedConfiguration> */
     use ConfigurableFixerTrait;
 
-    use Indentation;
+    use IndentationTrait;
 
     private BracesPositionFixer $bracesPositionFixer;
 

src/Fixer/Basic/NoMultipleStatementsPerLineFixer.php

@@ -15,7 +15,7 @@
 namespace PhpCsFixer\Fixer\Basic;
 
 use PhpCsFixer\AbstractFixer;
-use PhpCsFixer\Fixer\Indentation;
+use PhpCsFixer\Fixer\IndentationTrait;
 use PhpCsFixer\Fixer\WhitespacesAwareFixerInterface;
 use PhpCsFixer\FixerDefinition\CodeSample;
 use PhpCsFixer\FixerDefinition\FixerDefinition;
@@ -29,7 +29,7 @@
  */
 final class NoMultipleStatementsPerLineFixer extends AbstractFixer implements WhitespacesAwareFixerInterface
 {
-    use Indentation;
+    use IndentationTrait;
 
     public function getDefinition(): FixerDefinitionInterface
     {

src/Fixer/Indentation.php → src/Fixer/IndentationTrait.php

@@ -20,7 +20,7 @@
 /**
  * @internal
  */
-trait Indentation
+trait IndentationTrait
 {
     private function getLineIndentation(Tokens $tokens, int $index): string
     {

src/Fixer/Whitespace/ArrayIndentationFixer.php

@@ -15,7 +15,7 @@
 namespace PhpCsFixer\Fixer\Whitespace;
 
 use PhpCsFixer\AbstractFixer;
-use PhpCsFixer\Fixer\Indentation;
+use PhpCsFixer\Fixer\IndentationTrait;
 use PhpCsFixer\Fixer\WhitespacesAwareFixerInterface;
 use PhpCsFixer\FixerDefinition\CodeSample;
 use PhpCsFixer\FixerDefinition\FixerDefinition;
@@ -27,7 +27,7 @@
 
 final class ArrayIndentationFixer extends AbstractFixer implements WhitespacesAwareFixerInterface
 {
-    use Indentation;
+    use IndentationTrait;
 
     public function getDefinition(): FixerDefinitionInterface
     {

src/Fixer/Whitespace/StatementIndentationFixer.php

@@ -17,7 +17,7 @@
 use PhpCsFixer\AbstractFixer;
 use PhpCsFixer\Fixer\ConfigurableFixerInterface;
 use PhpCsFixer\Fixer\ConfigurableFixerTrait;
-use PhpCsFixer\Fixer\Indentation;
+use PhpCsFixer\Fixer\IndentationTrait;
 use PhpCsFixer\Fixer\WhitespacesAwareFixerInterface;
 use PhpCsFixer\FixerConfiguration\FixerConfigurationResolver;
 use PhpCsFixer\FixerConfiguration\FixerConfigurationResolverInterface;
@@ -47,7 +47,8 @@ final class StatementIndentationFixer extends AbstractFixer implements Configura
     /** @use ConfigurableFixerTrait<_AutogeneratedInputConfiguration, _AutogeneratedComputedConfiguration> */
     use ConfigurableFixerTrait;
 
-    use Indentation;
+    use IndentationTrait;
+
     private const BLOCK_SIGNATURE_FIRST_TOKENS = [
         \T_USE,
         \T_IF,

tests/AutoReview/ProjectCodeTest.php

@@ -1027,6 +1027,25 @@ public static function providePhpUnitFixerExtendsAbstractPhpUnitFixerCases(): it
         }
     }
 
+    /**
+     * @dataProvider provideSrcClassCases
+     *
+     * @param class-string $name
+     */
+    public function testProperNaming(string $name): void
+    {
+        $reflection = new \ReflectionClass($name);
+
+        if ($reflection->isInterface()) {
+            self::assertStringEndsWith('Interface', $name);
+        } elseif ($reflection->isTrait()) {
+            self::assertStringEndsWith('Trait', $name);
+        } else {
+            self::assertStringEndsNotWith('Interface', $name);
+            self::assertStringEndsNotWith('Trait', $name);
+        }
+    }
+
     /**
      * @dataProvider provideSrcClassCases
      * @dataProvider provideTestClassCases