WIP Upgrade package to rector/rector 1.0

composer.json

@@ -15,8 +15,7 @@
         "tests": "phpunit tests"
     },
     "require": {
-        "rector/rector": "0.15.24",
-        "phpstan/phpstan": "1.10.13",
+        "rector/rector": "^1.0",
         "symfony/yaml": "*",
         "neos/utility-arrays": "*",
         "webmozart/assert": "^1.11"

src/ContentRepository90/Rules/ContentDimensionCombinatorGetAllAllowedCombinationsRector.php

@@ -9,16 +9,16 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr;
 use PHPStan\Type\ObjectType;
-use Rector\Core\Rector\AbstractRector;
-use Rector\PostRector\Collector\NodesToAddCollector;
+use Rector\Rector\AbstractRector;
+
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 final class ContentDimensionCombinatorGetAllAllowedCombinationsRector extends AbstractRector
 {
     use AllTraits;
 
     public function __construct(
-        private readonly NodesToAddCollector $nodesToAddCollector
+
     )
     {
     }
@@ -49,14 +49,14 @@ public function refactor(Node $node) : ?Node
             return null;
         }
 
-        $this->nodesToAddCollector->addNodesBeforeNode(
-            [
-                self::assign('contentRepository', $this->this_contentRepositoryRegistry_get($this->contentRepositoryId_fromString('default'))),
-                self::assign('dimensionSpacePoints', $this->contentRepository_getVariationGraph_getDimensionSpacePoints()),
-                self::todoComment('try to directly work with $dimensionSpacePoints, instead of converting them to the legacy dimension format')
-            ],
-            $node
-        );
+//        $this->nodesToAddCollector->addNodesBeforeNode(
+//            [
+//                self::assign('contentRepository', $this->this_contentRepositoryRegistry_get($this->contentRepositoryId_fromString('default'))),
+//                self::assign('dimensionSpacePoints', $this->contentRepository_getVariationGraph_getDimensionSpacePoints()),
+//                self::todoComment('try to directly work with $dimensionSpacePoints, instead of converting them to the legacy dimension format')
+//            ],
+//            $node
+//        );
 
         return $this->dimensionSpacePoints_toLegacyDimensionArray();
     }

src/ContentRepository90/Rules/ContextFactoryToLegacyContextStubRector.php

@@ -7,16 +7,14 @@
 use Neos\Rector\Utility\CodeSampleLoader;
 use PhpParser\Node;
 use PHPStan\Type\ObjectType;
-use Rector\Core\Rector\AbstractRector;
-use Rector\PostRector\Collector\NodesToAddCollector;
+use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 final class ContextFactoryToLegacyContextStubRector extends AbstractRector
 {
     use AllTraits;
 
     public function __construct(
-        private readonly NodesToAddCollector $nodesToAddCollector
     )
     {
     }

src/ContentRepository90/Rules/ContextGetCurrentRenderingModeRector.php

@@ -7,9 +7,8 @@
 use Neos\Rector\Utility\CodeSampleLoader;
 use PhpParser\Node;
 use PHPStan\Type\ObjectType;
-use Rector\Core\Rector\AbstractRector;
+use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
-use Rector\PostRector\Collector\NodesToAddCollector;
 use PhpParser\Node\Expr\Assign;
 
 final class ContextGetCurrentRenderingModeRector extends AbstractRector
@@ -18,7 +17,6 @@ final class ContextGetCurrentRenderingModeRector extends AbstractRector
     use ContextRectorTrait;
 
     public function __construct(
-        private readonly NodesToAddCollector $nodesToAddCollector
     ) {
     }
 

src/ContentRepository90/Rules/ContextGetFirstLevelNodeCacheRector.php

@@ -4,22 +4,19 @@
 
 namespace Neos\Rector\ContentRepository90\Rules;
 
-use Neos\Rector\ContentRepository90\Legacy\LegacyContextStub;
 use Neos\Rector\Utility\CodeSampleLoader;
 use PhpParser\Node;
 use PhpParser\NodeFinder;
 use PhpParser\NodeTraverser;
 use PHPStan\Type\ObjectType;
-use Rector\Core\Rector\AbstractRector;
-use Rector\PostRector\Collector\NodesToAddCollector;
+use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 final class ContextGetFirstLevelNodeCacheRector extends AbstractRector
 {
     use AllTraits;
 
     public function __construct(
-        private readonly NodesToAddCollector $nodesToAddCollector
     ) {
     }
 
@@ -38,14 +35,14 @@ public function getNodeTypes(): array
     }
 
     /**
-     * @param \PhpParser\Node\Expr\MethodCall $node
+     * @param \PhpParser\Node\Stmt\Expression $node
      */
-    public function refactor(Node $node): ?Node
+    public function refactor(Node $node)
     {
         assert($node instanceof Node\Stmt\Expression);
 
         if ($this->containsContextGetFirstLevelNodeCache($node->expr)) {
-            $this->removeNode($node);
+            return NodeTraverser::REMOVE_NODE;
         }
         return $node;
     }

src/ContentRepository90/Rules/ContextGetRootNodeRector.php

@@ -9,16 +9,16 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr;
 use PHPStan\Type\ObjectType;
-use Rector\Core\Rector\AbstractRector;
-use Rector\PostRector\Collector\NodesToAddCollector;
+use Rector\Rector\AbstractRector;
+
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 final class ContextGetRootNodeRector extends AbstractRector
 {
     use AllTraits;
 
     public function __construct(
-        private readonly NodesToAddCollector $nodesToAddCollector
+
     )
     {
     }
@@ -49,19 +49,19 @@ public function refactor(Node $node) : ?Node
             return null;
         }
 
-        $this->nodesToAddCollector->addNodesBeforeNode(
-            [
-                self::withTodoComment(
-                    '!! MEGA DIRTY CODE! Ensure to rewrite this; by getting rid of LegacyContextStub.',
-                    self::assign('contentRepository', $this->this_contentRepositoryRegistry_get($this->contentRepositoryId_fromString('default')))
-                ),
-                self::assign('workspace', $this->contentRepository_getWorkspaceFinder_findOneByName($this->workspaceName_fromString($this->context_workspaceName_fallbackToLive($node->var)))),
-                self::assign('rootNodeAggregate', $this->contentRepository_getContentGraph_findRootNodeAggregateByType($this->workspace_currentContentStreamId(), $this->nodeTypeName_fromString('Neos.Neos:Sites'))),
-                self::assign('subgraph', $this->contentRepository_getContentGraph_getSubgraph($this->workspace_currentContentStreamId(), $this->dimensionSpacePoint_fromLegacyDimensionArray($this->context_dimensions_fallbackToEmpty($node->var)), $this->visibilityConstraints($node->var))),
-
-            ],
-            $node
-        );
+//        $this->nodesToAddCollector->addNodesBeforeNode(
+//            [
+//                self::withTodoComment(
+//                    '!! MEGA DIRTY CODE! Ensure to rewrite this; by getting rid of LegacyContextStub.',
+//                    self::assign('contentRepository', $this->this_contentRepositoryRegistry_get($this->contentRepositoryId_fromString('default')))
+//                ),
+//                self::assign('workspace', $this->contentRepository_getWorkspaceFinder_findOneByName($this->workspaceName_fromString($this->context_workspaceName_fallbackToLive($node->var)))),
+//                self::assign('rootNodeAggregate', $this->contentRepository_getContentGraph_findRootNodeAggregateByType($this->workspace_currentContentStreamId(), $this->nodeTypeName_fromString('Neos.Neos:Sites'))),
+//                self::assign('subgraph', $this->contentRepository_getContentGraph_getSubgraph($this->workspace_currentContentStreamId(), $this->dimensionSpacePoint_fromLegacyDimensionArray($this->context_dimensions_fallbackToEmpty($node->var)), $this->visibilityConstraints($node->var))),
+//
+//            ],
+//            $node
+//        );
 
         return $this->subgraph_findNodeById(
             $this->nodeFactory->createPropertyFetch('rootNodeAggregate', 'nodeAggregateId')

src/ContentRepository90/Rules/ContextIsInBackendRector.php

@@ -7,9 +7,8 @@
 use Neos\Rector\Utility\CodeSampleLoader;
 use PhpParser\Node;
 use PHPStan\Type\ObjectType;
-use Rector\Core\Rector\AbstractRector;
+use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
-use Rector\PostRector\Collector\NodesToAddCollector;
 use PhpParser\Node\Expr\Assign;
 use PhpParser\NodeDumper;
 
@@ -19,7 +18,6 @@ final class ContextIsInBackendRector extends AbstractRector
     use ContextRectorTrait;
 
     public function __construct(
-        private readonly NodesToAddCollector $nodesToAddCollector
     ) {
     }
 
@@ -38,7 +36,7 @@ public function getNodeTypes(): array
     }
 
     /**
-     * @param \PhpParser\Node\Stmt\Expression $node
+     * @param \PhpParser\Node\Expr\MethodCall $node
      */
     public function refactor(Node $node): ?Node
     {

src/ContentRepository90/Rules/ContextIsLiveRector.php

@@ -7,9 +7,8 @@
 use Neos\Rector\Utility\CodeSampleLoader;
 use PhpParser\Node;
 use PHPStan\Type\ObjectType;
-use Rector\Core\Rector\AbstractRector;
+use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
-use Rector\PostRector\Collector\NodesToAddCollector;
 use PhpParser\Node\Expr\Assign;
 use PhpParser\NodeDumper;
 
@@ -19,7 +18,6 @@ final class ContextIsLiveRector extends AbstractRector
     use ContextRectorTrait;
 
     public function __construct(
-        private readonly NodesToAddCollector $nodesToAddCollector
     ) {
     }
 
@@ -38,7 +36,7 @@ public function getNodeTypes(): array
     }
 
     /**
-     * @param \PhpParser\Node\Stmt\Expression $node
+     * @param \PhpParser\Node\Expr\MethodCall $node
      */
     public function refactor(Node $node): ?Node
     {

src/ContentRepository90/Rules/ContextRectorTrait.php

@@ -4,15 +4,8 @@
 
 namespace Neos\Rector\ContentRepository90\Rules;
 
-use Neos\Rector\Utility\CodeSampleLoader;
 use PhpParser\Node;
-use PhpParser\NodeFinder;
 use PHPStan\Type\ObjectType;
-use Rector\Core\Rector\AbstractRector;
-use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
-use Rector\PostRector\Collector\NodesToAddCollector;
-use PhpParser\Node\Expr\Assign;
-use PhpParser\NodeDumper;
 
 trait ContextRectorTrait
 {

src/ContentRepository90/Rules/NodeFactoryResetRector.php

@@ -5,8 +5,9 @@
 
 use Neos\Rector\Utility\CodeSampleLoader;
 use PhpParser\Node;
+use PhpParser\NodeTraverser;
 use PHPStan\Type\ObjectType;
-use Rector\Core\Rector\AbstractRector;
+use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 final class NodeFactoryResetRector extends AbstractRector
@@ -33,7 +34,7 @@ public function getNodeTypes() : array
     /**
      * @param \PhpParser\Node\Expr\MethodCall $node
      */
-    public function refactor(Node $node) : ?Node
+    public function refactor(Node $node)
     {
         assert($node instanceof Node\Expr\MethodCall);
 
@@ -44,6 +45,7 @@ public function refactor(Node $node) : ?Node
             return null;
         }
 
+        // return NodeTraverser::REMOVE_NODE;
         $this->removeNode($node);
 
         return $node;

src/ContentRepository90/Rules/NodeFindParentNodeRector.php

@@ -7,16 +7,16 @@
 use Neos\Rector\Utility\CodeSampleLoader;
 use PhpParser\Node;
 use PHPStan\Type\ObjectType;
-use Rector\Core\Rector\AbstractRector;
-use Rector\PostRector\Collector\NodesToAddCollector;
+use Rector\Rector\AbstractRector;
+
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 final class NodeFindParentNodeRector extends AbstractRector
 {
     use AllTraits;
 
     public function __construct(
-        private readonly NodesToAddCollector $nodesToAddCollector
+
     )
     {
     }
@@ -48,12 +48,12 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        $this->nodesToAddCollector->addNodesBeforeNode(
-            [
-                self::assign('subgraph', $this->this_contentRepositoryRegistry_subgraphForNode($node->var)),
-            ],
-            $node
-        );
+//        $this->nodesToAddCollector->addNodesBeforeNode(
+//            [
+//                self::assign('subgraph', $this->this_contentRepositoryRegistry_subgraphForNode($node->var)),
+//            ],
+//            $node
+//        );
 
         return $this->subgraph_findParentNode($node->var);
     }

src/ContentRepository90/Rules/NodeGetChildNodesRector.php

@@ -6,16 +6,16 @@
 use Neos\Rector\Utility\CodeSampleLoader;
 use PhpParser\Node;
 use PHPStan\Type\ObjectType;
-use Rector\Core\Rector\AbstractRector;
-use Rector\PostRector\Collector\NodesToAddCollector;
+use Rector\Rector\AbstractRector;
+
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
 final class NodeGetChildNodesRector extends AbstractRector
 {
     use AllTraits;
 
     public function __construct(
-        private readonly NodesToAddCollector $nodesToAddCollector
+
     )
     {
     }
@@ -70,13 +70,13 @@ public function refactor(Node $node) : ?Node
             }
         }
 
-        $this->nodesToAddCollector->addNodesBeforeNode(
-            [
-                self::assign('subgraph', $this->this_contentRepositoryRegistry_subgraphForNode($node->var)),
-                self::todoComment('Try to remove the iterator_to_array($nodes) call.')
-            ],
-            $node
-        );
+//        $this->nodesToAddCollector->addNodesBeforeNode(
+//            [
+//                self::assign('subgraph', $this->this_contentRepositoryRegistry_subgraphForNode($node->var)),
+//                self::todoComment('Try to remove the iterator_to_array($nodes) call.')
+//            ],
+//            $node
+//        );
 
         return $this->iteratorToArray(
             $this->subgraph_findChildNodes($node->var, $nodeTypeFilterExpr, $limitExpr, $offsetExpr)