Merge pull request #12 from sitegeist/task/fixLinkGeneration

TASK: Fix generation of links in occurences command

Classes/Command/ReportCommandController.php

@@ -185,11 +185,11 @@ public function occurencesCommand($nodeType, $workspaces = 'live', $limit = 5, $
                         $this->outputLine();
                         $this->outputDimensionPreset($dimensionPreset);
                         $this->outputLine();
-//                        $this->outputLine('<b>Link:</b> %s', [
-//                            $closestDocumentNode ? $this->nodeUriService->buildUriFromNode(
-//                                $closestDocumentNode
-//                            ) : 'No Document found'
-//                        ]);
+                        $this->outputLine('<b>Link:</b> %s', [
+                            $closestDocumentNode ? $this->nodeUriService->buildUriFromNode(
+                                $closestDocumentNode
+                            ) : 'No Document found'
+                        ]);
                         $this->outputLine();
                     }
                 }
@@ -424,7 +424,7 @@ public function urisCommand($nodeType = 'Neos.Neos:Document', $filter = '', $wor
      */
     protected function getClosestDocumentNode(NodeInterface $node)
     {
-        if ($node->getNodeType()->isOfType('TYPO.Neos:Document')) {
+        if ($node->getNodeType()->isOfType('Neos.Neos:Document')) {
             return $node;
         }
 

Classes/ContentRepository/Service/NodeUriService.php

@@ -15,6 +15,8 @@
 
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Configuration\ConfigurationManager;
+use Neos\Flow\Mvc\Routing\Dto\ResolveContext;
+use Neos\Flow\Mvc\Routing\Dto\RouteParameters;
 use Neos\Flow\Mvc\Routing\RouterInterface;
 use Neos\Flow\Mvc\ActionRequest;
 use Neos\Neos\Domain\Service\NodeShortcutResolver;
@@ -49,12 +51,6 @@ class NodeUriService
      */
     protected $router;
 
-    /**
-     * @Flow\Inject
-     * @var UriBuilder
-     */
-    protected $uriBuilder;
-
     /**
      * Constructor
      */
@@ -101,22 +97,24 @@ public function buildUriFromNode(NodeInterface $node, $resolveShortcuts = TRUE)
                 1414771137);
         }
 
-        $reflection = new \ReflectionClass($this->uriBuilder);
-        $property = $reflection->getProperty('baseUriProvider');
-        $property->setAccessible(true);
-        $subj = $property->getValue($this->uriBuilder);
-
-        //
-        // create a dummy parent request
-        //
-        $httpRequest = new ServerRequest('get', 'https://domain.tld' );
-        $request = ActionRequest::fromHttpRequest($httpRequest);
-        $this->uriBuilder->setRequest($request);
-
-        $uri = $this->uriBuilder
-            ->setFormat('html')
-            ->uriFor('show', array('node' => $resolvedNode), 'Frontend\Node', 'Neos.Neos');
+        $routeValues = [
+            'node' => $resolvedNode,
+            '@package' => 'neos.neos',
+            '@controller' => 'frontend\node',
+            '@action' => 'show',
+            '@format' => 'html',
+        ];
+
+        $uri = new Uri('http://localhost');
+        $resolveContext = new ResolveContext(
+            $uri,
+            $routeValues,
+            false ,
+            '',
+            RouteParameters::createEmpty()->withParameter('requestUriHost', $uri->getHost())
+        );
 
-        return $uri;
+        $uri = $this->router->resolve($resolveContext);
+        return (string) $uri;
     }
 }