From 7b139d1228cbc84595271ba7d7030266c8846950 Mon Sep 17 00:00:00 2001
From: Tomas Votruba <tomas.vot@gmail.com>
Date: Wed, 5 Jun 2019 12:36:19 +0300
Subject: [PATCH] move abstract rector traits to AbstractRector namespace

---
 .../FileSystemRector/src/Rector/AbstractFileSystemRector.php    | 2 +-
 src/Rector/AbstractRector.php                                   | 1 +
 src/Rector/{ => AbstractRector}/AbstractRectorTrait.php         | 2 +-
 src/Rector/{ => AbstractRector}/AppliedRectorCollectorTrait.php | 2 +-
 src/Rector/{ => AbstractRector}/BetterStandardPrinterTrait.php  | 2 +-
 src/Rector/{ => AbstractRector}/CallableNodeTraverserTrait.php  | 2 +-
 src/Rector/{ => AbstractRector}/ConstFetchAnalyzerTrait.php     | 2 +-
 src/Rector/{ => AbstractRector}/NameResolverTrait.php           | 2 +-
 src/Rector/{ => AbstractRector}/NodeCommandersTrait.php         | 2 +-
 src/Rector/{ => AbstractRector}/NodeFactoryTrait.php            | 2 +-
 src/Rector/{ => AbstractRector}/NodeTypeResolverTrait.php       | 2 +-
 src/Rector/{ => AbstractRector}/ValueResolverTrait.php          | 2 +-
 src/Rector/{ => AbstractRector}/VisibilityTrait.php             | 2 +-
 13 files changed, 13 insertions(+), 12 deletions(-)
 rename src/Rector/{ => AbstractRector}/AbstractRectorTrait.php (90%)
 rename src/Rector/{ => AbstractRector}/AppliedRectorCollectorTrait.php (96%)
 rename src/Rector/{ => AbstractRector}/BetterStandardPrinterTrait.php (98%)
 rename src/Rector/{ => AbstractRector}/CallableNodeTraverserTrait.php (95%)
 rename src/Rector/{ => AbstractRector}/ConstFetchAnalyzerTrait.php (96%)
 rename src/Rector/{ => AbstractRector}/NameResolverTrait.php (97%)
 rename src/Rector/{ => AbstractRector}/NodeCommandersTrait.php (98%)
 rename src/Rector/{ => AbstractRector}/NodeFactoryTrait.php (98%)
 rename src/Rector/{ => AbstractRector}/NodeTypeResolverTrait.php (98%)
 rename src/Rector/{ => AbstractRector}/ValueResolverTrait.php (95%)
 rename src/Rector/{ => AbstractRector}/VisibilityTrait.php (98%)

diff --git a/packages/FileSystemRector/src/Rector/AbstractFileSystemRector.php b/packages/FileSystemRector/src/Rector/AbstractFileSystemRector.php
index 38b68515b5c..8d16907db92 100644
--- a/packages/FileSystemRector/src/Rector/AbstractFileSystemRector.php
+++ b/packages/FileSystemRector/src/Rector/AbstractFileSystemRector.php
@@ -13,7 +13,7 @@ use Rector\NodeTypeResolver\NodeScopeAndMetadataDecorator;
 use Rector\PhpParser\Parser\Parser;
 use Rector\PhpParser\Printer\BetterStandardPrinter;
 use Rector\PhpParser\Printer\FormatPerservingPrinter;
-use Rector\Rector\AbstractRectorTrait;
+use Rector\Rector\AbstractRector\AbstractRectorTrait;
 use Symplify\PackageBuilder\FileSystem\SmartFileInfo;
 use TypeError;
 
diff --git a/src/Rector/AbstractRector.php b/src/Rector/AbstractRector.php
index 6c611b0b84d..3f48c137f1d 100644
--- a/src/Rector/AbstractRector.php
+++ b/src/Rector/AbstractRector.php
@@ -13,6 +13,7 @@ use Rector\Application\FileSystem\RemovedAndAddedFilesCollector;
 use Rector\Contract\Rector\PhpRectorInterface;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\Php\PhpVersionProvider;
+use Rector\Rector\AbstractRector\AbstractRectorTrait;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symplify\PackageBuilder\FileSystem\SmartFileInfo;
 
diff --git a/src/Rector/AbstractRectorTrait.php b/src/Rector/AbstractRector/AbstractRectorTrait.php
similarity index 90%
rename from src/Rector/AbstractRectorTrait.php
rename to src/Rector/AbstractRector/AbstractRectorTrait.php
index 67a3bcf0de6..16276403ba6 100644
--- a/src/Rector/AbstractRectorTrait.php
+++ b/src/Rector/AbstractRector/AbstractRectorTrait.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Rector;
+namespace Rector\Rector\AbstractRector;
 
 trait AbstractRectorTrait
 {
diff --git a/src/Rector/AppliedRectorCollectorTrait.php b/src/Rector/AbstractRector/AppliedRectorCollectorTrait.php
similarity index 96%
rename from src/Rector/AppliedRectorCollectorTrait.php
rename to src/Rector/AbstractRector/AppliedRectorCollectorTrait.php
index 50d3a60b123..ffaf5d36d4b 100644
--- a/src/Rector/AppliedRectorCollectorTrait.php
+++ b/src/Rector/AbstractRector/AppliedRectorCollectorTrait.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Rector;
+namespace Rector\Rector\AbstractRector;
 
 use PhpParser\Node;
 use Rector\Application\AppliedRectorCollector;
diff --git a/src/Rector/BetterStandardPrinterTrait.php b/src/Rector/AbstractRector/BetterStandardPrinterTrait.php
similarity index 98%
rename from src/Rector/BetterStandardPrinterTrait.php
rename to src/Rector/AbstractRector/BetterStandardPrinterTrait.php
index 98c6bcd2fb0..fbb461e6379 100644
--- a/src/Rector/BetterStandardPrinterTrait.php
+++ b/src/Rector/AbstractRector/BetterStandardPrinterTrait.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Rector;
+namespace Rector\Rector\AbstractRector;
 
 use PhpParser\Node;
 use Rector\PhpParser\Node\BetterNodeFinder;
diff --git a/src/Rector/CallableNodeTraverserTrait.php b/src/Rector/AbstractRector/CallableNodeTraverserTrait.php
similarity index 95%
rename from src/Rector/CallableNodeTraverserTrait.php
rename to src/Rector/AbstractRector/CallableNodeTraverserTrait.php
index daa81b6b11c..bed113918f6 100644
--- a/src/Rector/CallableNodeTraverserTrait.php
+++ b/src/Rector/AbstractRector/CallableNodeTraverserTrait.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Rector;
+namespace Rector\Rector\AbstractRector;
 
 use PhpParser\Node;
 use Rector\PhpParser\NodeTraverser\CallableNodeTraverser;
diff --git a/src/Rector/ConstFetchAnalyzerTrait.php b/src/Rector/AbstractRector/ConstFetchAnalyzerTrait.php
similarity index 96%
rename from src/Rector/ConstFetchAnalyzerTrait.php
rename to src/Rector/AbstractRector/ConstFetchAnalyzerTrait.php
index 3fbd9800bb3..adf5637c6e6 100644
--- a/src/Rector/ConstFetchAnalyzerTrait.php
+++ b/src/Rector/AbstractRector/ConstFetchAnalyzerTrait.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Rector;
+namespace Rector\Rector\AbstractRector;
 
 use PhpParser\Node;
 use Rector\PhpParser\Node\Manipulator\ConstFetchManipulator;
diff --git a/src/Rector/NameResolverTrait.php b/src/Rector/AbstractRector/NameResolverTrait.php
similarity index 97%
rename from src/Rector/NameResolverTrait.php
rename to src/Rector/AbstractRector/NameResolverTrait.php
index 7b550c1e71d..040bdefa863 100644
--- a/src/Rector/NameResolverTrait.php
+++ b/src/Rector/AbstractRector/NameResolverTrait.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Rector;
+namespace Rector\Rector\AbstractRector;
 
 use PhpParser\Node;
 use Rector\PhpParser\Node\Resolver\NameResolver;
diff --git a/src/Rector/NodeCommandersTrait.php b/src/Rector/AbstractRector/NodeCommandersTrait.php
similarity index 98%
rename from src/Rector/NodeCommandersTrait.php
rename to src/Rector/AbstractRector/NodeCommandersTrait.php
index a9093be6ae6..d392682100a 100644
--- a/src/Rector/NodeCommandersTrait.php
+++ b/src/Rector/AbstractRector/NodeCommandersTrait.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Rector;
+namespace Rector\Rector\AbstractRector;
 
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Class_;
diff --git a/src/Rector/NodeFactoryTrait.php b/src/Rector/AbstractRector/NodeFactoryTrait.php
similarity index 98%
rename from src/Rector/NodeFactoryTrait.php
rename to src/Rector/AbstractRector/NodeFactoryTrait.php
index 7a312876d6a..1dea98cb042 100644
--- a/src/Rector/NodeFactoryTrait.php
+++ b/src/Rector/AbstractRector/NodeFactoryTrait.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Rector;
+namespace Rector\Rector\AbstractRector;
 
 use PhpParser\Node;
 use PhpParser\Node\Arg;
diff --git a/src/Rector/NodeTypeResolverTrait.php b/src/Rector/AbstractRector/NodeTypeResolverTrait.php
similarity index 98%
rename from src/Rector/NodeTypeResolverTrait.php
rename to src/Rector/AbstractRector/NodeTypeResolverTrait.php
index bdbd140a05c..f07203355d0 100644
--- a/src/Rector/NodeTypeResolverTrait.php
+++ b/src/Rector/AbstractRector/NodeTypeResolverTrait.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Rector;
+namespace Rector\Rector\AbstractRector;
 
 use PhpParser\Node;
 use PHPStan\Type\Type;
diff --git a/src/Rector/ValueResolverTrait.php b/src/Rector/AbstractRector/ValueResolverTrait.php
similarity index 95%
rename from src/Rector/ValueResolverTrait.php
rename to src/Rector/AbstractRector/ValueResolverTrait.php
index 676d52136bd..7dc4fbf1dc6 100644
--- a/src/Rector/ValueResolverTrait.php
+++ b/src/Rector/AbstractRector/ValueResolverTrait.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Rector;
+namespace Rector\Rector\AbstractRector;
 
 use PhpParser\Node\Expr;
 use Rector\PhpParser\Node\Value\ValueResolver;
diff --git a/src/Rector/VisibilityTrait.php b/src/Rector/AbstractRector/VisibilityTrait.php
similarity index 98%
rename from src/Rector/VisibilityTrait.php
rename to src/Rector/AbstractRector/VisibilityTrait.php
index 359cf9d768c..cf1a2100d6f 100644
--- a/src/Rector/VisibilityTrait.php
+++ b/src/Rector/AbstractRector/VisibilityTrait.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Rector\Rector;
+namespace Rector\Rector\AbstractRector;
 
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Class_;