BUGFIX: Restore Neos.Neos:NodeUri, neos:link.node and LinkingService

.composer.json

@@ -38,7 +38,7 @@
       "@test:behat-cli -c Neos.ContentRepository.Export/Tests/Behavior/behat.yml.dist",
       "@test:behat-cli -c Neos.TimeableNodeVisibility/Tests/Behavior/behat.yml.dist",
       "../../flow doctrine:migrate --quiet; ../../flow cr:setup",
-      "@test:behat-cli -c Neos.Neos/Tests/Behavior/behat.yml"
+      "@test:behat-cli -c Neos.Neos/Tests/Behavior/behat.yml.dist"
     ],
     "test:behavioral:stop-on-failure": [
       "@test:behat-cli -vvv --stop-on-failure -c Neos.ContentRepository.BehavioralTests/Tests/Behavior/behat.yml.dist",
@@ -47,7 +47,7 @@
       "@test:behat-cli -vvv --stop-on-failure -c Neos.ContentRepository.Export/Tests/Behavior/behat.yml.dist",
       "@test:behat-cli -vvv --stop-on-failure -c Neos.TimeableNodeVisibility/Tests/Behavior/behat.yml.dist",
       "../../flow doctrine:migrate --quiet; ../../flow cr:setup",
-      "@test:behat-cli -vvv --stop-on-failure -c Neos.Neos/Tests/Behavior/behat.yml"
+      "@test:behat-cli -vvv --stop-on-failure -c Neos.Neos/Tests/Behavior/behat.yml.dist"
     ],
     "test": [
       "@test:unit",

.github/workflows/postgresql-versions.yml

@@ -154,5 +154,5 @@ jobs:
           FLOW_CONTEXT=Testing/Behat ./flow behat:setup
           FLOW_CONTEXT=Testing/Behat ./flow doctrine:create
           FLOW_CONTEXT=Testing/Behat ./flow doctrine:migrationversion --add --version all
-          bin/behat --stop-on-failure -f progress -c Packages/Neos/Neos.Neos/Tests/Behavior/behat.yml
+          bin/behat --stop-on-failure -f progress -c Packages/Neos/Neos.Neos/Tests/Behavior/behat.yml.dist
           bin/behat --stop-on-failure -f progress -c Packages/Neos/Neos.ContentRepository/Tests/Behavior/behat.yml.dist

Neos.Neos/Classes/FrontendRouting/NodeUriBuilder.php

@@ -115,6 +115,7 @@ public function __construct(
      * @api
      * @throws NoMatchingRouteException
      *   The exception is thrown for various unlike cases in which uri building fails:
+     *   - the node is disabled in the live workspace (a preview url should be built instead)
      *   - the default route definitions are misconfigured
      *   - the custom uri building options don't macht a route
      *   - the shortcut points to an invalid target

Neos.Neos/Classes/Fusion/ConvertUrisImplementation.php

@@ -67,8 +67,7 @@
  */
 class ConvertUrisImplementation extends AbstractFusionObject
 {
-    public const PATTERN_SUPPORTED_URIS
-        = '/(node|asset):\/\/([a-z0-9\-]+|([a-f0-9]){8}-([a-f0-9]){4}-([a-f0-9]){4}-([a-f0-9]){4}-([a-f0-9]){12})/';
+    private const PATTERN_SUPPORTED_URIS = '/(node|asset):\/\/([a-z0-9\-]+)/';
 
     /**
      * @Flow\Inject

Neos.Neos/Classes/Fusion/Helper/LinkHelper.php

@@ -16,25 +16,24 @@
 
 use GuzzleHttp\Psr7\Uri;
 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\Eel\ProtectedContextAwareInterface;
 use Neos\Flow\Annotations as Flow;
-use Neos\Flow\Log\Utility\LogEnvironment;
 use Neos\Flow\Mvc\Controller\ControllerContext;
-use Neos\Flow\Mvc\Exception\NoMatchingRouteException;
 use Neos\Flow\ResourceManagement\ResourceManager;
 use Neos\Media\Domain\Model\AssetInterface;
 use Neos\Media\Domain\Repository\AssetRepository;
 use Neos\Neos\FrontendRouting\NodeUriBuilderFactory;
-use Neos\Neos\FrontendRouting\Options;
-use Neos\Neos\Fusion\ConvertUrisImplementation;
+use Neos\Neos\Service\LinkingService;
 use Psr\Http\Message\UriInterface;
 use Psr\Log\LoggerInterface;
 
 class LinkHelper implements ProtectedContextAwareInterface
 {
+    private const NODE_SCHEME = 'node';
+    private const ASSET_SCHEME = 'asset';
+
     /**
      * @Flow\Inject
      * @var LoggerInterface
@@ -66,77 +65,55 @@ class LinkHelper implements ProtectedContextAwareInterface
     protected $nodeUriBuilderFactory;
 
     /**
-     * @param string|Uri $uri
-     * @return boolean
+     * @Flow\Inject
+     * @var LinkingService
      */
-    public function hasSupportedScheme($uri): bool
-    {
-        return in_array($this->getScheme($uri), ['node', 'asset'], true);
-    }
+    protected $linkingService;
 
-    /**
-     * @param string|UriInterface $uri
-     * @return string
-     */
-    public function getScheme($uri): string
+    public function hasSupportedScheme(string|UriInterface|null $uri): bool
     {
-        if ($uri instanceof UriInterface) {
-            return $uri->getScheme();
-        }
-
-        if (is_string($uri) && preg_match(ConvertUrisImplementation::PATTERN_SUPPORTED_URIS, $uri, $matches) === 1) {
-            return $matches[1];
-        }
-
-        return '';
+        $scheme = $this->getScheme($uri);
+        return $scheme === self::NODE_SCHEME || $scheme === self::ASSET_SCHEME;
     }
 
-    public function resolveNodeUri(
-        string|Uri $uri,
-        Node $contextNode,
-        ControllerContext $controllerContext
-    ): ?string {
-        $targetNode = $this->convertUriToObject($uri, $contextNode);
-        if (!$targetNode instanceof Node) {
-            $this->systemLogger->info(
-                sprintf(
-                    'Could not resolve "%s" to an existing node; The node was probably deleted.',
-                    $uri
-                ),
-                LogEnvironment::fromMethodName(__METHOD__)
-            );
+    public function getScheme(string|UriInterface|null $uri): ?string
+    {
+        if ($uri === null || $uri === '') {
             return null;
         }
-
-        $nodeUriBuilder = $this->nodeUriBuilderFactory->forActionRequest($controllerContext->getRequest());
-
-        $options = Options::createEmpty();
-        $format = $controllerContext->getRequest()->getFormat();
-        if ($format && $format !== 'html') {
-            $options = $options->withCustomFormat($format);
-        }
-        try {
-            $targetUri = $nodeUriBuilder->uriFor(NodeAddress::fromNode($targetNode), $options);
-        } catch (NoMatchingRouteException $e) {
-            $this->systemLogger->info(sprintf(
-                'Failed to build URI for node "%s": %e',
-                $targetNode->aggregateId->value,
-                $e->getMessage()
-            ), LogEnvironment::fromMethodName(__METHOD__));
-            return null;
+        if (is_string($uri)) {
+            $uri = new Uri($uri);
         }
+        return $uri->getScheme();
+    }
 
-        return (string)$targetUri;
+    /**
+     * @param string|UriInterface $uri
+     * @param Node $contextNode
+     * @param ControllerContext $controllerContext
+     * @return string|null
+     * @deprecated with Neos 9 as the linking service is deprecated and this helper cannot be invoked from Fusion either way as the $controllerContext is not available.
+     */
+    public function resolveNodeUri(string|UriInterface $uri, Node $contextNode, ControllerContext $controllerContext): ?string
+    {
+        return $this->linkingService->resolveNodeUri((string)$uri, $contextNode, $controllerContext);
     }
 
-    public function resolveAssetUri(string|Uri $uri): string
+    public function resolveAssetUri(string|UriInterface $uri): string
     {
         if (!$uri instanceof UriInterface) {
             $uri = new Uri($uri);
         }
+        if ($uri->getScheme() !== self::ASSET_SCHEME) {
+            throw new \RuntimeException(sprintf(
+                'Invalid asset uri "%s" provided. It must start with asset://',
+                $uri
+            ), 1720003716);
+        }
+
         $asset = $this->assetRepository->findByIdentifier($uri->getHost());
         if (!$asset instanceof AssetInterface) {
-            throw new \InvalidArgumentException(sprintf(
+            throw new \RuntimeException(sprintf(
                 'Failed to resolve asset from URI "%s", probably the corresponding asset was deleted',
                 $uri
             ), 1601373937);
@@ -148,33 +125,26 @@ public function resolveAssetUri(string|Uri $uri): string
     }
 
     public function convertUriToObject(
-        string|Uri $uri,
+        string|UriInterface $uri,
         Node $contextNode = null
     ): Node|AssetInterface|null {
-        if (empty($uri)) {
-            return null;
-        }
-        if ($uri instanceof UriInterface) {
-            $uri = (string)$uri;
+        if (is_string($uri)) {
+            $uri = new Uri($uri);
         }
-
-        if (preg_match(ConvertUrisImplementation::PATTERN_SUPPORTED_URIS, $uri, $matches) === 1) {
-            switch ($matches[1]) {
-                case 'node':
-                    if ($contextNode === null) {
-                        throw new \RuntimeException(
-                            'node:// URI conversion requires a context node to be passed',
-                            1409734235
-                        );
-                    }
-                    return $this->contentRepositoryRegistry->subgraphForNode($contextNode)
-                        ->findNodeById(NodeAggregateId::fromString($matches[2]));
-                case 'asset':
-                    /** @var AssetInterface|null $asset */
-                    /** @noinspection OneTimeUseVariablesInspection */
-                    $asset = $this->assetRepository->findByIdentifier($matches[2]);
-                    return $asset;
-            }
+        switch ($uri->getScheme()) {
+            case self::NODE_SCHEME:
+                if ($contextNode === null) {
+                    throw new \RuntimeException(
+                        sprintf('node:// URI conversion like "%s" requires a context node to be passed', $uri),
+                        1409734235
+                    );
+                }
+                return $this->contentRepositoryRegistry->subgraphForNode($contextNode)
+                    ->findNodeById(NodeAggregateId::fromString($uri->getHost()));
+            case self::ASSET_SCHEME:
+                /** @var AssetInterface|null $asset */
+                $asset = $this->assetRepository->findByIdentifier($uri->getHost());
+                return $asset;
         }
         return null;
     }

Neos.Neos/Classes/Fusion/Helper/NodeHelper.php

@@ -62,14 +62,10 @@ public function nearestContentCollection(Node $node, string $nodePath): Node
                     $contentCollectionType
                 ), 1409300545);
             }
-            $nodePath = AbsoluteNodePath::patternIsMatchedByString($nodePath)
-                ? AbsoluteNodePath::fromString($nodePath)
-                : NodePath::fromString($nodePath);
+            $nodePath = NodePath::fromString($nodePath);
             $subgraph = $this->contentRepositoryRegistry->subgraphForNode($node);
 
-            $subNode = $nodePath instanceof AbsoluteNodePath
-                ? $subgraph->findNodeByAbsolutePath($nodePath)
-                : $subgraph->findNodeByPath($nodePath, $node->aggregateId);
+            $subNode = $subgraph->findNodeByPath($nodePath, $node->aggregateId);
 
             if ($subNode !== null && $this->isOfType($subNode, $contentCollectionType)) {
                 return $subNode;

Neos.Neos/Classes/Fusion/NodeUriImplementation.php

@@ -25,10 +25,30 @@
 use Neos\Fusion\FusionObjects\AbstractFusionObject;
 use Neos\Neos\FrontendRouting\NodeUriBuilderFactory;
 use Neos\Neos\FrontendRouting\Options;
+use Neos\Neos\Utility\LegacyNodePathNormalizer;
+use Neos\Neos\Utility\NodePathResolver;
 use Psr\Log\LoggerInterface;
 
 /**
  * Create a link to a node
+ *
+ * If the node is passed as string the base node is required.
+ * Following string syntax is allowed:
+ *
+ *  - /<Neos.Neos:Sites>/my-site/main
+ *  - some/relative/path
+ *
+ * Deprecated syntax:
+ *
+ *  - /sites/site/absolute/path
+ *  - ~/site-relative/path
+ *  - ~
+ *
+ * Not supported syntax:
+ *
+ *  - ./neos/info
+ *  - ../foo/../../bar
+ *
  */
 class NodeUriImplementation extends AbstractFusionObject
 {
@@ -51,12 +71,16 @@ class NodeUriImplementation extends AbstractFusionObject
     protected $nodeUriBuilderFactory;
 
     /**
-     * A node object or a string node path or NULL to resolve the current document node
+     * @Flow\Inject
+     * @var NodePathResolver
      */
-    public function getNode(): Node|string|null
-    {
-        return $this->fusionValue('node');
-    }
+    protected $nodeAddressNormalizer;
+
+    /**
+     * @Flow\Inject
+     * @var LegacyNodePathNormalizer
+     */
+    protected $legacyNodePathNormalizer;
 
     /**
      * The requested format, for example "html"
@@ -103,42 +127,43 @@ public function isAbsolute()
      *
      * @return string
      */
-    public function getBaseNodeName()
+    public function getBaseNodeName(): string
     {
-        return $this->fusionValue('baseNodeName');
+        return $this->fusionValue('baseNodeName') ?: 'documentNode';
     }
 
     /**
      * Render the Uri.
      *
      * @return string The rendered URI or NULL if no URI could be resolved for the given node
-     * @throws \Neos\Flow\Mvc\Routing\Exception\MissingActionNameException
      */
     public function evaluate()
     {
-        $baseNode = null;
-        $baseNodeName = $this->getBaseNodeName() ?: 'documentNode';
-        $currentContext = $this->runtime->getCurrentContext();
-        if (isset($currentContext[$baseNodeName])) {
-            $baseNode = $currentContext[$baseNodeName];
+        $node = $this->fusionValue('node');
+        if (is_string($node)) {
+            $currentContext = $this->runtime->getCurrentContext();
+            $baseNode = $currentContext[$this->getBaseNodeName()] ?? null;
+            if (!$baseNode instanceof Node) {
+                throw new \RuntimeException(sprintf(
+                    'If "node" is passed as string a base node in must be set in "%s". Given: %s',
+                    $this->getBaseNodeName(),
+                    get_debug_type($baseNode)
+                ), 1719996392);
+            }
+
+            $possibleAbsoluteNodePath = $this->legacyNodePathNormalizer->tryResolveLegacyPathSyntaxToAbsoluteNodePath($node, $baseNode);
+            $nodeAddress = $this->nodeAddressNormalizer->resolveNodeAddressByPath(
+                $possibleAbsoluteNodePath ?? $node,
+                $baseNode
+            );
+        } elseif ($node instanceof Node) {
+            $nodeAddress = NodeAddress::fromNode($node);
         } else {
-            throw new \RuntimeException(sprintf('Could not find a node instance in Fusion context with name "%s" and no node instance was given to the node argument. Set a node instance in the Fusion context or pass a node object to resolve the URI.', $baseNodeName), 1373100400);
-        }
-        $node = $this->getNode();
-        if (!$node instanceof Node) {
-            throw new \RuntimeException(sprintf('Passing node as %s is not supported yet.', get_debug_type($node)));
+            throw new \RuntimeException(sprintf(
+                'The "node" argument can only be a string or an instance of `Node`. Given: %s',
+                get_debug_type($node)
+            ), 1719996456);
         }
-        /* TODO implement us see https://github.com/neos/neos-development-collection/issues/4524 {@see \Neos\Neos\ViewHelpers\Uri\NodeViewHelper::resolveNodeAddressFromString} for an example implementation
-        elseif ($node === '~') {
-        $nodeAddress = $this->nodeAddressFactory->createFromNode($node);
-        $nodeAddress = $nodeAddress->withNodeAggregateId(
-        $siteNode->nodeAggregateId
-        );
-        } elseif (is_string($node) && substr($node, 0, 7) === 'node://') {
-        $nodeAddress = $this->nodeAddressFactory->createFromNode($node);
-        $nodeAddress = $nodeAddress->withNodeAggregateId(
-        NodeAggregateId::fromString(\mb_substr($node, 7))
-        );*/
 
         $possibleRequest = $this->runtime->fusionGlobals->get('request');
         if ($possibleRequest instanceof ActionRequest) {
@@ -160,10 +185,10 @@ public function evaluate()
         }
 
         try {
-            $resolvedUri = $nodeUriBuilder->uriFor(NodeAddress::fromNode($node), $options);
+            $resolvedUri = $nodeUriBuilder->uriFor($nodeAddress, $options);
         } catch (NoMatchingRouteException) {
             // todo log arguments?
-            $this->systemLogger->warning(sprintf('Could not resolve "%s" to a node uri.', $node->aggregateId->value), LogEnvironment::fromMethodName(__METHOD__));
+            $this->systemLogger->warning(sprintf('Could not resolve "%s" to a node uri.', $nodeAddress->aggregateId->value), LogEnvironment::fromMethodName(__METHOD__));
             return '';
         }