TASK: Remove node:// protocol handling from NodeAddressNormalizer

That was also not in 8.3 supported in the linking service or Neos.Neos:NodeUri
mhsdesign · Oct 11, 2024 · 22993c5 · 22993c5
1 parent 38f6834
commit 22993c5
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 23 deletions.
diff --git a/Neos.Neos/Classes/Utility/LegacyNodePathNormalizer.php b/Neos.Neos/Classes/Utility/LegacyNodePathNormalizer.php
@@ -31,7 +31,6 @@ final class LegacyNodePathNormalizer
      *
      * The following syntax is not implemented and handled here:
      *
-     *  - node://my-node-identifier
      *  - /<Neos.Neos:Sites>/my-site/main
      *  - some/relative/path
      *

diff --git a/Neos.Neos/Classes/Utility/NodeAddressNormalizer.php b/Neos.Neos/Classes/Utility/NodeAddressNormalizer.php
@@ -8,7 +8,6 @@
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 use Neos\ContentRepository\Core\Projection\ContentGraph\NodePath;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAddress;
-use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Flow\Annotations as Flow;
 
@@ -22,10 +21,11 @@ final class NodeAddressNormalizer
      *
      * Following string syntax is allowed, as well as passing a NodePath or AbsoluteNodePath value object:
      *
-     *  - node://my-node-identifier
      *  - /<Neos.Neos:Sites>/my-site/main
      *  - some/relative/path
      *
+     * The node protocol node://my-node-identifier is not handled here.
+     *
      * The following legacy syntax is not implemented and handled here:
      *
      *  - /sites/site/absolute/path
@@ -42,12 +42,6 @@ public function resolveNodeAddressFromPath(AbsoluteNodePath|NodePath|string $pat
             throw new \RuntimeException('Empty strings can not be resolved to nodes.', 1719999872);
         }
 
-        if (is_string($path) && str_starts_with($path, 'node://')) {
-            return NodeAddress::fromNode($baseNode)->withAggregateId(
-                NodeAggregateId::fromString(substr($path, strlen('node://')))
-            );
-        }
-
         $subgraph = $this->contentRepositoryRegistry->subgraphForNode($baseNode);
 
         if (is_string($path) && AbsoluteNodePath::patternIsMatchedByString($path)) {

diff --git a/Neos.Neos/Classes/ViewHelpers/Link/NodeViewHelper.php b/Neos.Neos/Classes/ViewHelpers/Link/NodeViewHelper.php
@@ -16,6 +16,7 @@
 
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAddress;
+use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Log\ThrowableStorageInterface;
@@ -256,11 +257,17 @@ public function render(): string
                 ), 1719953186);
             }
 
-            $possibleAbsoluteNodePath = $this->legacyNodePathNormalizer->tryResolveLegacyPathSyntaxToAbsoluteNodePath($node, $baseNode);
-            $nodeAddress = $this->nodeAddressNormalizer->resolveNodeAddressFromPath(
-                $possibleAbsoluteNodePath ?? $node,
-                $baseNode
-            );
+            if (str_starts_with($node, 'node://')) {
+                $nodeAddress = NodeAddress::fromNode($baseNode)->withAggregateId(
+                    NodeAggregateId::fromString(substr($node, strlen('node://')))
+                );
+            } else {
+                $possibleAbsoluteNodePath = $this->legacyNodePathNormalizer->tryResolveLegacyPathSyntaxToAbsoluteNodePath($node, $baseNode);
+                $nodeAddress = $this->nodeAddressNormalizer->resolveNodeAddressFromPath(
+                    $possibleAbsoluteNodePath ?? $node,
+                    $baseNode
+                );
+            }
 
             $subgraph = $this->contentRepositoryRegistry->subgraphForNode($baseNode);
             $resolvedNode = $subgraph->findNodeById($nodeAddress->aggregateId);

diff --git a/Neos.Neos/Classes/ViewHelpers/Uri/NodeViewHelper.php b/Neos.Neos/Classes/ViewHelpers/Uri/NodeViewHelper.php
@@ -16,6 +16,7 @@
 
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAddress;
+use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Log\ThrowableStorageInterface;
@@ -200,11 +201,17 @@ public function render(): string
                 ), 1719953186);
             }
 
-            $possibleAbsoluteNodePath = $this->legacyNodePathNormalizer->tryResolveLegacyPathSyntaxToAbsoluteNodePath($node, $baseNode);
-            $nodeAddress = $this->nodeAddressNormalizer->resolveNodeAddressFromPath(
-                $possibleAbsoluteNodePath ?? $node,
-                $baseNode
-            );
+            if (str_starts_with($node, 'node://')) {
+                $nodeAddress = NodeAddress::fromNode($baseNode)->withAggregateId(
+                    NodeAggregateId::fromString(substr($node, strlen('node://')))
+                );
+            } else {
+                $possibleAbsoluteNodePath = $this->legacyNodePathNormalizer->tryResolveLegacyPathSyntaxToAbsoluteNodePath($node, $baseNode);
+                $nodeAddress = $this->nodeAddressNormalizer->resolveNodeAddressFromPath(
+                    $possibleAbsoluteNodePath ?? $node,
+                    $baseNode
+                );
+            }
         } elseif ($node instanceof Node) {
             $nodeAddress = NodeAddress::fromNode($node);
         } else {

diff --git a/Neos.Neos/Tests/Behavior/Features/Fusion/NodeUri.feature b/Neos.Neos/Tests/Behavior/Features/Fusion/NodeUri.feature
@@ -114,16 +114,12 @@ Feature: Tests for the "Neos.Neos:NodeUri" Fusion prototype
       relativePath = Neos.Neos:NodeUri {
         node = 'a1'
       }
-      nodeIdentifier = Neos.Neos:NodeUri {
-        node = 'node://a1'
-      }
     }
     """
     Then I expect the following Fusion rendering result:
     """
     sitesRootPath: /a1
     relativePath: /a1
-    nodeIdentifier: /a1
     """
 
   Scenario: Node as legacy string node path syntax