Merge pull request #3876 from neos/feature/simplify-command-handling

skurfuerst · web-flow · commit 019aef079427 · 2022-09-02T12:01:42.000+02:00
9.0: TASK: Simplify command handler resolution
diff --git a/Neos.ContentRepository.Core/Classes/Feature/ContentStreamCommandHandler.php b/Neos.ContentRepository.Core/Classes/Feature/ContentStreamCommandHandler.php
@@ -39,22 +39,16 @@ final class ContentStreamCommandHandler implements CommandHandlerInterface
 {
     public function canHandle(CommandInterface $command): bool
     {
-        return $command instanceof CreateContentStream
-            || $command instanceof ForkContentStream
-            || $command instanceof RemoveContentStream;
+        return method_exists($this, 'handle' . (new \ReflectionClass($command))->getShortName());
     }
 
     public function handle(CommandInterface $command, ContentRepository $contentRepository): EventsToPublish
     {
-        if ($command instanceof CreateContentStream) {
-            return $this->handleCreateContentStream($command, $contentRepository);
-        } elseif ($command instanceof ForkContentStream) {
-            return $this->handleForkContentStream($command, $contentRepository);
-        } elseif ($command instanceof RemoveContentStream) {
-            return $this->handleRemoveContentStream($command, $contentRepository);
-        }
-
-        throw new \RuntimeException('Unsupported command type');
+        return match ($command::class) {
+            CreateContentStream::class => $this->handleCreateContentStream($command, $contentRepository),
+            ForkContentStream::class => $this->handleForkContentStream($command, $contentRepository),
+            RemoveContentStream::class => $this->handleRemoveContentStream($command, $contentRepository),
+        };
     }
 
     /**
@@ -164,4 +158,5 @@ protected function requireContentStreamToExist(
             );
         }
     }
+
 }
diff --git a/Neos.ContentRepository.Core/Classes/Feature/DimensionSpaceAdjustment/DimensionSpaceCommandHandler.php b/Neos.ContentRepository.Core/Classes/Feature/DimensionSpaceAdjustment/DimensionSpaceCommandHandler.php
@@ -51,19 +51,15 @@ public function __construct(
 
     public function canHandle(CommandInterface $command): bool
     {
-        return $command instanceof MoveDimensionSpacePoint
-            || $command instanceof AddDimensionShineThrough;
+        return method_exists($this, 'handle' . (new \ReflectionClass($command))->getShortName());
     }
 
     public function handle(CommandInterface $command, ContentRepository $contentRepository): EventsToPublish
     {
-        if ($command instanceof MoveDimensionSpacePoint) {
-            return $this->handleMoveDimensionSpacePoint($command, $contentRepository);
-        } elseif ($command instanceof AddDimensionShineThrough) {
-            return $this->handleAddDimensionShineThrough($command, $contentRepository);
-        }
-
-        throw new \RuntimeException('Command ' . get_class($command) . ' not supported by this command handler.');
+        return match ($command::class) {
+            MoveDimensionSpacePoint::class => $this->handleMoveDimensionSpacePoint($command, $contentRepository),
+            AddDimensionShineThrough::class => $this->handleAddDimensionShineThrough($command, $contentRepository),
+        };
     }
 
     private function handleMoveDimensionSpacePoint(
diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeAggregateCommandHandler.php b/Neos.ContentRepository.Core/Classes/Feature/NodeAggregateCommandHandler.php
@@ -17,39 +17,39 @@
 use Neos\ContentRepository\Core\CommandHandler\CommandHandlerInterface;
 use Neos\ContentRepository\Core\CommandHandler\CommandInterface;
 use Neos\ContentRepository\Core\ContentRepository;
+use Neos\ContentRepository\Core\DimensionSpace;
 use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet;
 use Neos\ContentRepository\Core\EventStore\EventsToPublish;
-use Neos\ContentRepository\Core\SharedModel\Exception\NodeConstraintException;
+use Neos\ContentRepository\Core\Feature\Common\ConstraintChecks;
+use Neos\ContentRepository\Core\Feature\Common\TetheredNodeInternals;
 use Neos\ContentRepository\Core\Feature\NodeCreation\Command\CreateNodeAggregateWithNode;
 use Neos\ContentRepository\Core\Feature\NodeCreation\Command\CreateNodeAggregateWithNodeAndSerializedProperties;
+use Neos\ContentRepository\Core\Feature\NodeCreation\NodeCreation;
 use Neos\ContentRepository\Core\Feature\NodeDisabling\Command\DisableNodeAggregate;
 use Neos\ContentRepository\Core\Feature\NodeDisabling\Command\EnableNodeAggregate;
+use Neos\ContentRepository\Core\Feature\NodeDisabling\NodeDisabling;
 use Neos\ContentRepository\Core\Feature\NodeModification\Command\SetNodeProperties;
 use Neos\ContentRepository\Core\Feature\NodeModification\Command\SetSerializedNodeProperties;
+use Neos\ContentRepository\Core\Feature\NodeModification\NodeModification;
 use Neos\ContentRepository\Core\Feature\NodeMove\Command\MoveNodeAggregate;
+use Neos\ContentRepository\Core\Feature\NodeMove\NodeMove;
 use Neos\ContentRepository\Core\Feature\NodeReferencing\Command\SetNodeReferences;
 use Neos\ContentRepository\Core\Feature\NodeReferencing\Command\SetSerializedNodeReferences;
-use Neos\ContentRepository\Core\Feature\NodeRemoval\Command\RemoveNodeAggregate;
-use Neos\ContentRepository\Core\Feature\NodeRenaming\Command\ChangeNodeAggregateName;
-use Neos\ContentRepository\Core\Feature\NodeVariation\Command\CreateNodeVariant;
-use Neos\ContentRepository\Core\Feature\RootNodeCreation\Command\CreateRootNodeAggregateWithNode;
-use Neos\ContentRepository\Core\Feature\RootNodeCreation\RootNodeCreation;
-use Neos\ContentRepository\Core\DimensionSpace;
-use Neos\ContentRepository\Core\Feature\NodeTypeChange\Command\ChangeNodeAggregateType;
-use Neos\ContentRepository\Core\Feature\Common\ConstraintChecks;
-use Neos\ContentRepository\Core\Feature\NodeCreation\NodeCreation;
-use Neos\ContentRepository\Core\Feature\NodeDisabling\NodeDisabling;
-use Neos\ContentRepository\Core\Feature\NodeModification\NodeModification;
-use Neos\ContentRepository\Core\Feature\NodeMove\NodeMove;
 use Neos\ContentRepository\Core\Feature\NodeReferencing\NodeReferencing;
+use Neos\ContentRepository\Core\Feature\NodeRemoval\Command\RemoveNodeAggregate;
 use Neos\ContentRepository\Core\Feature\NodeRemoval\NodeRemoval;
+use Neos\ContentRepository\Core\Feature\NodeRenaming\Command\ChangeNodeAggregateName;
 use Neos\ContentRepository\Core\Feature\NodeRenaming\NodeRenaming;
+use Neos\ContentRepository\Core\Feature\NodeTypeChange\Command\ChangeNodeAggregateType;
 use Neos\ContentRepository\Core\Feature\NodeTypeChange\NodeTypeChange;
+use Neos\ContentRepository\Core\Feature\NodeVariation\Command\CreateNodeVariant;
 use Neos\ContentRepository\Core\Feature\NodeVariation\NodeVariation;
-use Neos\ContentRepository\Core\Feature\Common\TetheredNodeInternals;
-use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate;
-use Neos\ContentRepository\Core\NodeType\NodeTypeManager;
+use Neos\ContentRepository\Core\Feature\RootNodeCreation\Command\CreateRootNodeAggregateWithNode;
+use Neos\ContentRepository\Core\Feature\RootNodeCreation\RootNodeCreation;
 use Neos\ContentRepository\Core\Infrastructure\Property\PropertyConverter;
+use Neos\ContentRepository\Core\NodeType\NodeTypeManager;
+use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate;
+use Neos\ContentRepository\Core\SharedModel\Exception\NodeConstraintException;
 
 /**
  * @internal from userland, you'll use ContentRepository::handle to dispatch commands
@@ -106,23 +106,9 @@ public function __construct(
 
     public function canHandle(CommandInterface $command): bool
     {
-        return $command instanceof SetNodeProperties
-            || $command instanceof SetSerializedNodeProperties
-            || $command instanceof SetNodeReferences
-            || $command instanceof SetSerializedNodeReferences
-            || $command instanceof ChangeNodeAggregateType
-            || $command instanceof RemoveNodeAggregate
-            || $command instanceof CreateNodeAggregateWithNode
-            || $command instanceof CreateNodeAggregateWithNodeAndSerializedProperties
-            || $command instanceof MoveNodeAggregate
-            || $command instanceof CreateNodeVariant
-            || $command instanceof CreateRootNodeAggregateWithNode
-            || $command instanceof DisableNodeAggregate
-            || $command instanceof EnableNodeAggregate
-            || $command instanceof ChangeNodeAggregateName;
+        return method_exists($this, 'handle' . (new \ReflectionClass($command))->getShortName());
     }
 
-    /** @codingStandardsIgnoreStart */
     public function handle(CommandInterface $command, ContentRepository $contentRepository): EventsToPublish
     {
         // @phpstan-ignore-next-line
@@ -143,7 +129,6 @@ public function handle(CommandInterface $command, ContentRepository $contentRepo
             ChangeNodeAggregateName::class => $this->handleChangeNodeAggregateName($command),
         };
     }
-    /** @codingStandardsIgnoreStop */
 
     protected function getNodeTypeManager(): NodeTypeManager
     {
@@ -253,4 +238,5 @@ protected function checkConstraintsImposedByAncestors(ChangeNodeAggregateType $c
             }
         }
     }
+
 }
diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeCreation/NodeCreation.php b/Neos.ContentRepository.Core/Classes/Feature/NodeCreation/NodeCreation.php
@@ -15,34 +15,31 @@
 namespace Neos\ContentRepository\Core\Feature\NodeCreation;
 
 use Neos\ContentRepository\Core\ContentRepository;
+use Neos\ContentRepository\Core\DimensionSpace;
 use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet;
 use Neos\ContentRepository\Core\EventStore\Events;
 use Neos\ContentRepository\Core\EventStore\EventsToPublish;
+use Neos\ContentRepository\Core\Feature\Common\NodeAggregateEventPublisher;
 use Neos\ContentRepository\Core\Feature\ContentStreamEventStreamName;
-use Neos\ContentRepository\Core\NodeType\NodeType;
-use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
-use Neos\ContentRepository\Core\SharedModel\Node\NodeName;
-use Neos\ContentRepository\Core\Projection\ContentGraph\NodePath;
-use Neos\ContentRepository\Core\NodeType\NodeTypeName;
-use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFoundException;
-use Neos\ContentRepository\Core\Infrastructure\Property\PropertyConverter;
-use Neos\ContentRepository\Core\DimensionSpace;
-use Neos\ContentRepository\Core\SharedModel\Exception\ContentStreamDoesNotExistYet;
 use Neos\ContentRepository\Core\Feature\NodeCreation\Command\CreateNodeAggregateWithNode;
-
-/** @codingStandardsIgnoreStart */
 use Neos\ContentRepository\Core\Feature\NodeCreation\Command\CreateNodeAggregateWithNodeAndSerializedProperties;
-/** @codingStandardsIgnoreEnd */
-use Neos\ContentRepository\Core\Feature\NodeCreation\Event\NodeAggregateWithNodeWasCreated;
-use Neos\ContentRepository\Core\SharedModel\Exception\PropertyCannotBeSet;
-use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateClassification;
-use Neos\ContentRepository\Core\Feature\Common\NodeAggregateEventPublisher;
 use Neos\ContentRepository\Core\Feature\NodeCreation\Dto\NodeAggregateIdsByNodePaths;
-use Neos\ContentRepository\Core\SharedModel\Node\PropertyName;
+use Neos\ContentRepository\Core\Feature\NodeCreation\Event\NodeAggregateWithNodeWasCreated;
+use Neos\ContentRepository\Core\Feature\NodeModification\Dto\PropertyValuesToWrite;
 use Neos\ContentRepository\Core\Feature\NodeModification\Dto\SerializedPropertyValue;
 use Neos\ContentRepository\Core\Feature\NodeModification\Dto\SerializedPropertyValues;
-use Neos\ContentRepository\Core\Feature\NodeModification\Dto\PropertyValuesToWrite;
+use Neos\ContentRepository\Core\Infrastructure\Property\PropertyConverter;
 use Neos\ContentRepository\Core\Infrastructure\Property\PropertyType;
+use Neos\ContentRepository\Core\NodeType\NodeType;
+use Neos\ContentRepository\Core\NodeType\NodeTypeName;
+use Neos\ContentRepository\Core\Projection\ContentGraph\NodePath;
+use Neos\ContentRepository\Core\SharedModel\Exception\ContentStreamDoesNotExistYet;
+use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFoundException;
+use Neos\ContentRepository\Core\SharedModel\Exception\PropertyCannotBeSet;
+use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateClassification;
+use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
+use Neos\ContentRepository\Core\SharedModel\Node\NodeName;
+use Neos\ContentRepository\Core\SharedModel\Node\PropertyName;
 use Neos\EventStore\Model\EventStream\ExpectedVersion;
 
 /**
diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeDuplication/NodeDuplicationCommandHandler.php b/Neos.ContentRepository.Core/Classes/Feature/NodeDuplication/NodeDuplicationCommandHandler.php
@@ -32,7 +32,6 @@
 use Neos\ContentRepository\Core\Feature\Common\ConstraintChecks;
 use Neos\ContentRepository\Core\Feature\Common\NodeAggregateEventPublisher;
 use Neos\ContentRepository\Core\DimensionSpace\OriginDimensionSpacePoint;
-use Neos\ContentRepository\Core\Feature\NodeDuplication\Dto\NodeAggregateIdMapping;
 use Neos\ContentRepository\Core\SharedModel\User\UserId;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\ContentRepository\Core\Feature\NodeDuplication\Command\CopyNodesRecursively;
@@ -62,19 +61,16 @@ protected function getAllowedDimensionSubspace(): DimensionSpacePointSet
         return $this->contentDimensionZookeeper->getAllowedDimensionSubspace();
     }
 
-
     public function canHandle(CommandInterface $command): bool
     {
-        return $command instanceof CopyNodesRecursively;
+        return method_exists($this, 'handle' . (new \ReflectionClass($command))->getShortName());
     }
 
     public function handle(CommandInterface $command, ContentRepository $contentRepository): EventsToPublish
     {
-        if ($command instanceof CopyNodesRecursively) {
-            return $this->handleCopyNodesRecursively($command, $contentRepository);
-        }
-
-        throw new \RuntimeException('Command not supported');
+        return match ($command::class) {
+            CopyNodesRecursively::class => $this->handleCopyNodesRecursively($command, $contentRepository),
+        };
     }
 
     /**
diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeModification/NodeModification.php b/Neos.ContentRepository.Core/Classes/Feature/NodeModification/NodeModification.php
@@ -28,7 +28,6 @@
 use Neos\ContentRepository\Core\Feature\NodeModification\Event\NodePropertiesWereSet;
 use Neos\ContentRepository\Core\Feature\Common\NodeAggregateEventPublisher;
 use Neos\ContentRepository\Core\Feature\NodeModification\Dto\PropertyScope;
-use Neos\ContentRepository\Core\SharedModel\Node\ReadableNodeAggregateInterface;
 use Neos\EventStore\Model\EventStream\ExpectedVersion;
 
 /**
diff --git a/Neos.ContentRepository.Core/Classes/Feature/NodeTypeChange/NodeTypeChange.php b/Neos.ContentRepository.Core/Classes/Feature/NodeTypeChange/NodeTypeChange.php
@@ -16,34 +16,31 @@
 
 use Neos\ContentRepository\Core\ContentRepository;
 use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet;
+use Neos\ContentRepository\Core\DimensionSpace\OriginDimensionSpacePointSet;
 use Neos\ContentRepository\Core\EventStore\Events;
 use Neos\ContentRepository\Core\EventStore\EventsToPublish;
-use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate;
-use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
-use Neos\ContentRepository\Core\Projection\ContentGraph\NodePath;
-use Neos\ContentRepository\Core\NodeType\NodeType;
-use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
-use Neos\ContentRepository\Core\SharedModel\Node\NodeName;
-use Neos\ContentRepository\Core\DimensionSpace\OriginDimensionSpacePointSet;
-use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
-use Neos\ContentRepository\Core\SharedModel\Exception\NodeConstraintException;
-use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFoundException;
+use Neos\ContentRepository\Core\Feature\Common\NodeAggregateEventPublisher;
 use Neos\ContentRepository\Core\Feature\ContentStreamEventStreamName;
+use Neos\ContentRepository\Core\Feature\NodeCreation\Dto\NodeAggregateIdsByNodePaths;
+use Neos\ContentRepository\Core\Feature\NodeRemoval\Event\NodeAggregateWasRemoved;
 use Neos\ContentRepository\Core\Feature\NodeTypeChange\Command\ChangeNodeAggregateType;
+use Neos\ContentRepository\Core\Feature\NodeTypeChange\Dto\NodeAggregateTypeChangeChildConstraintConflictResolutionStrategy;
 use Neos\ContentRepository\Core\Feature\NodeTypeChange\Event\NodeAggregateTypeWasChanged;
-use Neos\ContentRepository\Core\Feature\NodeRemoval\Event\NodeAggregateWasRemoved;
+use Neos\ContentRepository\Core\NodeType\NodeType;
+use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
+use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate;
+use Neos\ContentRepository\Core\Projection\ContentGraph\NodePath;
+use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints;
 use Neos\ContentRepository\Core\SharedModel\Exception\NodeAggregatesTypeIsAmbiguous;
+use Neos\ContentRepository\Core\SharedModel\Exception\NodeConstraintException;
 use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFound;
-use Neos\ContentRepository\Core\Feature\Common\NodeAggregateEventPublisher;
-use Neos\ContentRepository\Core\Feature\NodeCreation\Dto\NodeAggregateIdsByNodePaths;
-use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints;
+use Neos\ContentRepository\Core\SharedModel\Exception\NodeTypeNotFoundException;
+use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
+use Neos\ContentRepository\Core\SharedModel\Node\NodeName;
 use Neos\ContentRepository\Core\SharedModel\User\UserId;
+use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
 use Neos\EventStore\Model\EventStream\ExpectedVersion;
 
-/** @codingStandardsIgnoreStart */
-use Neos\ContentRepository\Core\Feature\NodeTypeChange\Dto\NodeAggregateTypeChangeChildConstraintConflictResolutionStrategy;
-/** @codingStandardsIgnoreEnd */
-
 /**
  * @internal implementation detail of Command Handlers
  */
@@ -419,7 +416,7 @@ private function deleteObsoleteTetheredNodesWhenChangingNodeType(
      * Example: In this case, we want to find exactly the bold edge between PAR1 and A.
      *
      *          ╔══════╗ <------ $parentNodeAggregate (PAR1)
-     * ┌──────┐ ║  PAR1║   ┌──────┐
+     * ┌──────┐ ║ PAR1 ║   ┌──────┐
      * │ PAR3 │ ╚══════╝   │ PAR2 │
      * └──────┘    ║       └──────┘
      *        ╲    ║          ╱
diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php

Original file line number	Diff line number	Diff line change
`@@ -39,22 +39,16 @@ final class ContentStreamCommandHandler implements CommandHandlerInterface`
`39`	`39`	`{`
`40`	`40`	`public function canHandle(CommandInterface $command): bool`
`41`	`41`	`{`
`42`		`- return $command instanceof CreateContentStream`
`43`		`- \|\| $command instanceof ForkContentStream`
`44`		`- \|\| $command instanceof RemoveContentStream;`
	`42`	`+ return method_exists($this, 'handle' . (new \ReflectionClass($command))->getShortName());`
`45`	`43`	`}`
`46`	`44`
`47`	`45`	`public function handle(CommandInterface $command, ContentRepository $contentRepository): EventsToPublish`
`48`	`46`	`{`
`49`		`- if ($command instanceof CreateContentStream) {`
`50`		`- return $this->handleCreateContentStream($command, $contentRepository);`
`51`		`- } elseif ($command instanceof ForkContentStream) {`
`52`		`- return $this->handleForkContentStream($command, $contentRepository);`
`53`		`- } elseif ($command instanceof RemoveContentStream) {`
`54`		`- return $this->handleRemoveContentStream($command, $contentRepository);`
`55`		`- }`
`56`		`-`
`57`		`- throw new \RuntimeException('Unsupported command type');`
	`47`	`+ return match ($command::class) {`
	`48`	`+ CreateContentStream::class => $this->handleCreateContentStream($command, $contentRepository),`
	`49`	`+ ForkContentStream::class => $this->handleForkContentStream($command, $contentRepository),`
	`50`	`+ RemoveContentStream::class => $this->handleRemoveContentStream($command, $contentRepository),`
	`51`	`+ };`
`58`	`52`	`}`
`59`	`53`
`60`	`54`	`/**`
`@@ -164,4 +158,5 @@ protected function requireContentStreamToExist(`
`164`	`158`	`);`
`165`	`159`	`}`
`166`	`160`	`}`
	`161`	`+`
`167`	`162`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,19 +51,15 @@ public function __construct(`
`51`	`51`
`52`	`52`	`public function canHandle(CommandInterface $command): bool`
`53`	`53`	`{`
`54`		`- return $command instanceof MoveDimensionSpacePoint`
`55`		`- \|\| $command instanceof AddDimensionShineThrough;`
	`54`	`+ return method_exists($this, 'handle' . (new \ReflectionClass($command))->getShortName());`
`56`	`55`	`}`
`57`	`56`
`58`	`57`	`public function handle(CommandInterface $command, ContentRepository $contentRepository): EventsToPublish`
`59`	`58`	`{`
`60`		`- if ($command instanceof MoveDimensionSpacePoint) {`
`61`		`- return $this->handleMoveDimensionSpacePoint($command, $contentRepository);`
`62`		`- } elseif ($command instanceof AddDimensionShineThrough) {`
`63`		`- return $this->handleAddDimensionShineThrough($command, $contentRepository);`
`64`		`- }`
`65`		`-`
`66`		`- throw new \RuntimeException('Command ' . get_class($command) . ' not supported by this command handler.');`
	`59`	`+ return match ($command::class) {`
	`60`	`+ MoveDimensionSpacePoint::class => $this->handleMoveDimensionSpacePoint($command, $contentRepository),`
	`61`	`+ AddDimensionShineThrough::class => $this->handleAddDimensionShineThrough($command, $contentRepository),`
	`62`	`+ };`
`67`	`63`	`}`
`68`	`64`
`69`	`65`	`private function handleMoveDimensionSpacePoint(`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@`
`32`	`32`	`use Neos\ContentRepository\Core\Feature\Common\ConstraintChecks;`
`33`	`33`	`use Neos\ContentRepository\Core\Feature\Common\NodeAggregateEventPublisher;`
`34`	`34`	`use Neos\ContentRepository\Core\DimensionSpace\OriginDimensionSpacePoint;`
`35`		`-use Neos\ContentRepository\Core\Feature\NodeDuplication\Dto\NodeAggregateIdMapping;`
`36`	`35`	`use Neos\ContentRepository\Core\SharedModel\User\UserId;`
`37`	`36`	`use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;`
`38`	`37`	`use Neos\ContentRepository\Core\Feature\NodeDuplication\Command\CopyNodesRecursively;`
`@@ -62,19 +61,16 @@ protected function getAllowedDimensionSubspace(): DimensionSpacePointSet`
`62`	`61`	`return $this->contentDimensionZookeeper->getAllowedDimensionSubspace();`
`63`	`62`	`}`
`64`	`63`
`65`		`-`
`66`	`64`	`public function canHandle(CommandInterface $command): bool`
`67`	`65`	`{`
`68`		`- return $command instanceof CopyNodesRecursively;`
	`66`	`+ return method_exists($this, 'handle' . (new \ReflectionClass($command))->getShortName());`
`69`	`67`	`}`
`70`	`68`
`71`	`69`	`public function handle(CommandInterface $command, ContentRepository $contentRepository): EventsToPublish`
`72`	`70`	`{`
`73`		`- if ($command instanceof CopyNodesRecursively) {`
`74`		`- return $this->handleCopyNodesRecursively($command, $contentRepository);`
`75`		`- }`
`76`		`-`
`77`		`- throw new \RuntimeException('Command not supported');`
	`71`	`+ return match ($command::class) {`
	`72`	`+ CopyNodesRecursively::class => $this->handleCopyNodesRecursively($command, $contentRepository),`
	`73`	`+ };`
`78`	`74`	`}`
`79`	`75`
`80`	`76`	`/**`