Merge branch '9.0' into bugfix/nodeInfoHelperIsAutoCreated

neos · Sep 15, 2023 · 281cf66 · 281cf66
2 parents c85c241 + 7a6c923
commit 281cf66
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 30 deletions.
diff --git a/Classes/ContentRepository/Service/WorkspaceService.php b/Classes/ContentRepository/Service/WorkspaceService.php
@@ -32,7 +32,6 @@
  */
 class WorkspaceService
 {
-
     /**
      * @Flow\Inject
      * @var UserService

diff --git a/Classes/Controller/BackendServiceController.php b/Classes/Controller/BackendServiceController.php
@@ -338,14 +338,9 @@ public function changeBaseWorkspaceAction(string $targetWorkspaceName, string $d
             $currentAccount->getAccountIdentifier()
         )->toContentRepositoryWorkspaceName();
 
+        $command = ChangeBaseWorkspace::create($userWorkspaceName, WorkspaceName::fromString($targetWorkspaceName));
         try {
-            $contentRepository->handle(
-                new ChangeBaseWorkspace(
-                    $userWorkspaceName,
-                    WorkspaceName::fromString($targetWorkspaceName),
-                    $newCOnt = ContentStreamId::create()
-                )
-            )->block();
+            $contentRepository->handle($command)->block();
         } catch (WorkspaceIsNotEmptyException $exception) {
             $error = new Error();
             $error->setMessage('Your personal workspace currently contains unpublished changes.'
@@ -366,7 +361,7 @@ public function changeBaseWorkspaceAction(string $targetWorkspaceName, string $d
 
         $subgraph = $contentRepository->getContentGraph()
             ->getSubgraph(
-                $newCOnt,
+                $command->newContentStreamId,
                 $nodeAddress->dimensionSpacePoint,
                 VisibilityConstraints::withoutRestrictions()
             );

diff --git a/Classes/Domain/Model/Changes/AbstractCreate.php b/Classes/Domain/Model/Changes/AbstractCreate.php
@@ -103,7 +103,7 @@ protected function createNode(
 
         $nodeAggregateId = NodeAggregateId::create(); // generate a new NodeAggregateId
 
-        $command = new CreateNodeAggregateWithNode(
+        $command = CreateNodeAggregateWithNode::create(
             $parentNode->subgraphIdentity->contentStreamId,
             $nodeAggregateId,
             $nodeTypeName,

diff --git a/Classes/Domain/Model/Changes/MoveAfter.php b/Classes/Domain/Model/Changes/MoveAfter.php
@@ -71,14 +71,14 @@ public function apply(): void
             $hasEqualParentNode = $parentNode->nodeAggregateId
                 ->equals($parentNodeOfPreviousSibling->nodeAggregateId);
 
-            $command = new MoveNodeAggregate(
+            $command = MoveNodeAggregate::create(
                 $subject->subgraphIdentity->contentStreamId,
                 $subject->subgraphIdentity->dimensionSpacePoint,
                 $subject->nodeAggregateId,
+                RelationDistributionStrategy::STRATEGY_GATHER_ALL,
                 $hasEqualParentNode ? null : $parentNodeOfPreviousSibling->nodeAggregateId,
                 $precedingSibling->nodeAggregateId,
                 $succeedingSibling?->nodeAggregateId,
-                RelationDistributionStrategy::STRATEGY_GATHER_ALL
             );
 
             $contentRepository = $this->contentRepositoryRegistry->get($subject->subgraphIdentity->contentRepositoryId);

diff --git a/Classes/Domain/Model/Changes/MoveBefore.php b/Classes/Domain/Model/Changes/MoveBefore.php
@@ -69,16 +69,16 @@ public function apply(): void
             $contentRepository = $this->contentRepositoryRegistry->get($subject->subgraphIdentity->contentRepositoryId);
 
             $contentRepository->handle(
-                new MoveNodeAggregate(
+                MoveNodeAggregate::create(
                     $subject->subgraphIdentity->contentStreamId,
                     $subject->subgraphIdentity->dimensionSpacePoint,
                     $subject->nodeAggregateId,
+                    RelationDistributionStrategy::STRATEGY_GATHER_ALL,
                     $hasEqualParentNode
                         ? null
                         : $succeedingSiblingParent->nodeAggregateId,
                     $precedingSibling?->nodeAggregateId,
                     $succeedingSibling->nodeAggregateId,
-                    RelationDistributionStrategy::STRATEGY_GATHER_ALL
                 )
             )->block();
 

diff --git a/Classes/Domain/Model/Changes/MoveInto.php b/Classes/Domain/Model/Changes/MoveInto.php
@@ -80,14 +80,12 @@ public function apply(): void
 
             $contentRepository = $this->contentRepositoryRegistry->get($subject->subgraphIdentity->contentRepositoryId);
             $contentRepository->handle(
-                new MoveNodeAggregate(
+                MoveNodeAggregate::create(
                     $subject->subgraphIdentity->contentStreamId,
                     $subject->subgraphIdentity->dimensionSpacePoint,
                     $subject->nodeAggregateId,
+                    RelationDistributionStrategy::STRATEGY_GATHER_ALL,
                     $hasEqualParentNode ? null : $parentNode->nodeAggregateId,
-                    null,
-                    null,
-                    RelationDistributionStrategy::STRATEGY_GATHER_ALL
                 )
             )->block();
 

diff --git a/Classes/Domain/Model/Changes/Property.php b/Classes/Domain/Model/Changes/Property.php
@@ -191,7 +191,7 @@ public function apply(): void
                         $originDimensionSpacePoint = OriginDimensionSpacePoint::fromDimensionSpacePoint($subject->subgraphIdentity->dimensionSpacePoint);
                         // if origin dimension space point != current DSP -> translate transparently (matching old behavior)
                         $contentRepository->handle(
-                            new CreateNodeVariant(
+                            CreateNodeVariant::create(
                                 $subject->subgraphIdentity->contentStreamId,
                                 $subject->nodeAggregateId,
                                 $subject->originDimensionSpacePoint,
@@ -200,7 +200,7 @@ public function apply(): void
                         )->block();
                     }
                     $commandResult = $contentRepository->handle(
-                        new SetNodeProperties(
+                        SetNodeProperties::create(
                             $subject->subgraphIdentity->contentStreamId,
                             $subject->nodeAggregateId,
                             $originDimensionSpacePoint,
@@ -215,7 +215,7 @@ public function apply(): void
                     // property starts with "_"
                     if ($propertyName === '_nodeType') {
                         $commandResult = $contentRepository->handle(
-                            new ChangeNodeAggregateType(
+                            ChangeNodeAggregateType::create(
                                 $subject->subgraphIdentity->contentStreamId,
                                 $subject->nodeAggregateId,
                                 NodeTypeName::fromString($value),
@@ -225,7 +225,7 @@ public function apply(): void
                     } elseif ($propertyName === '_hidden') {
                         if ($value === true) {
                             $commandResult = $contentRepository->handle(
-                                new DisableNodeAggregate(
+                                DisableNodeAggregate::create(
                                     $subject->subgraphIdentity->contentStreamId,
                                     $subject->nodeAggregateId,
                                     $subject->originDimensionSpacePoint->toDimensionSpacePoint(),
@@ -235,7 +235,7 @@ public function apply(): void
                         } else {
                             // unhide
                             $commandResult = $contentRepository->handle(
-                                new EnableNodeAggregate(
+                                EnableNodeAggregate::create(
                                     $subject->subgraphIdentity->contentStreamId,
                                     $subject->nodeAggregateId,
                                     $subject->originDimensionSpacePoint->toDimensionSpacePoint(),

diff --git a/Classes/Domain/Model/Changes/Remove.php b/Classes/Domain/Model/Changes/Remove.php
@@ -69,13 +69,15 @@ public function apply(): void
             $this->updateWorkspaceInfo();
 
             $closestDocumentParentNode = $this->findClosestDocumentNode($subject);
-            $command = new RemoveNodeAggregate(
+            $command = RemoveNodeAggregate::create(
                 $subject->subgraphIdentity->contentStreamId,
                 $subject->nodeAggregateId,
                 $subject->subgraphIdentity->dimensionSpacePoint,
                 NodeVariantSelectionStrategy::STRATEGY_ALL_SPECIALIZATIONS,
-                $closestDocumentParentNode?->nodeAggregateId
             );
+            if ($closestDocumentParentNode !== null) {
+                $command = $command->withRemovalAttachmentPoint($closestDocumentParentNode?->nodeAggregateId);
+            }
 
             $contentRepository = $this->contentRepositoryRegistry->get($subject->subgraphIdentity->contentRepositoryId);
             $contentRepository->handle($command)->block();

diff --git a/Classes/Domain/Model/ReferencingChangeInterface.php b/Classes/Domain/Model/ReferencingChangeInterface.php
@@ -13,7 +13,6 @@
 
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 
-
 /**
  * A change that needs to reference another node
  */

diff --git a/Classes/Domain/Service/NodePropertyConverterService.php b/Classes/Domain/Service/NodePropertyConverterService.php
@@ -144,7 +144,7 @@ public function getProperty(Node $node, $propertyName)
             );
 
             return $this->toNodeIdentifierStrings($references);
-        // Here, the normal property access logic starts.
+            // Here, the normal property access logic starts.
         } elseif ($propertyName[0] === '_' && $propertyName !== '_hiddenInIndex') {
             $propertyValue = ObjectAccess::getProperty($node, ltrim($propertyName, '_'));
         } else {

diff --git a/Classes/Fusion/Helper/NodeInfoHelper.php b/Classes/Fusion/Helper/NodeInfoHelper.php
@@ -271,8 +271,8 @@ protected function renderChildrenInformation(Node $node, string $nodeTypeFilterS
         // child nodes for content tree, must not include those nodes filtered out by `baseNodeType`
         $contentChildNodes = $subgraph->findChildNodes(
             $node->nodeAggregateId,
-            FindChildNodesFilter::create(nodeTypeConstraints:
-                $this->buildContentChildNodeFilterString()
+            FindChildNodesFilter::create(
+                nodeTypeConstraints: $this->buildContentChildNodeFilterString()
             )
         );
         $childNodes = $documentChildNodes->merge($contentChildNodes);

diff --git a/Classes/Service/PublishingService.php b/Classes/Service/PublishingService.php
@@ -38,7 +38,7 @@ public function publishWorkspace(ContentRepository $contentRepository, Workspace
         )->block();
 
         $contentRepository->handle(
-            new PublishWorkspace(
+            PublishWorkspace::create(
                 $workspaceName
             )
         )->block();
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,6 @@ @@
      */
     class WorkspaceService
     {
         /**
          * @Flow\Inject
          * @var UserService
@@ Expand Down @@