TASK: Move Conflicts concept to Application\Shared namespace

This moves the classes `ConflictsOccurred`, `Conflict`, `Conflicts`, `ConflictsBuilder`, `ReasonForConflict`, `TypeOfChange` and `IconLabel` into the `Application\Shared` namespace and adjusts all references accordingly. These classes are going to be reused by multiple command handlers.
neos · Apr 22, 2024 · aa2617c · aa2617c
1 parent 3069277
commit aa2617c
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 14 deletions.
diff --git a/...es/Application/SyncWorkspace/Conflict.php → Classes/Application/Shared/Conflict.php b/...es/Application/SyncWorkspace/Conflict.php → Classes/Application/Shared/Conflict.php
@@ -12,7 +12,7 @@
 
 declare(strict_types=1);
 
-namespace Neos\Neos\Ui\Application\SyncWorkspace;
+namespace Neos\Neos\Ui\Application\Shared;
 
 use Neos\Flow\Annotations as Flow;
 

diff --git a/...s/Application/SyncWorkspace/Conflicts.php → Classes/Application/Shared/Conflicts.php b/...s/Application/SyncWorkspace/Conflicts.php → Classes/Application/Shared/Conflicts.php
@@ -12,7 +12,7 @@
 
 declare(strict_types=1);
 
-namespace Neos\Neos\Ui\Application\SyncWorkspace;
+namespace Neos\Neos\Ui\Application\Shared;
 
 use Neos\ContentRepository\Core\ContentRepository;
 use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint;

diff --git a/...cation/SyncWorkspace/ConflictsBuilder.php → ...s/Application/Shared/ConflictsBuilder.php b/...cation/SyncWorkspace/ConflictsBuilder.php → ...s/Application/Shared/ConflictsBuilder.php
@@ -12,7 +12,7 @@
 
 declare(strict_types=1);
 
-namespace Neos\Neos\Ui\Application\SyncWorkspace;
+namespace Neos\Neos\Ui\Application\Shared;
 
 use Neos\ContentRepository\Core\CommandHandler\CommandInterface;
 use Neos\ContentRepository\Core\ContentRepository;
@@ -31,7 +31,6 @@
 use Neos\ContentRepository\Core\Feature\NodeVariation\Command\CreateNodeVariant;
 use Neos\ContentRepository\Core\Feature\SubtreeTagging\Command\TagSubtree;
 use Neos\ContentRepository\Core\Feature\SubtreeTagging\Command\UntagSubtree;
-use Neos\ContentRepository\Core\Feature\WorkspaceRebase\CommandsThatFailedDuringRebase;
 use Neos\ContentRepository\Core\Feature\WorkspaceRebase\CommandThatFailedDuringRebase;
 use Neos\ContentRepository\Core\Projection\ContentGraph\ContentSubgraphInterface;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\FindClosestNodeFilter;
@@ -44,11 +43,6 @@
 use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
 use Neos\Flow\Annotations as Flow;
 use Neos\Neos\Domain\Service\NodeTypeNameFactory;
-use Neos\Neos\Ui\Application\SyncWorkspace\Conflict;
-use Neos\Neos\Ui\Application\SyncWorkspace\Conflicts;
-use Neos\Neos\Ui\Application\SyncWorkspace\IconLabel;
-use Neos\Neos\Ui\Application\SyncWorkspace\ReasonForConflict;
-use Neos\Neos\Ui\Application\SyncWorkspace\TypeOfChange;
 
 /**
  * @internal

diff --git a/...ation/SyncWorkspace/ConflictsOccurred.php → .../Application/Shared/ConflictsOccurred.php b/...ation/SyncWorkspace/ConflictsOccurred.php → .../Application/Shared/ConflictsOccurred.php
@@ -12,7 +12,7 @@
 
 declare(strict_types=1);
 
-namespace Neos\Neos\Ui\Application\SyncWorkspace;
+namespace Neos\Neos\Ui\Application\Shared;
 
 /**
  * @internal for communication within the Neos UI only

diff --git a/...s/Application/SyncWorkspace/IconLabel.php → Classes/Application/Shared/IconLabel.php b/...s/Application/SyncWorkspace/IconLabel.php → Classes/Application/Shared/IconLabel.php
@@ -12,7 +12,7 @@
 
 declare(strict_types=1);
 
-namespace Neos\Neos\Ui\Application\SyncWorkspace;
+namespace Neos\Neos\Ui\Application\Shared;
 
 use Neos\Flow\Annotations as Flow;
 

diff --git a/...ation/SyncWorkspace/ReasonForConflict.php → .../Application/Shared/ReasonForConflict.php b/...ation/SyncWorkspace/ReasonForConflict.php → .../Application/Shared/ReasonForConflict.php
@@ -12,7 +12,7 @@
 
 declare(strict_types=1);
 
-namespace Neos\Neos\Ui\Application\SyncWorkspace;
+namespace Neos\Neos\Ui\Application\Shared;
 
 /**
  * @internal for communication within the Neos UI only

diff --git a/...pplication/SyncWorkspace/TypeOfChange.php → Classes/Application/Shared/TypeOfChange.php b/...pplication/SyncWorkspace/TypeOfChange.php → Classes/Application/Shared/TypeOfChange.php
@@ -12,7 +12,7 @@
 
 declare(strict_types=1);
 
-namespace Neos\Neos\Ui\Application\SyncWorkspace;
+namespace Neos\Neos\Ui\Application\Shared;
 
 /**
  * @internal for communication within the Neos UI only

diff --git a/Classes/Application/SyncWorkspace/SyncWorkspaceCommandHandler.php b/Classes/Application/SyncWorkspace/SyncWorkspaceCommandHandler.php
@@ -18,6 +18,8 @@
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Flow\Annotations as Flow;
 use Neos\Neos\Domain\Workspace\WorkspaceProvider;
+use Neos\Neos\Ui\Application\Shared\Conflicts;
+use Neos\Neos\Ui\Application\Shared\ConflictsOccurred;
 
 /**
  * The application layer level command handler to for rebasing the workspace
@@ -33,6 +35,9 @@ final class SyncWorkspaceCommandHandler
     #[Flow\Inject]
     protected WorkspaceProvider $workspaceProvider;
 
+    /**
+     * @throws ConflictsOccurred
+     */
     public function handle(SyncWorkspaceCommand $command): void
     {
         try {

diff --git a/Classes/Controller/BackendServiceController.php b/Classes/Controller/BackendServiceController.php
@@ -44,7 +44,7 @@
 use Neos\Neos\Ui\Application\PublishChangesInSite;
 use Neos\Neos\Ui\Application\ReloadNodes\ReloadNodesQuery;
 use Neos\Neos\Ui\Application\ReloadNodes\ReloadNodesQueryHandler;
-use Neos\Neos\Ui\Application\SyncWorkspace\ConflictsOccurred;
+use Neos\Neos\Ui\Application\Shared\ConflictsOccurred;
 use Neos\Neos\Ui\Application\SyncWorkspace\SyncWorkspaceCommand;
 use Neos\Neos\Ui\Application\SyncWorkspace\SyncWorkspaceCommandHandler;
 use Neos\Neos\Ui\ContentRepository\Service\NeosUiNodeService;