TASK: Rename NodeAddressNormalizer to NodePathResolver

mhsdesign · Oct 14, 2024 · 418bc0e · 418bc0e
1 parent 774d489
commit 418bc0e
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 18 deletions.
diff --git a/Neos.Neos/Classes/Fusion/NodeUriImplementation.php b/Neos.Neos/Classes/Fusion/NodeUriImplementation.php
@@ -26,7 +26,7 @@
 use Neos\Neos\FrontendRouting\NodeUriBuilderFactory;
 use Neos\Neos\FrontendRouting\Options;
 use Neos\Neos\Utility\LegacyNodePathNormalizer;
-use Neos\Neos\Utility\NodeAddressNormalizer;
+use Neos\Neos\Utility\NodePathResolver;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -72,7 +72,7 @@ class NodeUriImplementation extends AbstractFusionObject
 
     /**
      * @Flow\Inject
-     * @var NodeAddressNormalizer
+     * @var NodePathResolver
      */
     protected $nodeAddressNormalizer;
 
@@ -152,7 +152,7 @@ public function evaluate()
             }
 
             $possibleAbsoluteNodePath = $this->legacyNodePathNormalizer->tryResolveLegacyPathSyntaxToAbsoluteNodePath($node, $baseNode);
-            $nodeAddress = $this->nodeAddressNormalizer->resolveNodeAddressFromPath(
+            $nodeAddress = $this->nodeAddressNormalizer->resolveNodeAddressByPath(
                 $possibleAbsoluteNodePath ?? $node,
                 $baseNode
             );

diff --git a/Neos.Neos/Classes/Service/LinkingService.php b/Neos.Neos/Classes/Service/LinkingService.php
@@ -32,7 +32,7 @@
 use Neos\Neos\FrontendRouting\NodeUriBuilder;
 use Neos\Neos\Fusion\Helper\LinkHelper;
 use Neos\Neos\Utility\LegacyNodePathNormalizer;
-use Neos\Neos\Utility\NodeAddressNormalizer;
+use Neos\Neos\Utility\NodePathResolver;
 use Neos\Utility\Arrays;
 use Psr\Http\Message\UriInterface;
 use Psr\Log\LoggerInterface;
@@ -60,7 +60,7 @@
  * ``~/about/us`` results in ``/sites/acmecom/about/us``,
  * ``~`` results in ``/sites/acmecom``.
  *
- * @deprecated with Neos 9. Please use the new {@see NodeUriBuilder} instead and for resolving a relative node path {@see NodeAddressNormalizer::resolveNodeAddressFromPath()} or utilize the {@see LinkHelper} from Fusion
+ * @deprecated with Neos 9. Please use the new {@see NodeUriBuilder} instead and for resolving a relative node path {@see NodePathResolver::resolveNodeAddressByPath()} or utilize the {@see LinkHelper} from Fusion
  * @Flow\Scope("singleton")
  */
 class LinkingService
@@ -87,9 +87,9 @@ class LinkingService
 
     /**
      * @Flow\Inject
-     * @var NodeAddressNormalizer
+     * @var NodePathResolver
      */
-    protected $nodeAddressNormalizer;
+    protected $nodePathResolver;
 
     /**
      * @Flow\Inject
@@ -250,7 +250,7 @@ public function createNodeUri(
             }
 
             $possibleAbsoluteNodePath = $this->legacyNodePathNormalizer->tryResolveLegacyPathSyntaxToAbsoluteNodePath($node, $baseNode);
-            $nodeAddress = $this->nodeAddressNormalizer->resolveNodeAddressFromPath(
+            $nodeAddress = $this->nodePathResolver->resolveNodeAddressByPath(
                 $possibleAbsoluteNodePath ?? $node,
                 $baseNode
             );

diff --git a/...Classes/Utility/NodeAddressNormalizer.php → ...Neos/Classes/Utility/NodePathResolver.php b/...Classes/Utility/NodeAddressNormalizer.php → ...Neos/Classes/Utility/NodePathResolver.php
@@ -11,7 +11,10 @@
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Flow\Annotations as Flow;
 
-final class NodeAddressNormalizer
+/**
+ * @internal implementation detail of Neos.Neos:NodeUri
+ */
+final class NodePathResolver
 {
     #[Flow\Inject]
     protected ContentRepositoryRegistry $contentRepositoryRegistry;
@@ -36,7 +39,7 @@ final class NodeAddressNormalizer
      *
      * For handling partially legacy paths please preprocess the path using {@see LegacyNodePathNormalizer::tryResolveLegacyPathSyntaxToAbsoluteNodePath()}
      */
-    public function resolveNodeAddressFromPath(AbsoluteNodePath|NodePath|string $path, Node $baseNode): NodeAddress
+    public function resolveNodeAddressByPath(AbsoluteNodePath|NodePath|string $path, Node $baseNode): NodeAddress
     {
         if ($path === '') {
             throw new \RuntimeException('Empty strings can not be resolved to nodes.', 1719999872);

diff --git a/Neos.Neos/Classes/ViewHelpers/Link/NodeViewHelper.php b/Neos.Neos/Classes/ViewHelpers/Link/NodeViewHelper.php
@@ -28,7 +28,7 @@
 use Neos\Neos\FrontendRouting\NodeUriBuilderFactory;
 use Neos\Neos\FrontendRouting\Options;
 use Neos\Neos\Utility\LegacyNodePathNormalizer;
-use Neos\Neos\Utility\NodeAddressNormalizer;
+use Neos\Neos\Utility\NodePathResolver;
 use Neos\Neos\Utility\NodeTypeWithFallbackProvider;
 
 /**
@@ -143,9 +143,9 @@ class NodeViewHelper extends AbstractTagBasedViewHelper
 
     /**
      * @Flow\Inject
-     * @var NodeAddressNormalizer
+     * @var NodePathResolver
      */
-    protected $nodeAddressNormalizer;
+    protected $nodePathResolver;
 
     /**
      * @Flow\Inject
@@ -263,7 +263,7 @@ public function render(): string
                 );
             } else {
                 $possibleAbsoluteNodePath = $this->legacyNodePathNormalizer->tryResolveLegacyPathSyntaxToAbsoluteNodePath($node, $baseNode);
-                $nodeAddress = $this->nodeAddressNormalizer->resolveNodeAddressFromPath(
+                $nodeAddress = $this->nodePathResolver->resolveNodeAddressByPath(
                     $possibleAbsoluteNodePath ?? $node,
                     $baseNode
                 );

diff --git a/Neos.Neos/Classes/ViewHelpers/Uri/NodeViewHelper.php b/Neos.Neos/Classes/ViewHelpers/Uri/NodeViewHelper.php
@@ -27,7 +27,7 @@
 use Neos\Neos\FrontendRouting\NodeUriBuilderFactory;
 use Neos\Neos\FrontendRouting\Options;
 use Neos\Neos\Utility\LegacyNodePathNormalizer;
-use Neos\Neos\Utility\NodeAddressNormalizer;
+use Neos\Neos\Utility\NodePathResolver;
 
 /**
  * A view helper for creating URIs pointing to nodes.
@@ -119,9 +119,9 @@ class NodeViewHelper extends AbstractViewHelper
 
     /**
      * @Flow\Inject
-     * @var NodeAddressNormalizer
+     * @var NodePathResolver
      */
-    protected $nodeAddressNormalizer;
+    protected $nodePathResolver;
 
     /**
      * @Flow\Inject
@@ -207,7 +207,7 @@ public function render(): string
                 );
             } else {
                 $possibleAbsoluteNodePath = $this->legacyNodePathNormalizer->tryResolveLegacyPathSyntaxToAbsoluteNodePath($node, $baseNode);
-                $nodeAddress = $this->nodeAddressNormalizer->resolveNodeAddressFromPath(
+                $nodeAddress = $this->nodePathResolver->resolveNodeAddressByPath(
                     $possibleAbsoluteNodePath ?? $node,
                     $baseNode
                 );