TASK: Do not try catch countPendingWorkspaceChanges

... because it would lead to hard to debug code and is not expected to fail
neos · Oct 31, 2024 · c86bd58 · c86bd58
1 parent b7f9237
commit c86bd58
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/Neos.Neos/Classes/Command/WorkspaceCommandController.php b/Neos.Neos/Classes/Command/WorkspaceCommandController.php
@@ -398,17 +398,13 @@ public function deleteCommand(string $workspace, bool $force = false, string $co
 
         if ($crWorkspace->hasPublishableChanges()) {
             if ($force === false) {
-                try {
-                    $nodesCount = $this->workspacePublishingService->countPendingWorkspaceChanges($contentRepositoryId, $workspaceName);
-                } catch (\Exception) {
-                    $nodesCount = 'NAN';
-                }
+                $nodesCount = $this->workspacePublishingService->countPendingWorkspaceChanges($contentRepositoryId, $workspaceName);
                 $this->outputLine(
                     'Did not delete workspace "%s" because it contains %s unpublished node(s).'
                     . ' Use --force to delete it nevertheless.',
                     [$workspaceName->value, $nodesCount]
                 );
-                $this->quit(5);
+                $this->quit(4);
             }
             $this->workspacePublishingService->discardAllWorkspaceChanges($contentRepositoryId, $workspaceName);
         }

diff --git a/Neos.Workspace.Ui/Classes/Controller/WorkspaceController.php b/Neos.Workspace.Ui/Classes/Controller/WorkspaceController.php
@@ -374,14 +374,10 @@ public function deleteAction(WorkspaceName $workspaceName): void
         }
 
         if ($workspace->hasPublishableChanges()) {
-            try {
-                $nodesCount = $this->workspacePublishingService->countPendingWorkspaceChanges($contentRepositoryId, $workspaceName);
-            } catch (\Exception) {
-                $nodesCount = null;
-            }
+            $nodesCount = $this->workspacePublishingService->countPendingWorkspaceChanges($contentRepositoryId, $workspaceName);
             $message = $this->translator->translateById(
                 'workspaces.workspaceCannotBeDeletedBecauseOfUnpublishedNodes',
-                [$workspaceMetadata->title->value, $nodesCount ?? 'NAN'],
+                [$workspaceMetadata->title->value, $nodesCount],
                 $nodesCount,
                 null,
                 'Main',