BUGFIX: Rewrite fusion node.identifier properly to node.aggregateId

neos · Dec 18, 2024 · f753ce3 · f753ce3
1 parent 6466cd8
commit f753ce3
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 3 deletions.
diff --git a/config/set/contentrepository-90.php b/config/set/contentrepository-90.php
@@ -121,6 +121,7 @@
         \Neos\ContentRepository\Domain\NodeType\NodeTypeName::class => \Neos\ContentRepository\Core\NodeType\NodeTypeName::class,
         \Neos\ContentRepository\Domain\Projection\Content\PropertyCollectionInterface::class => \Neos\ContentRepository\Core\Projection\ContentGraph\PropertyCollection::class,
         \Neos\ContentRepository\Domain\Model\ArrayPropertyCollection::class => \Neos\ContentRepository\Core\Projection\ContentGraph\PropertyCollection::class,
+        \Neos\Neos\Routing\FrontendNodeRoutePartHandlerInterface::class => \Neos\Neos\FrontendRouting\FrontendNodeRoutePartHandlerInterface::class,
     ]);
 
     $rectorConfig->ruleWithConfiguration(FusionReplacePrototypeNameRector::class, [

diff --git a/src/ContentRepository90/Rules/YamlRoutePartHandlerRector.php b/src/ContentRepository90/Rules/YamlRoutePartHandlerRector.php
@@ -32,9 +32,14 @@ public function refactorFileContent(string $fileContent): string
                 continue;
             }
 
+            $handlerToReplace = [
+                \Neos\Neos\Routing\FrontendNodeRoutePartHandler::class,
+                \Neos\Neos\Routing\FrontendNodeRoutePartHandlerInterface::class,
+            ];
+
             foreach ($routeConfig['routeParts'] as $routePartKey => $routePart) {
-                if (isset($routePart['handler']) && $routePart['handler'] === 'Neos\Neos\Routing\FrontendNodeRoutePartHandler') {
-                    $parsed[$routeConfigKey]['routeParts'][$routePartKey]['handler'] = 'Neos\Neos\FrontendRouting\FrontendNodeRoutePartHandlerInterface';
+                if (isset($routePart['handler']) && in_array($routePart['handler'], $handlerToReplace)) {
+                    $parsed[$routeConfigKey]['routeParts'][$routePartKey]['handler'] = \Neos\Neos\FrontendRouting\FrontendNodeRoutePartHandlerInterface::class;
                 }
             }
         }

diff --git a/...rRector/Fixture/SingleDimension1.yaml.inc → ...PartHandlerRector/Fixture/Routes.yaml.inc b/...rRector/Fixture/SingleDimension1.yaml.inc → ...PartHandlerRector/Fixture/Routes.yaml.inc
@@ -46,7 +46,7 @@
   uriPattern: '{node}'
   routeParts:
     node:
-      handler: Neos\Neos\Routing\FrontendNodeRoutePartHandlerInterface
+      handler: Neos\Neos\FrontendRouting\FrontendNodeRoutePartHandlerInterface
       options:
         uriPathSuffix: '<defaultUriSuffix>'
   appendExceedingArguments: true
diff --git a/tests/Sets/ContentRepository90/Fixture/frontend-node-route-part-handler.php.inc b/tests/Sets/ContentRepository90/Fixture/frontend-node-route-part-handler.php.inc
@@ -0,0 +1,23 @@
+<?php
+
+namespace Neos\Rector\Test;
+
+use Neos\Neos\Routing\FrontendNodeRoutePartHandlerInterface;
+
+class SomeClass implements FrontendNodeRoutePartHandlerInterface
+{
+
+}
+
+-----
+<?php
+
+namespace Neos\Rector\Test;
+
+use Neos\Neos\Routing\FrontendNodeRoutePartHandlerInterface;
+
+class SomeClass implements \Neos\Neos\FrontendRouting\FrontendNodeRoutePartHandlerInterface
+{
+
+}
+