[DX] Removing more parent abstract circular classes (#5709)

Co-authored-by: kaizen-ci <[email protected]>
rectorphp · Feb 28, 2021 · 8c3443b · 8c3443b
1 parent a62bb98
commit 8c3443b
Show file tree

Hide file tree

Showing 43 changed files with 505 additions and 458 deletions.
diff --git a/...s/better-php-doc-parser/src/ValueObjectFactory/PhpDocNode/AbstractTagValueNodeFactory.php b/...s/better-php-doc-parser/src/ValueObjectFactory/PhpDocNode/AbstractTagValueNodeFactory.php
diff --git a/...r-php-doc-parser/src/ValueObjectFactory/PhpDocNode/Doctrine/ColumnTagValueNodeFactory.php b/...r-php-doc-parser/src/ValueObjectFactory/PhpDocNode/Doctrine/ColumnTagValueNodeFactory.php
@@ -4,11 +4,30 @@
 
 namespace Rector\BetterPhpDocParser\ValueObjectFactory\PhpDocNode\Doctrine;
 
+use Rector\BetterPhpDocParser\Printer\ArrayPartPhpDocTagPrinter;
+use Rector\BetterPhpDocParser\Printer\TagValueNodePrinter;
 use Rector\BetterPhpDocParser\ValueObject\PhpDocNode\Doctrine\Property_\ColumnTagValueNode;
-use Rector\BetterPhpDocParser\ValueObjectFactory\PhpDocNode\AbstractTagValueNodeFactory;
 
-final class ColumnTagValueNodeFactory extends AbstractTagValueNodeFactory
+final class ColumnTagValueNodeFactory
 {
+    /**
+     * @var ArrayPartPhpDocTagPrinter
+     */
+    private $arrayPartPhpDocTagPrinter;
+
+    /**
+     * @var TagValueNodePrinter
+     */
+    private $tagValueNodePrinter;
+
+    public function __construct(
+        ArrayPartPhpDocTagPrinter $arrayPartPhpDocTagPrinter,
+        TagValueNodePrinter $tagValueNodePrinter
+    ) {
+        $this->arrayPartPhpDocTagPrinter = $arrayPartPhpDocTagPrinter;
+        $this->tagValueNodePrinter = $tagValueNodePrinter;
+    }
+
     public function create(): ColumnTagValueNode
     {
         return $this->createFromItems([]);

diff --git a/...r-php-doc-parser/src/ValueObjectFactory/PhpDocNode/Doctrine/EntityTagValueNodeFactory.php b/...r-php-doc-parser/src/ValueObjectFactory/PhpDocNode/Doctrine/EntityTagValueNodeFactory.php
@@ -4,11 +4,30 @@
 
 namespace Rector\BetterPhpDocParser\ValueObjectFactory\PhpDocNode\Doctrine;
 
+use Rector\BetterPhpDocParser\Printer\ArrayPartPhpDocTagPrinter;
+use Rector\BetterPhpDocParser\Printer\TagValueNodePrinter;
 use Rector\BetterPhpDocParser\ValueObject\PhpDocNode\Doctrine\Class_\EntityTagValueNode;
-use Rector\BetterPhpDocParser\ValueObjectFactory\PhpDocNode\AbstractTagValueNodeFactory;
 
-final class EntityTagValueNodeFactory extends AbstractTagValueNodeFactory
+final class EntityTagValueNodeFactory
 {
+    /**
+     * @var ArrayPartPhpDocTagPrinter
+     */
+    private $arrayPartPhpDocTagPrinter;
+
+    /**
+     * @var TagValueNodePrinter
+     */
+    private $tagValueNodePrinter;
+
+    public function __construct(
+        ArrayPartPhpDocTagPrinter $arrayPartPhpDocTagPrinter,
+        TagValueNodePrinter $tagValueNodePrinter
+    ) {
+        $this->arrayPartPhpDocTagPrinter = $arrayPartPhpDocTagPrinter;
+        $this->tagValueNodePrinter = $tagValueNodePrinter;
+    }
+
     public function create(): EntityTagValueNode
     {
         return $this->createFromItems([]);

diff --git a/...p-doc-parser/src/ValueObjectFactory/PhpDocNode/Doctrine/JoinColumnTagValueNodeFactory.php b/...p-doc-parser/src/ValueObjectFactory/PhpDocNode/Doctrine/JoinColumnTagValueNodeFactory.php
@@ -4,11 +4,30 @@
 
 namespace Rector\BetterPhpDocParser\ValueObjectFactory\PhpDocNode\Doctrine;
 
+use Rector\BetterPhpDocParser\Printer\ArrayPartPhpDocTagPrinter;
+use Rector\BetterPhpDocParser\Printer\TagValueNodePrinter;
 use Rector\BetterPhpDocParser\ValueObject\PhpDocNode\Doctrine\Property_\JoinColumnTagValueNode;
-use Rector\BetterPhpDocParser\ValueObjectFactory\PhpDocNode\AbstractTagValueNodeFactory;
 
-final class JoinColumnTagValueNodeFactory extends AbstractTagValueNodeFactory
+final class JoinColumnTagValueNodeFactory
 {
+    /**
+     * @var ArrayPartPhpDocTagPrinter
+     */
+    private $arrayPartPhpDocTagPrinter;
+
+    /**
+     * @var TagValueNodePrinter
+     */
+    private $tagValueNodePrinter;
+
+    public function __construct(
+        ArrayPartPhpDocTagPrinter $arrayPartPhpDocTagPrinter,
+        TagValueNodePrinter $tagValueNodePrinter
+    ) {
+        $this->arrayPartPhpDocTagPrinter = $arrayPartPhpDocTagPrinter;
+        $this->tagValueNodePrinter = $tagValueNodePrinter;
+    }
+
     /**
      * @param array<string, mixed> $items
      */

diff --git a/...-doc-parser/src/ValueObjectFactory/PhpDocNode/Symfony/SymfonyRouteTagValueNodeFactory.php b/...-doc-parser/src/ValueObjectFactory/PhpDocNode/Symfony/SymfonyRouteTagValueNodeFactory.php
@@ -4,11 +4,30 @@
 
 namespace Rector\BetterPhpDocParser\ValueObjectFactory\PhpDocNode\Symfony;
 
+use Rector\BetterPhpDocParser\Printer\ArrayPartPhpDocTagPrinter;
+use Rector\BetterPhpDocParser\Printer\TagValueNodePrinter;
 use Rector\BetterPhpDocParser\ValueObject\PhpDocNode\Symfony\SymfonyRouteTagValueNode;
-use Rector\BetterPhpDocParser\ValueObjectFactory\PhpDocNode\AbstractTagValueNodeFactory;
 
-final class SymfonyRouteTagValueNodeFactory extends AbstractTagValueNodeFactory
+final class SymfonyRouteTagValueNodeFactory
 {
+    /**
+     * @var ArrayPartPhpDocTagPrinter
+     */
+    private $arrayPartPhpDocTagPrinter;
+
+    /**
+     * @var TagValueNodePrinter
+     */
+    private $tagValueNodePrinter;
+
+    public function __construct(
+        ArrayPartPhpDocTagPrinter $arrayPartPhpDocTagPrinter,
+        TagValueNodePrinter $tagValueNodePrinter
+    ) {
+        $this->arrayPartPhpDocTagPrinter = $arrayPartPhpDocTagPrinter;
+        $this->tagValueNodePrinter = $tagValueNodePrinter;
+    }
+
     public function create(): SymfonyRouteTagValueNode
     {
         return $this->createFromItems([]);

diff --git a/packages/testing/src/PHPUnit/RunnableRectorFactory.php b/packages/testing/src/PHPUnit/RunnableRectorFactory.php
@@ -59,7 +59,7 @@ private function createTemporaryPathWithPrefix(SmartFileInfo $smartFileInfo): st
         // warning: if this hash is too short, the file can becom "identical"; took me 1 hour to find out
         $hash = Strings::substring(md5($smartFileInfo->getRealPath()), -15);
 
-        return sprintf(sys_get_temp_dir() . '/_rector_runnable_%s_%s', $hash, $smartFileInfo->getBasename('.inc'));
+        return sprintf(sys_get_temp_dir() . '/rector/runnable_%s_%s', $hash, $smartFileInfo->getBasename('.inc'));
     }
 
     private function getTemporaryClassSuffix(): string

diff --git a/phpstan.neon b/phpstan.neon
@@ -597,3 +597,12 @@ parameters:
         - '#Cognitive complexity for "Rector\\NetteCodeQuality\\FormControlTypeResolver\\MagicNetteFactoryInterfaceFormControlTypeResolver\:\:resolve\(\)" is 11, keep it under 9#'
         - '#Cognitive complexity for "Rector\\NetteCodeQuality\\FormControlTypeResolver\\MagicNetteFactoryInterfaceFormControlTypeResolver\:\:resolve\(\)" is 12, keep it under 9#'
         - '#Content of method "matchAssignExprToPropertyName\(\)" is duplicated with method "matchAssignExprToPropertyName\(\)" in "Rector\\TypeDeclaration\\AlreadyAssignDetector\\ConstructorAssignDetector" class\. Use unique content or abstract service instead#'
+        # make more tolerand, e.g. at least 2-3 lines
+        - '#Content of method "isConflicting\(\)" is duplicated with method "isConflicting\(\)" in "Rector\\Naming\\Guard\\PropertyConflictingNameGuard\\AbstractPropertyConflictingNameGuard" class\. Use unique content or abstract service instead#'
+        - '#Content of method "isConflicting\(\)" is duplicated with method "isConflicting\(\)" in "Rector\\Naming\\Guard\\PropertyConflictingNameGuard\\MatchPropertyTypeConflictingNameGuard" class\. Use unique content or abstract service instead#'
+        - '#Content of method "isConflicting\(\)" is duplicated with method "isConflicting\(\)" in "Rector\\Naming\\Guard\\PropertyConflictingNameGuard\\UnderscoreCamelCaseConflictingNameGuard" class\. Use unique content or abstract service instead#'
+        - '#Content of method "isConflicting\(\)" is duplicated with method "isConflicting\(\)" in "Rector\\Naming\\Guard\\PropertyConflictingNameGuard\\UnderscoreCamelCaseConflictingNameGuard" class\. Use unique content or abstract service instead#'
+        - '#Content of method "isConflicting\(\)" is duplicated with method "isConflicting\(\)" in "Rector\\Naming\\Guard\\PropertyConflictingNameGuard\\UnderscoreCamelCaseConflictingNameGuard" class\. Use unique content or abstract service instead#'
+        - '#Content of method "isConflicting\(\)" is duplicated with method "isConflicting\(\)" in "Rector\\Naming\\Guard\\PropertyConflictingNameGuard\\BoolPropertyConflictingNameGuard" class\. Use unique content or abstract service instead#'
+        - '#Content of method "isConflicting\(\)" is duplicated with method "isConflicting\(\)" in "Rector\\Naming\\Guard\\PropertyConflictingNameGuard\\BoolPropertyConflictingNameGuard" class\. Use unique content or abstract service instead#'
+
diff --git a/rules/code-quality/src/Rector/For_/ForToForeachRector.php b/rules/code-quality/src/Rector/For_/ForToForeachRector.php
@@ -48,7 +48,7 @@ final class ForToForeachRector extends AbstractRector
     /**
      * @var Expr|null
      */
-    private $countValueVariable;
+    private $countValueVariableExpr;
 
     /**
      * @var Expr|null
@@ -160,7 +160,7 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        if ($this->forAnalyzer->isCountValueVariableUsedInsideForStatements($node, $this->countValueVariable)) {
+        if ($this->forAnalyzer->isCountValueVariableUsedInsideForStatements($node, $this->countValueVariableExpr)) {
             return null;
         }
 
@@ -228,7 +228,7 @@ private function createForeachFromForWithIteratedVariableSingle(For_ $for, strin
     private function reset(): void
     {
         $this->keyValueName = null;
-        $this->countValueVariable = null;
+        $this->countValueVariableExpr = null;
         $this->countValueName = null;
         $this->iteratedExpr = null;
     }
@@ -254,7 +254,7 @@ private function matchInit(array $initExprs): void
             $funcCall = $initExpr->expr;
 
             if ($this->nodeNameResolver->isFuncCallName($funcCall, self::COUNT)) {
-                $this->countValueVariable = $initExpr->var;
+                $this->countValueVariableExpr = $initExpr->var;
                 $this->countValueName = $this->getName($initExpr->var);
                 $this->iteratedExpr = $funcCall->args[0]->value;
             }

diff --git a/rules/naming/src/Contract/ExpectedNameResolver/ExpectedNameResolverInterface.php b/rules/naming/src/Contract/ExpectedNameResolver/ExpectedNameResolverInterface.php
diff --git a/rules/naming/src/Contract/Guard/ConflictingGuardAwareInterface.php b/rules/naming/src/Contract/Guard/ConflictingGuardAwareInterface.php
diff --git a/...tract/Guard/ConflictingGuardInterface.php → ...t/Guard/ConflictingNameGuardInterface.php b/...tract/Guard/ConflictingGuardInterface.php → ...t/Guard/ConflictingNameGuardInterface.php
@@ -6,7 +6,7 @@
 
 use Rector\Naming\Contract\RenameValueObjectInterface;
 
-interface ConflictingGuardInterface
+interface ConflictingNameGuardInterface
 {
-    public function check(RenameValueObjectInterface $renameValueObject): bool;
+    public function isConflicting(RenameValueObjectInterface $renameValueObject): bool;
 }
diff --git a/rules/naming/src/Contract/RenameGuard/RenameGuardInterface.php b/rules/naming/src/Contract/RenameGuard/RenameGuardInterface.php
diff --git a/rules/naming/src/Contract/RenamerInterface.php b/rules/naming/src/Contract/RenamerInterface.php
diff --git a/rules/naming/src/ExpectedNameResolver/AbstractExpectedNameResolver.php b/rules/naming/src/ExpectedNameResolver/AbstractExpectedNameResolver.php