Merge pull request #32 from kdambekalns/task/neos-9.0-compatibility

Neos 9.0 compatibility

Author: kdambekalns

Classes/Command/AtomImportCommandController.php

@@ -13,18 +13,18 @@
  * source code.
  */
 
-use Neos\ContentRepository\Domain\Model\NodeInterface;
-use Neos\ContentRepository\Domain\Model\NodeTemplate;
-use Neos\ContentRepository\Domain\Service\NodeTypeManager;
-use Neos\ContentRepository\Exception\NodeException;
-use Neos\ContentRepository\Exception\NodeExistsException;
-use Neos\ContentRepository\Exception\NodeTypeNotFoundException;
-use Neos\ContentRepository\Utility;
-use Neos\Eel\Exception;
+use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint;
+use Neos\ContentRepository\Core\NodeType\NodeTypeName;
+use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
+use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints;
+use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
+use Neos\ContentRepository\Core\SharedModel\Node\NodeName;
+use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
+use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Eel\FlowQuery\FlowQuery;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Cli\CommandController;
-use Neos\Neos\Domain\Service\ContentContextFactory;
+use Neos\Rector\ContentRepository90\Legacy\LegacyContextStub;
 
 /**
  * BlogCommand command controller for the RobertLemke.Plugin.Blog package
@@ -33,27 +33,12 @@
  */
 class AtomImportCommandController extends CommandController
 {
-    /**
-     * @Flow\Inject
-     * @var NodeTypeManager
-     */
-    protected $nodeTypeManager;
+    protected Node $blogNode;
 
-    /**
-     * @Flow\Inject
-     * @var ContentContextFactory
-     */
-    protected $contentContextFactory;
+    protected array $tagNodes = [];
 
-    /**
-     * @var NodeInterface
-     */
-    protected $blogNode;
-
-    /**
-     * @var array
-     */
-    protected $tagNodes = [];
+    #[Flow\Inject]
+    protected ContentRepositoryRegistry $contentRepositoryRegistry;
 
     /**
      * Imports atom data into the blog
@@ -62,10 +47,6 @@ class AtomImportCommandController extends CommandController
      * @param string $targetNode The target node (expressed as a FlowQuery find condition)
      * @param string $atomFile The atom file to import
      * @return void
-     * @throws NodeException
-     * @throws NodeExistsException
-     * @throws NodeTypeNotFoundException
-     * @throws Exception
      */
     public function migrateCommand(string $workspace, string $targetNode, string $atomFile): void
     {
@@ -74,10 +55,15 @@ public function migrateCommand(string $workspace, string $targetNode, string $at
             $this->quit(1);
         }
 
-        $context = $this->contentContextFactory->create(['workspaceName' => $workspace]);
-        $q = new FlowQuery([$context->getRootNode()]);
+        $context = new LegacyContextStub(['workspaceName' => $workspace]);
+        // TODO 9.0 migration: !! MEGA DIRTY CODE! Ensure to rewrite this; by getting rid of LegacyContextStub.
+        $contentRepository = $this->contentRepositoryRegistry->get(ContentRepositoryId::fromString('default'));
+        $workspace = $contentRepository->findWorkspaceByName(WorkspaceName::fromString('live'));
+        $rootNodeAggregate = $contentRepository->getContentGraph($workspace->workspaceName)->findRootNodeAggregateByType(NodeTypeName::fromString('Neos.Neos:Sites'));
+        $subgraph = $contentRepository->getContentGraph($workspace->workspaceName)->getSubgraph(DimensionSpacePoint::fromLegacyDimensionArray($context->dimensions ?? []), $context->invisibleContentShown ? VisibilityConstraints::withoutRestrictions() : VisibilityConstraints::default());
+        $q = new FlowQuery([$subgraph->findNodeById($rootNodeAggregate->nodeAggregateId)]);
         $this->blogNode = $q->find($targetNode)->get(0);
-        if (!($this->blogNode instanceof NodeInterface)) {
+        if (!($this->blogNode instanceof Node)) {
             $this->outputLine('<error>Target node not found.</error>');
             $this->quit(1);
         }
@@ -93,15 +79,15 @@ public function migrateCommand(string $workspace, string $targetNode, string $at
         $items = $parser->get_items();
 
         $comments = [];
-        /** @var $item \SimplePie_Item */
+        /** @var \SimplePie_Item $item */
         foreach ($items as $item) {
             $categories = $item->get_categories();
 
             if (!is_array($categories)) {
                 continue;
             }
 
-            /** @var $category \SimplePie_Category */
+            /** @var \SimplePie_Category $category */
             foreach ($categories as $category) {
                 if ($category->get_term() === 'http://schemas.google.com/blogger/2008/kind#comment') {
                     $inReplyTo = current($item->get_item_tags('http://purl.org/syndication/thread/1.0', 'in-reply-to'));
@@ -110,9 +96,10 @@ public function migrateCommand(string $workspace, string $targetNode, string $at
                 }
             }
         }
+        $contentRepository = $this->contentRepositoryRegistry->get(ContentRepositoryId::fromString('default'));
 
-        $textNodeType = $this->nodeTypeManager->getNodeType('Neos.NodeTypes:Text');
-        $commentNodeType = $this->nodeTypeManager->getNodeType('RobertLemke.Plugin.Blog:Content.Comment');
+        $textNodeType = $contentRepository->getNodeTypeManager()->getNodeType('Neos.NodeTypes:Text');
+        $commentNodeType = $contentRepository->getNodeTypeManager()->getNodeType('RobertLemke.Plugin.Blog:Content.Comment');
         $counter = 0;
         foreach ($parser->get_items() as $item) {
             $categories = $item->get_categories();
@@ -134,8 +121,9 @@ public function migrateCommand(string $workspace, string $targetNode, string $at
                 continue;
             }
 
+            // TODO 9.0 migration: !! NodeTemplate is removed in Neos 9.0. Use the "CreateNodeAggregateWithNode" command to create new nodes or "CreateNodeVariant" command to create variants of an existing node in other dimensions.
             $nodeTemplate = new NodeTemplate();
-            $nodeTemplate->setNodeType($this->nodeTypeManager->getNodeType('RobertLemke.Plugin.Blog:Document.Post'));
+            $nodeTemplate->setNodeType($contentRepository->getNodeTypeManager()->getNodeType('RobertLemke.Plugin.Blog:Document.Post'));
             $nodeTemplate->setProperty('title', $item->get_title());
             $nodeTemplate->setProperty('author', $item->get_author()->get_name());
             $published = new \DateTime();
@@ -144,15 +132,15 @@ public function migrateCommand(string $workspace, string $targetNode, string $at
             $nodeTemplate->setProperty('tags', $this->getTagNodes($tags));
 
             $slug = strtolower(str_replace([' ', ',', ':', 'ü', 'à', 'é', '?', '!', '[', ']', '.', '\''], ['-', '', '', 'u', 'a', 'e', '', '', '', '', '-', ''], $item->get_title()));
-            /** @var NodeInterface $postNode */
+            /** @var Node $postNode */
             $postNode = $this->blogNode->createNodeFromTemplate($nodeTemplate, $slug);
             $postNode->getNode('main')->createNode(uniqid('node'), $textNodeType)->setProperty('text', $item->get_content());
 
             $postComments = $comments[$item->get_id()] ?? [];
             if ($postComments !== []) {
-                /** @var NodeInterface $commentsNode */
+                /** @var Node $commentsNode */
                 $commentsNode = $postNode->getNode('comments');
-                /** @var $postComment \SimplePie_Item */
+                /** @var \SimplePie_Item $postComment */
                 foreach ($postComments as $postComment) {
                     $commentNode = $commentsNode->createNode(uniqid('comment-', true), $commentNodeType);
                     $commentNode->setProperty('author', html_entity_decode($postComment->get_author()->get_name(), ENT_QUOTES, 'utf-8'));
@@ -164,9 +152,7 @@ public function migrateCommand(string $workspace, string $targetNode, string $at
                     $commentNode->setProperty('text', $commentText);
                     $commentNode->setProperty('spam', false);
                     $previousCommentNode = $commentNode;
-                    if ($previousCommentNode !== null) {
-                        $commentNode->moveAfter($previousCommentNode);
-                    }
+                    $commentNode->moveAfter($previousCommentNode);
                 }
             }
 
@@ -179,19 +165,18 @@ public function migrateCommand(string $workspace, string $targetNode, string $at
 
     /**
      * @param array $tags
-     * @return array<NodeInterface>
-     * @throws NodeExistsException
-     * @throws NodeTypeNotFoundException
+     * @return array<Node>
      */
     protected function getTagNodes(array $tags): array
     {
         $tagNodes = [];
 
         foreach ($tags as $tag) {
             if (!isset($this->tagNodes[$tag])) {
-                $tagNodeType = $this->nodeTypeManager->getNodeType('RobertLemke.Plugin.Blog:Document.Tag');
+                $contentRepository = $this->contentRepositoryRegistry->get(ContentRepositoryId::fromString('default'));
+                $tagNodeType = $contentRepository->getNodeTypeManager()->getNodeType('RobertLemke.Plugin.Blog:Document.Tag');
 
-                $tagNode = $this->blogNode->createNode(Utility::renderValidNodeName($tag), $tagNodeType);
+                $tagNode = $this->blogNode->createNode(NodeName::fromString($tag)->value, $tagNodeType);
                 $tagNode->setProperty('title', $tag);
                 $this->tagNodes[$tag] = $tagNode;
             }

Classes/Eel/Helper/Teaser.php

@@ -3,9 +3,9 @@
 
 namespace RobertLemke\Plugin\Blog\Eel\Helper;
 
-use Neos\Flow\Annotations as Flow;
-use Neos\ContentRepository\Domain\Model\NodeInterface;
+use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 use Neos\Eel\ProtectedContextAwareInterface;
+use Neos\Flow\Annotations as Flow;
 use RobertLemke\Plugin\Blog\Service\ContentService;
 
 class Teaser implements ProtectedContextAwareInterface
@@ -16,7 +16,7 @@ class Teaser implements ProtectedContextAwareInterface
      */
     protected $contentService;
 
-    public function getCroppedTeaser(NodeInterface $node, int $maximumLength = 500): string
+    public function getCroppedTeaser(Node $node, int $maximumLength = 500): string
     {
         return $this->contentService->renderTeaser($node, $maximumLength);
     }

Classes/Runtime/Action/CreateCommentAction.php

@@ -3,82 +3,98 @@
 
 namespace RobertLemke\Plugin\Blog\Runtime\Action;
 
+use Neos\ContentRepository\Core\DimensionSpace\OriginDimensionSpacePoint;
+use Neos\ContentRepository\Core\Feature\NodeCreation\Command\CreateNodeAggregateWithNode;
+use Neos\ContentRepository\Core\Feature\NodeModification\Dto\PropertyValuesToWrite;
+use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
+use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
+use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
+use Neos\ContentRepository\Core\SharedModel\Node\NodeName;
+use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
+use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Flow\Annotations as Flow;
-use Neos\ContentRepository\Domain\Model\NodeInterface;
-use Neos\ContentRepository\Domain\NodeAggregate\NodeName;
-use Neos\ContentRepository\Domain\Model\NodeTemplate;
-use Neos\ContentRepository\Domain\Service\NodeService;
-use Neos\ContentRepository\Domain\Service\NodeTypeManager;
-use Neos\ContentRepository\Domain\Utility\NodePaths;
-use Neos\Fusion\Form\Runtime\Action\AbstractAction;
 use Neos\Flow\Mvc\ActionResponse;
+use Neos\Fusion\Form\Runtime\Action\AbstractAction;
 use Neos\Fusion\Form\Runtime\Domain\Exception\ActionException;
-use Neos\Neos\Controller\CreateContentContextTrait;
 use RobertLemke\Akismet\Exception\ConnectionException;
 use RobertLemke\Akismet\Service;
 
 
 class CreateCommentAction extends AbstractAction
 {
-    use CreateContentContextTrait;
-
     #[Flow\Inject]
     protected Service $akismetService;
 
     #[Flow\Inject]
-    protected NodeTypeManager $nodeTypeManager;
-
-    #[Flow\Inject]
-    protected NodeService $nodeService;
+    protected ContentRepositoryRegistry $contentRepositoryRegistry;
 
     /**
      * @return ActionResponse|null
+     * @throws ActionException
      */
     public function perform(): ?ActionResponse
     {
-        $response = new ActionResponse();
-
         $author = $this->options['author'] ?? null;
         $text = $this->options['text'] ?? null;
         $emailAddress = $this->options['emailAddress'] ?? null;
         $postNodePath = $this->options['postNode'] ?? null;
 
+        // TODO 9.0 migration: !! CreateContentContextTrait::createContentContext() is removed in Neos 9.0.
         $contentContext = $this->createContentContext('live', []);
         $postNode = $contentContext->getNode($postNodePath);
 
         if ($postNode === null) {
             throw new ActionException('Required parameters missing', 1740574436);
         }
 
-        $textNodeType = $this->nodeTypeManager->getNodeType('RobertLemke.Plugin.Blog:Content.Comment');
-        $nodeTemplate = new NodeTemplate();
-        $nodeTemplate->setNodeType($textNodeType);
-        $nodeTemplate->setProperty('author', htmlspecialchars($author));
-        $nodeTemplate->setProperty('text', htmlspecialchars($text));
-        $nodeTemplate->setProperty('emailAddress', htmlspecialchars($emailAddress));
-        $nodeTemplate->setProperty('spam', false);
-
-        $commentNode = $postNode
-            ->findNamedChildNode(NodeName::fromString('comments'))
-            ->createNodeFromTemplate($nodeTemplate, NodePaths::generateRandomNodeName());
-
-        $commentNode->setProperty('datePublished', new \DateTime());
-
+        $isSpam = false;
         try {
             if ($this->akismetService->isCommentSpam('', $text, 'comment', $author, $emailAddress)) {
-                $commentNode->setProperty('spam', true);
+                $isSpam = true;
             }
         } catch (ConnectionException $e) {
-            throw new ActionException('Akismet service not available', 1740575405);
+            throw new ActionException('Akismet service not available', 1740575405, $e);
         }
 
-        $this->emitCommentCreated($commentNode, $postNode);
+        $contentRepository = $this->contentRepositoryRegistry->get(ContentRepositoryId::fromString('default'));
+        $textNodeType = $contentRepository->getNodeTypeManager()->getNodeType('RobertLemke.Plugin.Blog:Content.Comment');
+        $commentsNode = $postNode->findNamedChildNode(NodeName::fromString('comments'));
+
+        // TODO 9.0 migration: Fix this for real
+        $contentRepository->handle(CreateNodeAggregateWithNode::create(
+            WorkspaceName::forLive(),
+            NodeAggregateId::create(),
+            $textNodeType?->name,
+            OriginDimensionSpacePoint::fromDimensionSpacePoint($arbitraryRootDimensionSpacePoint),
+            $commentsNode->aggregateId,
+            null,
+            PropertyValuesToWrite::fromArray([
+                'author' => htmlspecialchars($author),
+                'text' => htmlspecialchars($text),
+                'emailAddress' => htmlspecialchars($emailAddress),
+                'spam' => $isSpam,
+                'datePublished' => new \DateTime(),
+            ])
+        ));
+
+        $this->emitCommentCreated(
+            [
+                'author' => htmlspecialchars($author),
+                'text' => htmlspecialchars($text),
+                'emailAddress' => htmlspecialchars($emailAddress),
+                'spam' => $isSpam,
+                'datePublished' => new \DateTime(),
+            ],
+            $postNode
+        );
+
+        $response = new ActionResponse();
         $response->setContent($this->options['message']);
         return $response;
     }
 
     #[Flow\Signal]
-    protected function emitCommentCreated(NodeInterface $commentNode, NodeInterface $postNode): void
+    protected function emitCommentCreated(array $comment, Node $postNode): void
     {
     }
 }