Reorganize project structure

.php-cs-fixer.dist.php

@@ -3,7 +3,7 @@
 
 $finder = PhpCsFixer\Finder::create()
     ->in(__DIR__)
-    ->exclude('tests/ClassNotation/_data')
+    ->exclude('tests/Fixer/ClassNotation/_data')
 ;
 
 return Ely\CS\Config::create([

src/AbstractFixer.php → src/Fixer/AbstractFixer.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer;
+namespace ErickSkrauch\PhpCsFixer\Fixer;
 
 abstract class AbstractFixer extends \PhpCsFixer\AbstractFixer {
 

src/ClassNotation/OrderedOverridesFixer.php → src/Fixer/ClassNotation/OrderedOverridesFixer.php

@@ -1,11 +1,11 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\ClassNotation;
+namespace ErickSkrauch\PhpCsFixer\Fixer\ClassNotation;
 
-use ErickSkrauch\PhpCsFixer\AbstractFixer;
 use ErickSkrauch\PhpCsFixer\Analyzer\ClassElementsAnalyzer;
 use ErickSkrauch\PhpCsFixer\Analyzer\ClassNameAnalyzer;
+use ErickSkrauch\PhpCsFixer\Fixer\AbstractFixer;
 use PhpCsFixer\FixerDefinition\CodeSample;
 use PhpCsFixer\FixerDefinition\FixerDefinition;
 use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;

src/FunctionNotation/AlignMultilineParametersFixer.php → src/Fixer/FunctionNotation/AlignMultilineParametersFixer.php

@@ -1,9 +1,9 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\FunctionNotation;
+namespace ErickSkrauch\PhpCsFixer\Fixer\FunctionNotation;
 
-use ErickSkrauch\PhpCsFixer\AbstractFixer;
+use ErickSkrauch\PhpCsFixer\Fixer\AbstractFixer;
 use PhpCsFixer\Fixer\ConfigurableFixerInterface;
 use PhpCsFixer\Fixer\WhitespacesAwareFixerInterface;
 use PhpCsFixer\FixerConfiguration\FixerConfigurationResolver;

src/LanguageConstruct/RemoveClassNameMethodUsagesFixer.php → src/Fixer/LanguageConstruct/RemoveClassNameMethodUsagesFixer.php

@@ -1,9 +1,9 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\LanguageConstruct;
+namespace ErickSkrauch\PhpCsFixer\Fixer\LanguageConstruct;
 
-use ErickSkrauch\PhpCsFixer\AbstractFixer;
+use ErickSkrauch\PhpCsFixer\Fixer\AbstractFixer;
 use PhpCsFixer\FixerDefinition\CodeSample;
 use PhpCsFixer\FixerDefinition\FixerDefinition;
 use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;

src/Whitespace/BlankLineAroundClassBodyFixer.php → src/Fixer/Whitespace/BlankLineAroundClassBodyFixer.php

@@ -1,9 +1,9 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\Whitespace;
+namespace ErickSkrauch\PhpCsFixer\Fixer\Whitespace;
 
-use ErickSkrauch\PhpCsFixer\AbstractFixer;
+use ErickSkrauch\PhpCsFixer\Fixer\AbstractFixer;
 use PhpCsFixer\Fixer\ConfigurableFixerInterface;
 use PhpCsFixer\Fixer\WhitespacesAwareFixerInterface;
 use PhpCsFixer\FixerConfiguration\FixerConfigurationResolver;

src/Whitespace/BlankLineBeforeReturnFixer.php → src/Fixer/Whitespace/BlankLineBeforeReturnFixer.php

@@ -1,9 +1,9 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\Whitespace;
+namespace ErickSkrauch\PhpCsFixer\Fixer\Whitespace;
 
-use ErickSkrauch\PhpCsFixer\AbstractFixer;
+use ErickSkrauch\PhpCsFixer\Fixer\AbstractFixer;
 use PhpCsFixer\Fixer\WhitespacesAwareFixerInterface;
 use PhpCsFixer\FixerDefinition\CodeSample;
 use PhpCsFixer\FixerDefinition\FixerDefinition;

src/Whitespace/LineBreakAfterStatementsFixer.php → src/Fixer/Whitespace/LineBreakAfterStatementsFixer.php

@@ -1,9 +1,9 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\Whitespace;
+namespace ErickSkrauch\PhpCsFixer\Fixer\Whitespace;
 
-use ErickSkrauch\PhpCsFixer\AbstractFixer;
+use ErickSkrauch\PhpCsFixer\Fixer\AbstractFixer;
 use PhpCsFixer\Fixer\WhitespacesAwareFixerInterface;
 use PhpCsFixer\FixerDefinition\CodeSample;
 use PhpCsFixer\FixerDefinition\FixerDefinition;

src/Whitespace/MultilineIfStatementBracesFixer.php → src/Fixer/Whitespace/MultilineIfStatementBracesFixer.php

@@ -1,9 +1,9 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\Whitespace;
+namespace ErickSkrauch\PhpCsFixer\Fixer\Whitespace;
 
-use ErickSkrauch\PhpCsFixer\AbstractFixer;
+use ErickSkrauch\PhpCsFixer\Fixer\AbstractFixer;
 use PhpCsFixer\Fixer\ConfigurableFixerInterface;
 use PhpCsFixer\Fixer\WhitespacesAwareFixerInterface;
 use PhpCsFixer\FixerConfiguration\FixerConfigurationResolver;

src/Fixers.php

@@ -19,7 +19,7 @@ final class Fixers implements IteratorAggregate {
      */
     public function getIterator(): Traversable {
         $finder = new Finder();
-        $finder->in(__DIR__)->name('*.php');
+        $finder->in(__DIR__ . '/Fixer')->name('*.php');
         $classes = [];
         /** @var \Symfony\Component\Finder\SplFileInfo $file */
         foreach ($finder as $file) {

tests/ClassNotation/OrderedOverridesFixerTest.php → tests/Fixer/ClassNotation/OrderedOverridesFixerTest.php

@@ -1,14 +1,14 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\Tests\ClassNotation;
+namespace ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation;
 
-use ErickSkrauch\PhpCsFixer\ClassNotation\OrderedOverridesFixer;
+use ErickSkrauch\PhpCsFixer\Fixer\ClassNotation\OrderedOverridesFixer;
 use PhpCsFixer\AbstractFixer;
 use PhpCsFixer\Tests\Test\AbstractFixerTestCase;
 
 /**
- * @covers \ErickSkrauch\PhpCsFixer\ClassNotation\OrderedOverridesFixer
+ * @covers \ErickSkrauch\PhpCsFixer\Fixer\ClassNotation\OrderedOverridesFixer
  */
 final class OrderedOverridesFixerTest extends AbstractFixerTestCase {
 
@@ -34,21 +34,21 @@ public function bar(): void {}
 
         yield 'implements empty interface' => [
             '<?php
-            class A implements \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\EmptyInterface {
+            class A implements \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\EmptyInterface {
                 public function foo(): void {}
             }
             ',
         ];
 
         yield 'single interface implementation' => [
             '<?php
-            class A implements \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\InterfaceA {
+            class A implements \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\InterfaceA {
                 public function foo(): void {}
                 public function bar(): void {}
             }
             ',
             '<?php
-            class A implements \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\InterfaceA {
+            class A implements \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\InterfaceA {
                 public function bar(): void {}
                 public function foo(): void {}
             }
@@ -57,7 +57,7 @@ public function foo(): void {}
 
         yield 'multiple interfaces implementation' => [
             '<?php
-            use ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data;
+            use ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data;
 
             class A implements _data\InterfaceA, _data\InterfaceB {
                 public function foo(): void {}
@@ -67,7 +67,7 @@ public function qux(): void {}
             }
             ',
             '<?php
-            use ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data;
+            use ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data;
 
             class A implements _data\InterfaceA, _data\InterfaceB {
                 public function baz(): void {}
@@ -80,7 +80,7 @@ public function foo(): void {}
 
         yield 'abstract class' => [
             '<?php
-            use ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data;
+            use ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data;
 
             abstract class A implements _data\InterfaceA, _data\InterfaceB {
                 public function bar(): void {}
@@ -89,7 +89,7 @@ public function baz(): void {}
             }
             ',
             '<?php
-            use ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data;
+            use ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data;
 
             abstract class A implements _data\InterfaceA, _data\InterfaceB {
                 public function baz(): void {}
@@ -101,22 +101,22 @@ public function bar(): void {}
 
         yield 'interface extension' => [
             '<?php
-            interface ExtendedA extends \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\InterfaceA {
+            interface ExtendedA extends \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\InterfaceA {
                 public function baz(): void;
             }
             ',
         ];
 
         yield 'non-interface methods' => [
             '<?php
-            class A implements \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\InterfaceA {
+            class A implements \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\InterfaceA {
                 public function foo(): void {}
                 public function nonInterface(): void {}
                 public function bar(): void {}
             }
             ',
             '<?php
-            class A implements \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\InterfaceA {
+            class A implements \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\InterfaceA {
                 public function bar(): void {}
                 public function nonInterface(): void {}
                 public function foo(): void {}
@@ -126,14 +126,14 @@ public function foo(): void {}
 
         yield 'extend abstract class' => [
             '<?php
-            class A extends \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\AbstractA {
+            class A extends \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\AbstractA {
                 public function foo(): void {}
                 public function nonInterface(): void {}
                 public function bar(): void {}
             }
             ',
             '<?php
-            class A extends \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\AbstractA {
+            class A extends \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\AbstractA {
                 public function bar(): void {}
                 public function nonInterface(): void {}
                 public function foo(): void {}
@@ -143,7 +143,7 @@ public function foo(): void {}
 
         yield 'interface with multiple extends' => [
             '<?php
-            class A implements \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\InterfaceAandB {
+            class A implements \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\InterfaceAandB {
                 public function foo(): void {}
                 public function nonInterface(): void {}
                 public function bar(): void {}
@@ -153,7 +153,7 @@ public function quux(): void{}
             }
             ',
             '<?php
-            class A implements \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\InterfaceAandB {
+            class A implements \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\InterfaceAandB {
                 public function bar(): void {}
                 public function nonInterface(): void {}
                 public function qux() : void{}
@@ -166,7 +166,7 @@ public function baz() : void{}
 
         yield 'mix of extends and interface' => [
             '<?php
-            use ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data;
+            use ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data;
 
             class A extends _data\AbstractA implements _data\InterfaceB {
                 public function foo(): void {}
@@ -176,7 +176,7 @@ public function qux() : void{}
             }
             ',
             '<?php
-            use ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data;
+            use ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data;
 
             class A extends _data\AbstractA implements _data\InterfaceB {
                 public function qux() : void{}
@@ -189,7 +189,7 @@ public function baz() : void{}
 
         yield 'function in implementation' => [
             '<?php
-            class A extends \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\AbstractA {
+            class A extends \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\AbstractA {
                 public function bar(): void {
                     $a = function() {
                         // body
@@ -201,13 +201,13 @@ public function bar(): void {
 
         yield 'anonymous class' => [
             '<?php
-            $a = new class implements \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\InterfaceA {
+            $a = new class implements \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\InterfaceA {
                 public function foo(): void {}
                 public function bar(): void {}
             };
             ',
             '<?php
-            $a = new class implements \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\InterfaceA {
+            $a = new class implements \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\InterfaceA {
                 public function bar(): void {}
                 public function foo(): void {}
             };
@@ -225,7 +225,7 @@ public function foo(): void {}
 
         yield 'mix of other class elements' => [
             '<?php
-            class A implements \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\InterfaceA {
+            class A implements \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\InterfaceA {
                 public function foo(): void {}
                 private string $a;
                 public function nonInterface(): void {}
@@ -236,7 +236,7 @@ public function qux(): void {}
             }
             ',
             '<?php
-            class A implements \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\InterfaceA {
+            class A implements \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\InterfaceA {
                 public function bar(): void {}
                 private string $a;
                 public function nonInterface(): void {}
@@ -250,13 +250,13 @@ public function qux(): void {}
 
         yield 'use the order of the deepest parent ' => [
             '<?php
-            class A implements \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\InterfaceAReverseOrder {
+            class A implements \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\InterfaceAReverseOrder {
                 public function foo(): void {}
                 public function bar(): void {}
             }
             ',
             '<?php
-            class A implements \ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data\InterfaceAReverseOrder {
+            class A implements \ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data\InterfaceAReverseOrder {
                 public function bar(): void {}
                 public function foo(): void {}
             }

tests/ClassNotation/_data/AbstractA.php → tests/Fixer/ClassNotation/_data/AbstractA.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data;
+namespace ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data;
 
 abstract class AbstractA implements InterfaceA {
 

tests/Fixer/ClassNotation/_data/EmptyInterface.php

@@ -0,0 +1,8 @@
+<?php
+declare(strict_types=1);
+
+namespace ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data;
+
+interface EmptyInterface {
+
+}

tests/ClassNotation/_data/InterfaceA.php → tests/Fixer/ClassNotation/_data/InterfaceA.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data;
+namespace ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data;
 
 interface InterfaceA {
 

tests/ClassNotation/_data/InterfaceAReverseOrder.php → tests/Fixer/ClassNotation/_data/InterfaceAReverseOrder.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data;
+namespace ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data;
 
 interface InterfaceAReverseOrder extends InterfaceA {
 

tests/ClassNotation/_data/InterfaceAandB.php → tests/Fixer/ClassNotation/_data/InterfaceAandB.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data;
+namespace ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data;
 
 interface InterfaceAandB extends InterfaceA, InterfaceB {
 

tests/ClassNotation/_data/InterfaceB.php → tests/Fixer/ClassNotation/_data/InterfaceB.php

@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace ErickSkrauch\PhpCsFixer\Tests\ClassNotation\_data;
+namespace ErickSkrauch\PhpCsFixer\Tests\Fixer\ClassNotation\_data;
 
 interface InterfaceB {