TASK: Remove references to CommandResult in return types

neos · May 17, 2024 · 9eebb1e · 9eebb1e
1 parent 2914f11
commit 9eebb1e
Show file tree

Hide file tree

Showing 16 changed files with 31 additions and 64 deletions.
diff --git a/Neos.ContentRepository.Core/Classes/CommandHandlingDependencies.php b/Neos.ContentRepository.Core/Classes/CommandHandlingDependencies.php
@@ -15,7 +15,6 @@
 namespace Neos\ContentRepository\Core;
 
 use Neos\ContentRepository\Core\CommandHandler\CommandInterface;
-use Neos\ContentRepository\Core\CommandHandler\CommandResult;
 use Neos\ContentRepository\Core\Projection\ContentGraph\ContentGraphInterface;
 use Neos\ContentRepository\Core\Projection\ContentStream\ContentStreamFinder;
 use Neos\ContentRepository\Core\Projection\Workspace\WorkspaceFinder;
@@ -41,9 +40,9 @@ public function __construct(private readonly ContentRepository $contentRepositor
     {
     }
 
-    public function handle(CommandInterface $command): CommandResult
+    public function handle(CommandInterface $command): void
     {
-        return $this->contentRepository->handle($command);
+        $this->contentRepository->handle($command);
     }
 
     public function getWorkspaceFinder(): WorkspaceFinder

diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php
@@ -277,7 +277,7 @@ private function handlePublishWorkspace(
     private function publishContentStream(
         ContentStreamId $contentStreamId,
         ContentStreamId $baseContentStreamId,
-    ): ?CommandResult {
+    ): void {
         $baseWorkspaceContentStreamName = ContentStreamEventStreamName::fromContentStreamId(
             $baseContentStreamId
         );
@@ -322,10 +322,10 @@ private function publishContentStream(
         }
 
         if (count($events) === 0) {
-            return null;
+            return;
         }
         try {
-            return $this->eventPersister->publishEvents(
+            $this->eventPersister->publishEvents(
                 new EventsToPublish(
                     $baseWorkspaceContentStreamName->getEventStreamName(),
                     Events::fromArray($events),

diff --git a/Neos.ContentRepository.Core/Classes/Service/ContentStreamPruner.php b/Neos.ContentRepository.Core/Classes/Service/ContentStreamPruner.php
@@ -4,7 +4,6 @@
 
 namespace Neos\ContentRepository\Core\Service;
 
-use Neos\ContentRepository\Core\CommandHandler\CommandResult;
 use Neos\ContentRepository\Core\ContentRepository;
 use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceInterface;
 use Neos\ContentRepository\Core\Feature\ContentStreamEventStreamName;
@@ -20,8 +19,6 @@
  */
 class ContentStreamPruner implements ContentRepositoryServiceInterface
 {
-    private ?CommandResult $lastCommandResult;
-
     public function __construct(
         private readonly ContentRepository $contentRepository,
         private readonly EventStoreInterface $eventStore,
@@ -51,7 +48,7 @@ public function prune(bool $removeTemporary = false): iterable
         );
 
         foreach ($unusedContentStreams as $contentStream) {
-            $this->lastCommandResult = $this->contentRepository->handle(
+            $this->contentRepository->handle(
                 RemoveContentStream::create($contentStream)
             );
         }
@@ -93,9 +90,4 @@ public function pruneAll(): void
             $this->eventStore->deleteStream($streamName);
         }
     }
-
-    public function getLastCommandResult(): ?CommandResult
-    {
-        return $this->lastCommandResult;
-    }
 }
diff --git a/...sitory.NodeMigration/src/Transformation/AddDimensionShineThroughTransformationFactory.php b/...sitory.NodeMigration/src/Transformation/AddDimensionShineThroughTransformationFactory.php
@@ -14,7 +14,6 @@
 
 namespace Neos\ContentRepository\NodeMigration\Transformation;
 
-use Neos\ContentRepository\Core\CommandHandler\CommandResult;
 use Neos\ContentRepository\Core\ContentRepository;
 use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint;
 use Neos\ContentRepository\Core\Feature\DimensionSpaceAdjustment\Command\AddDimensionShineThrough;
@@ -50,8 +49,8 @@ public function __construct(
 
             public function execute(
                 WorkspaceName $workspaceNameForWriting,
-            ): CommandResult {
-                return $this->contentRepository->handle(
+            ): void {
+                $this->contentRepository->handle(
                     AddDimensionShineThrough::create(
                         $workspaceNameForWriting,
                         $this->from,

diff --git a/...ontentRepository.NodeMigration/src/Transformation/AddNewPropertyTransformationFactory.php b/...ontentRepository.NodeMigration/src/Transformation/AddNewPropertyTransformationFactory.php
@@ -14,7 +14,6 @@
 
 namespace Neos\ContentRepository\NodeMigration\Transformation;
 
-use Neos\ContentRepository\Core\CommandHandler\CommandResult;
 use Neos\ContentRepository\Core\ContentRepository;
 use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet;
 use Neos\ContentRepository\Core\Feature\NodeModification\Command\SetSerializedNodeProperties;
@@ -59,14 +58,14 @@ public function execute(
                 DimensionSpacePointSet $coveredDimensionSpacePoints,
                 WorkspaceName $workspaceNameForWriting,
                 ContentStreamId $contentStreamForWriting
-            ): ?CommandResult {
+            ): void {
                 if ($this->serializedValue === null) {
                     // we don't need to unset a non-existing property
-                    return null;
+                    return;
                 }
 
                 if (!$node->hasProperty($this->newPropertyName)) {
-                    return $this->contentRepository->handle(
+                    $this->contentRepository->handle(
                         SetSerializedNodeProperties::create(
                             $workspaceNameForWriting,
                             $node->nodeAggregateId,
@@ -81,8 +80,6 @@ public function execute(
                         )
                     );
                 }
-
-                return null;
             }
         };
     }

diff --git a/...ontentRepository.NodeMigration/src/Transformation/ChangeNodeTypeTransformationFactory.php b/...ontentRepository.NodeMigration/src/Transformation/ChangeNodeTypeTransformationFactory.php
@@ -14,7 +14,6 @@
 
 namespace Neos\ContentRepository\NodeMigration\Transformation;
 
-use Neos\ContentRepository\Core\CommandHandler\CommandResult;
 use Neos\ContentRepository\Core\ContentRepository;
 use Neos\ContentRepository\Core\Feature\NodeTypeChange\Command\ChangeNodeAggregateType;
 use Neos\ContentRepository\Core\Feature\NodeTypeChange\Dto\NodeAggregateTypeChangeChildConstraintConflictResolutionStrategy;
@@ -65,8 +64,8 @@ public function execute(
                 NodeAggregate $nodeAggregate,
                 WorkspaceName $workspaceNameForWriting,
                 ContentStreamId $contentStreamForWriting
-            ): CommandResult {
-                return $this->contentRepository->handle(ChangeNodeAggregateType::create(
+            ): void {
+                $this->contentRepository->handle(ChangeNodeAggregateType::create(
                     $workspaceNameForWriting,
                     $nodeAggregate->nodeAggregateId,
                     NodeTypeName::fromString($this->newType),

diff --git a/...tRepository.NodeMigration/src/Transformation/ChangePropertyValueTransformationFactory.php b/...tRepository.NodeMigration/src/Transformation/ChangePropertyValueTransformationFactory.php
@@ -14,7 +14,6 @@
 
 namespace Neos\ContentRepository\NodeMigration\Transformation;
 
-use Neos\ContentRepository\Core\CommandHandler\CommandResult;
 use Neos\ContentRepository\Core\ContentRepository;
 use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet;
 use Neos\ContentRepository\Core\Feature\NodeModification\Command\SetSerializedNodeProperties;
@@ -106,7 +105,7 @@ public function execute(
                 DimensionSpacePointSet $coveredDimensionSpacePoints,
                 WorkspaceName $workspaceNameForWriting,
                 ContentStreamId $contentStreamForWriting
-            ): ?CommandResult {
+            ): void {
                 $currentProperty = $node->properties->serialized()->getProperty($this->propertyName);
                 if ($currentProperty !== null) {
                     $value = $currentProperty->value;
@@ -128,7 +127,7 @@ public function execute(
                         $newValueWithReplacedCurrentValue
                     );
 
-                    return $this->contentRepository->handle(
+                    $this->contentRepository->handle(
                         SetSerializedNodeProperties::create(
                             $workspaceNameForWriting,
                             $node->nodeAggregateId,
@@ -143,8 +142,6 @@ public function execute(
                         )
                     );
                 }
-
-                return null;
             }
         };
     }

diff --git a/Neos.ContentRepository.NodeMigration/src/Transformation/GlobalTransformationInterface.php b/Neos.ContentRepository.NodeMigration/src/Transformation/GlobalTransformationInterface.php
@@ -14,8 +14,6 @@
 
 namespace Neos\ContentRepository\NodeMigration\Transformation;
 
-use Neos\ContentRepository\Core\CommandHandler\CommandResult;
-use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
 use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
 
 /**
@@ -27,5 +25,5 @@ interface GlobalTransformationInterface
 {
     public function execute(
         WorkspaceName $workspaceNameForWriting,
-    ): CommandResult;
+    ): void;
 }
diff --git a/...ository.NodeMigration/src/Transformation/MoveDimensionSpacePointTransformationFactory.php b/...ository.NodeMigration/src/Transformation/MoveDimensionSpacePointTransformationFactory.php
@@ -14,7 +14,6 @@
 
 namespace Neos\ContentRepository\NodeMigration\Transformation;
 
-use Neos\ContentRepository\Core\CommandHandler\CommandResult;
 use Neos\ContentRepository\Core\ContentRepository;
 use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint;
 use Neos\ContentRepository\Core\Feature\DimensionSpaceAdjustment\Command\MoveDimensionSpacePoint;
@@ -48,8 +47,8 @@ public function __construct(
 
             public function execute(
                 WorkspaceName $workspaceNameForWriting,
-            ): CommandResult {
-                return $this->contentRepository->handle(
+            ): void {
+                $this->contentRepository->handle(
                     MoveDimensionSpacePoint::create(
                         $workspaceNameForWriting,
                         $this->from,

diff --git a/...Repository.NodeMigration/src/Transformation/NodeAggregateBasedTransformationInterface.php b/...Repository.NodeMigration/src/Transformation/NodeAggregateBasedTransformationInterface.php
@@ -14,7 +14,6 @@
 
 namespace Neos\ContentRepository\NodeMigration\Transformation;
 
-use Neos\ContentRepository\Core\CommandHandler\CommandResult;
 use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate;
 use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
 use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
@@ -30,5 +29,5 @@ public function execute(
         NodeAggregate $nodeAggregate,
         WorkspaceName $workspaceNameForWriting,
         ContentStreamId $contentStreamForWriting
-    ): CommandResult;
+    ): void;
 }
diff --git a/Neos.ContentRepository.NodeMigration/src/Transformation/NodeBasedTransformationInterface.php b/Neos.ContentRepository.NodeMigration/src/Transformation/NodeBasedTransformationInterface.php
@@ -14,7 +14,6 @@
 
 namespace Neos\ContentRepository\NodeMigration\Transformation;
 
-use Neos\ContentRepository\Core\CommandHandler\CommandResult;
 use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
@@ -32,5 +31,5 @@ public function execute(
         DimensionSpacePointSet $coveredDimensionSpacePoints,
         WorkspaceName $workspaceNameForWriting,
         ContentStreamId $contentStreamForWriting
-    ): ?CommandResult;
+    ): void;
 }
diff --git a/Neos.ContentRepository.NodeMigration/src/Transformation/RemoveNodeTransformationFactory.php b/Neos.ContentRepository.NodeMigration/src/Transformation/RemoveNodeTransformationFactory.php
@@ -14,7 +14,6 @@
 
 namespace Neos\ContentRepository\NodeMigration\Transformation;
 
-use Neos\ContentRepository\Core\CommandHandler\CommandResult;
 use Neos\ContentRepository\Core\ContentRepository;
 use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint;
 use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet;
@@ -66,7 +65,7 @@ public function execute(
                 DimensionSpacePointSet $coveredDimensionSpacePoints,
                 WorkspaceName $workspaceNameForWriting,
                 ContentStreamId $contentStreamForWriting
-            ): ?CommandResult {
+            ): void {
                 if ($this->strategy === null) {
                     $this->strategy = NodeVariantSelectionStrategy::STRATEGY_ALL_SPECIALIZATIONS;
                 }
@@ -84,10 +83,10 @@ public function execute(
                 if (!$coveredDimensionSpacePoints->contains($coveredDimensionSpacePoint)) {
                     // we are currently in a Node which has other covered dimension space points than the target ones,
                     // so we do not need to do anything.
-                    return null;
+                    return;
                 }
 
-                return $this->contentRepository->handle(RemoveNodeAggregate::create(
+                $this->contentRepository->handle(RemoveNodeAggregate::create(
                     $workspaceNameForWriting,
                     $node->nodeAggregateId,
                     $coveredDimensionSpacePoint,

diff --git a/...ontentRepository.NodeMigration/src/Transformation/RemovePropertyTransformationFactory.php b/...ontentRepository.NodeMigration/src/Transformation/RemovePropertyTransformationFactory.php
@@ -14,7 +14,6 @@
 
 namespace Neos\ContentRepository\NodeMigration\Transformation;
 
-use Neos\ContentRepository\Core\CommandHandler\CommandResult;
 use Neos\ContentRepository\Core\ContentRepository;
 use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet;
 use Neos\ContentRepository\Core\Feature\NodeModification\Command\SetSerializedNodeProperties;
@@ -54,9 +53,9 @@ public function execute(
                 DimensionSpacePointSet $coveredDimensionSpacePoints,
                 WorkspaceName $workspaceNameForWriting,
                 ContentStreamId $contentStreamForWriting
-            ): ?CommandResult {
+            ): void {
                 if ($node->hasProperty($this->propertyName)) {
-                    return $this->contentRepository->handle(
+                    $this->contentRepository->handle(
                         SetSerializedNodeProperties::create(
                             $workspaceNameForWriting,
                             $node->nodeAggregateId,
@@ -66,8 +65,6 @@ public function execute(
                         )
                     );
                 }
-
-                return null;
             }
         };
     }

diff --git a/...tRepository.NodeMigration/src/Transformation/RenameNodeAggregateTransformationFactory.php b/...tRepository.NodeMigration/src/Transformation/RenameNodeAggregateTransformationFactory.php
@@ -14,7 +14,6 @@
 
 namespace Neos\ContentRepository\NodeMigration\Transformation;
 
-use Neos\ContentRepository\Core\CommandHandler\CommandResult;
 use Neos\ContentRepository\Core\ContentRepository;
 use Neos\ContentRepository\Core\Feature\NodeRenaming\Command\ChangeNodeAggregateName;
 use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate;
@@ -50,8 +49,8 @@ public function execute(
                 NodeAggregate $nodeAggregate,
                 WorkspaceName $workspaceNameForWriting,
                 ContentStreamId $contentStreamForWriting
-            ): CommandResult {
-                return $this->contentRepository->handle(ChangeNodeAggregateName::create(
+            ): void {
+                $this->contentRepository->handle(ChangeNodeAggregateName::create(
                     $workspaceNameForWriting,
                     $nodeAggregate->nodeAggregateId,
                     NodeName::fromString($this->newNodeName),

diff --git a/...ontentRepository.NodeMigration/src/Transformation/RenamePropertyTransformationFactory.php b/...ontentRepository.NodeMigration/src/Transformation/RenamePropertyTransformationFactory.php
@@ -14,7 +14,6 @@
 
 namespace Neos\ContentRepository\NodeMigration\Transformation;
 
-use Neos\ContentRepository\Core\CommandHandler\CommandResult;
 use Neos\ContentRepository\Core\ContentRepository;
 use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet;
 use Neos\ContentRepository\Core\Feature\NodeModification\Command\SetSerializedNodeProperties;
@@ -61,11 +60,11 @@ public function execute(
                 DimensionSpacePointSet $coveredDimensionSpacePoints,
                 WorkspaceName $workspaceNameForWriting,
                 ContentStreamId $contentStreamForWriting
-            ): ?CommandResult
+            ): void
             {
                 $serializedPropertyValue = $node->properties->serialized()->getProperty($this->from);
                 if ($serializedPropertyValue !== null) {
-                    return $this->contentRepository->handle(
+                    $this->contentRepository->handle(
                         SetSerializedNodeProperties::create(
                             $workspaceNameForWriting,
                             $node->nodeAggregateId,
@@ -77,8 +76,6 @@ public function execute(
                         )
                     );
                 }
-
-                return null;
             }
         };
     }

diff --git a/...tRepository.NodeMigration/src/Transformation/StripTagsOnPropertyTransformationFactory.php b/...tRepository.NodeMigration/src/Transformation/StripTagsOnPropertyTransformationFactory.php
@@ -14,7 +14,6 @@
 
 namespace Neos\ContentRepository\NodeMigration\Transformation;
 
-use Neos\ContentRepository\Core\CommandHandler\CommandResult;
 use Neos\ContentRepository\Core\ContentRepository;
 use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet;
 use Neos\ContentRepository\Core\Feature\NodeModification\Command\SetSerializedNodeProperties;
@@ -55,7 +54,7 @@ public function execute(
                 DimensionSpacePointSet $coveredDimensionSpacePoints,
                 WorkspaceName $workspaceNameForWriting,
                 ContentStreamId $contentStreamForWriting
-            ): ?CommandResult {
+            ): void {
                 $serializedPropertyValue = $node->properties->serialized()->getProperty($this->propertyName);
                 if ($serializedPropertyValue !== null) {
                     $propertyValue = $serializedPropertyValue->value;
@@ -66,7 +65,7 @@ public function execute(
                         );
                     }
                     $newValue = strip_tags($propertyValue);
-                    return $this->contentRepository->handle(
+                    $this->contentRepository->handle(
                         SetSerializedNodeProperties::create(
                             $workspaceNameForWriting,
                             $node->nodeAggregateId,
@@ -81,8 +80,6 @@ public function execute(
                         )
                     );
                 }
-
-                return null;
             }
         };
     }