Bump to Rector 0.9.20

composer.json

@@ -12,15 +12,15 @@
     "require": {
         "php": "^7.3|^8.0",
         "phpstan/phpstan": "^0.12.69, <0.12.70",
-        "rector/rector": "0.9.18"
+        "rector/rector": "0.9.20"
     },
     "require-dev": {
         "captainhook/captainhook": "^5.4",
         "captainhook/plugin-composer": "^5.2",
-        "phpunit/phpunit": "^8.0|^9.0",
-        "symplify/coding-standard": "^9.0.17",
-        "symplify/easy-coding-standard": "^9.0.17",
-        "symplify/phpstan-extensions": "^9.0.17"
+        "phpunit/phpunit": "^9.0",
+        "symplify/coding-standard": "^9.1",
+        "symplify/easy-coding-standard": "^9.1",
+        "symplify/phpstan-extensions": "^9.1"
     },
     "autoload": {
         "psr-4": {
@@ -56,7 +56,5 @@
         "docs": "vendor/bin/rule-doc-generator generate src/Rector --output-file docs/all_rectors_overview.md --ansi",
         "rector": "vendor/bin/rector rectify --dry-run --ansi --match-git-diff",
         "fix-rector": "vendor/bin/rector rectify --ansi"
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true
+    }
 }

src/Helper/Database/Refactorings/ConnectionCallTrait.php → src/Helper/Database/Refactorings/ConnectionCallFactory.php

@@ -11,22 +11,19 @@
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 
-trait ConnectionCallTrait
+final class ConnectionCallFactory
 {
     /**
      * @var NodeFactory
      */
-    protected $nodeFactory;
+    private $nodeFactory;
 
-    /**
-     * @required
-     */
-    public function autowireNodeFactoryTrait(NodeFactory $nodeFactory): void
+    public function __construct(NodeFactory $nodeFactory)
     {
         $this->nodeFactory = $nodeFactory;
     }
 
-    private function createConnectionCall(Arg $firstArgument): Assign
+    public function createConnectionCall(Arg $firstArgument): Assign
     {
         $connection = $this->nodeFactory->createMethodCall(
             $this->nodeFactory->createStaticCall(GeneralUtility::class, 'makeInstance', [

src/Helper/Database/Refactorings/DatabaseConnectionExecInsertQueryRefactoring.php

@@ -6,10 +6,25 @@
 
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\Variable;
+use Rector\Core\PhpParser\Node\NodeFactory;
 
 final class DatabaseConnectionExecInsertQueryRefactoring implements DatabaseConnectionToDbalRefactoring
 {
-    use ConnectionCallTrait;
+    /**
+     * @var ConnectionCallFactory
+     */
+    private $connectionCallFactory;
+
+    /**
+     * @var NodeFactory
+     */
+    private $nodeFactory;
+
+    public function __construct(ConnectionCallFactory $connectionCallFactory, NodeFactory $nodeFactory)
+    {
+        $this->connectionCallFactory = $connectionCallFactory;
+        $this->nodeFactory = $nodeFactory;
+    }
 
     public function refactor(MethodCall $oldNode): array
     {
@@ -20,7 +35,7 @@ public function refactor(MethodCall $oldNode): array
             return [];
         }
 
-        $connectionAssignment = $this->createConnectionCall($tableArgument);
+        $connectionAssignment = $this->connectionCallFactory->createConnectionCall($tableArgument);
 
         $connectionInsertCall = $this->nodeFactory->createMethodCall(
             new Variable('connection'), 'insert', [$tableArgument->value, $dataArgument->value]

src/Helper/Database/Refactorings/DatabaseConnectionExecTruncateTableRefactoring.php

@@ -6,10 +6,25 @@
 
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\Variable;
+use Rector\Core\PhpParser\Node\NodeFactory;
 
 final class DatabaseConnectionExecTruncateTableRefactoring implements DatabaseConnectionToDbalRefactoring
 {
-    use ConnectionCallTrait;
+    /**
+     * @var ConnectionCallFactory
+     */
+    private $connectionCallFactory;
+
+    /**
+     * @var NodeFactory
+     */
+    private $nodeFactory;
+
+    public function __construct(ConnectionCallFactory $connectionCallFactory, NodeFactory $nodeFactory)
+    {
+        $this->connectionCallFactory = $connectionCallFactory;
+        $this->nodeFactory = $nodeFactory;
+    }
 
     public function refactor(MethodCall $oldNode): array
     {
@@ -19,7 +34,7 @@ public function refactor(MethodCall $oldNode): array
             return [];
         }
 
-        $connectionAssignment = $this->createConnectionCall($tableArgument);
+        $connectionAssignment = $this->connectionCallFactory->createConnectionCall($tableArgument);
 
         $connectionInsertCall = $this->nodeFactory->createMethodCall(
             new Variable('connection'), 'truncate', [$tableArgument->value]

src/Helper/Typo3NodeResolver.php

@@ -11,14 +11,12 @@
 use PhpParser\Node\Expr\PropertyFetch;
 use PHPStan\Type\ObjectType;
 use Rector\Core\PhpParser\Node\Value\ValueResolver;
-use Rector\Core\Rector\AbstractRector\NameResolverTrait;
-use Rector\Core\Rector\AbstractRector\NodeTypeResolverTrait;
+use Rector\NodeNameResolver\NodeNameResolver;
+use Rector\NodeTypeResolver\Node\AttributeKey;
+use Rector\NodeTypeResolver\NodeTypeResolver;
 
 final class Typo3NodeResolver
 {
-    use NameResolverTrait;
-    use NodeTypeResolverTrait;
-
     /**
      * @var string
      */
@@ -85,11 +83,23 @@ final class Typo3NodeResolver
     private $valueResolver;
 
     /**
-     * @required
+     * @var NodeNameResolver
      */
-    public function autowireValueResolverTrait(ValueResolver $valueResolver): void
-    {
+    private $nodeNameResolver;
+
+    /**
+     * @var NodeTypeResolver
+     */
+    private $nodeTypeResolver;
+
+    public function __construct(
+        ValueResolver $valueResolver,
+        NodeNameResolver $nodeNameResolver,
+        NodeTypeResolver $nodeTypeResolver
+    ) {
         $this->valueResolver = $valueResolver;
+        $this->nodeNameResolver = $nodeNameResolver;
+        $this->nodeTypeResolver = $nodeTypeResolver;
     }
 
     public function isMethodCallOnGlobals(Node $node, string $methodCall, string $global): bool
@@ -102,11 +112,11 @@ public function isMethodCallOnGlobals(Node $node, string $methodCall, string $gl
             return false;
         }
 
-        if (! $this->isName($node->name, $methodCall)) {
+        if (! $this->nodeNameResolver->isName($node->name, $methodCall)) {
             return false;
         }
 
-        if (! $this->isName($node->var->var, self::GLOBALS)) {
+        if (! $this->nodeNameResolver->isName($node->var->var, self::GLOBALS)) {
             return false;
         }
 
@@ -127,7 +137,7 @@ public function isAnyMethodCallOnGlobals(Node $node, string $global): bool
             return false;
         }
 
-        if (! $this->isName($node->var->var, self::GLOBALS)) {
+        if (! $this->nodeNameResolver->isName($node->var->var, self::GLOBALS)) {
             return false;
         }
 
@@ -144,7 +154,7 @@ public function isTypo3Global(Node $node, string $global): bool
             return false;
         }
 
-        if (! $this->isName($node->var, self::GLOBALS)) {
+        if (! $this->nodeNameResolver->isName($node->var, self::GLOBALS)) {
             return false;
         }
 
@@ -186,7 +196,7 @@ public function isPropertyFetchOnAnyPropertyOfGlobals(Node $node, string $global
             return false;
         }
 
-        if (! $this->isName($node->var->var, self::GLOBALS)) {
+        if (! $this->nodeNameResolver->isName($node->var->var, self::GLOBALS)) {
             return false;
         }
 
@@ -216,11 +226,11 @@ public function isMethodCallOnPropertyOfGlobals(Node $node, string $global, stri
             return false;
         }
 
-        if (! $this->isName($node->var->var->var, self::GLOBALS)) {
+        if (! $this->nodeNameResolver->isName($node->var->var->var, self::GLOBALS)) {
             return false;
         }
 
-        if (! $this->isName($node->var->name, $property)) {
+        if (! $this->nodeNameResolver->isName($node->var->name, $property)) {
             return false;
         }
 
@@ -238,7 +248,7 @@ public function isMethodCallOnBackendUser(Node $node): bool
 
     private function isPropertyFetchOnParentVariableOfType(Node $node, string $type): bool
     {
-        $parentNode = $node->getAttribute('parent');
+        $parentNode = $node->getAttribute(AttributeKey::PARENT_NODE);
 
         if (! $parentNode instanceof Assign) {
             return false;
@@ -248,7 +258,7 @@ private function isPropertyFetchOnParentVariableOfType(Node $node, string $type)
             return false;
         }
 
-        $objectType = $this->getObjectType($parentNode->expr->var);
+        $objectType = $this->nodeTypeResolver->getStaticType($parentNode->expr->var);
 
         if (! $objectType instanceof ObjectType) {
             return false;

src/NodeAnalyzer/ClassConstAnalyzer.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Ssch\TYPO3Rector\NodeAnalyzer;
+
+use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\ClassConstFetch;
+use Rector\NodeNameResolver\NodeNameResolver;
+
+final class ClassConstAnalyzer
+{
+    /**
+     * @var NodeNameResolver
+     */
+    private $nodeNameResolver;
+
+    public function __construct(NodeNameResolver $nodeNameResolver)
+    {
+        $this->nodeNameResolver = $nodeNameResolver;
+    }
+
+    /**
+     * Detects "SomeClass::class"
+     */
+    public function isClassConstReference(Expr $expr, string $className): bool
+    {
+        if (! $expr instanceof ClassConstFetch) {
+            return false;
+        }
+
+        if (! $this->nodeNameResolver->isName($expr->name, 'class')) {
+            return false;
+        }
+
+        return $this->nodeNameResolver->isName($expr->class, $className);
+    }
+}

src/NodeFactory/InitializeArgumentsClassMethodFactory.php

@@ -4,7 +4,6 @@
 
 namespace Ssch\TYPO3Rector\NodeFactory;
 
-use PhpParser\BuilderFactory;
 use PhpParser\Node;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\ConstFetch;
@@ -27,19 +26,17 @@
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\Core\PhpParser\Node\NodeFactory;
-use Rector\Core\Rector\AbstractRector\NameResolverTrait;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\PHPStanStaticTypeMapper\PHPStanStaticTypeMapper;
 use Rector\StaticTypeMapper\StaticTypeMapper;
 use Rector\StaticTypeMapper\ValueObject\Type\ShortenedObjectType;
 use Rector\TypeDeclaration\TypeInferer\ParamTypeInferer;
 use ReflectionClass;
+use Symplify\Astral\ValueObject\NodeBuilder\MethodBuilder;
 
 final class InitializeArgumentsClassMethodFactory
 {
-    use NameResolverTrait;
-
     /**
      * @var string
      */
@@ -50,11 +47,6 @@ final class InitializeArgumentsClassMethodFactory
      */
     private const MIXED = 'mixed';
 
-    /**
-     * @var BuilderFactory
-     */
-    private $builderFactory;
-
     /**
      * @var NodeFactory
      */
@@ -75,15 +67,18 @@ final class InitializeArgumentsClassMethodFactory
      */
     private $phpDocInfoFactory;
 
+    /**
+     * @var NodeNameResolver
+     */
+    private $nodeNameResolver;
+
     public function __construct(
-        BuilderFactory $builderFactory,
         NodeFactory $nodeFactory,
         NodeNameResolver $nodeNameResolver,
         StaticTypeMapper $staticTypeMapper,
         ParamTypeInferer $paramTypeInferer,
         PhpDocInfoFactory $phpDocInfoFactory
     ) {
-        $this->builderFactory = $builderFactory;
         $this->nodeFactory = $nodeFactory;
         $this->nodeNameResolver = $nodeNameResolver;
         $this->staticTypeMapper = $staticTypeMapper;
@@ -132,7 +127,7 @@ private function findOrCreateInitializeArgumentsClassMethod(Class_ $class): Clas
 
     private function createNewClassMethod(): ClassMethod
     {
-        $methodBuilder = $this->builderFactory->method(self::METHOD_NAME);
+        $methodBuilder = new MethodBuilder(self::METHOD_NAME);
         $methodBuilder->makePublic();
         $methodBuilder->setReturnType('void');
 
@@ -274,6 +269,6 @@ private function resolveParamType(Node $paramType): string
             return $paramType->toCodeString();
         }
 
-        return $this->getName($paramType) ?? self::MIXED;
+        return $this->nodeNameResolver->getName($paramType) ?? self::MIXED;
     }
 }

src/PostRector/NameImportingPostRector.php

@@ -7,21 +7,21 @@
 use Nette\Utils\Strings;
 use PhpParser\Node;
 use PhpParser\Node\Name;
+use PhpParser\NodeVisitorAbstract;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\CodingStyle\ClassNameImport\ClassNameImportSkipper;
 use Rector\CodingStyle\Node\NameImporter;
 use Rector\Core\Configuration\Option;
 use Rector\NodeTypeResolver\FileSystem\CurrentFileInfoProvider;
 use Rector\NodeTypeResolver\PhpDoc\NodeAnalyzer\DocBlockNameImporter;
 use Rector\PostRector\Contract\Rector\PostRectorInterface;
-use Rector\PostRector\Rector\AbstractPostRector;
 use Ssch\TYPO3Rector\Configuration\Typo3Option;
 use Symplify\PackageBuilder\Parameter\ParameterProvider;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 use Symplify\SmartFileSystem\SmartFileInfo;
 
-final class NameImportingPostRector extends AbstractPostRector
+final class NameImportingPostRector extends NodeVisitorAbstract implements PostRectorInterface
 {
     /**
      * @var string

src/Rector/Extensions/solr/ApacheSolrDocumentToSolariumDocumentRector.php

@@ -30,7 +30,7 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        if (! $this->isMethodStaticCallOrClassMethodObjectType($node, Apache_Solr_Document::class)) {
+        if (! $this->nodeTypeResolver->isMethodStaticCallOrClassMethodObjectType($node, Apache_Solr_Document::class)) {
             return null;
         }