diff --git a/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceProjection.php b/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceProjection.php index a069f587577..b1280fec909 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceProjection.php +++ b/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceProjection.php @@ -291,7 +291,7 @@ private function whenWorkspaceWasRebased(WorkspaceWasRebased $event): void private function whenWorkspaceRebaseFailed(WorkspaceRebaseFailed $event): void { - $this->markWorkspaceAsOutdatedConflict($event->workspaceName); + $this->markWorkspaceAsOutdated($event->workspaceName); } private function whenWorkspaceWasRemoved(WorkspaceWasRemoved $event): void @@ -373,18 +373,4 @@ private function markWorkspaceAsOutdated(WorkspaceName $workspaceName): void 'workspaceName' => $workspaceName->value ]); } - - private function markWorkspaceAsOutdatedConflict(WorkspaceName $workspaceName): void - { - $this->dbal->executeUpdate(' - UPDATE ' . $this->tableName . ' - SET - status = :outdatedConflict - WHERE - workspacename = :workspaceName - ', [ - 'outdatedConflict' => WorkspaceStatus::OUTDATED_CONFLICT->value, - 'workspaceName' => $workspaceName->value - ]); - } } diff --git a/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceStatus.php b/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceStatus.php index 12d3f36e864..0d54606e704 100644 --- a/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceStatus.php +++ b/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceStatus.php @@ -45,18 +45,6 @@ enum WorkspaceStatus: string implements \JsonSerializable */ case OUTDATED = 'OUTDATED'; - /** - * CONFLICT Example: - * - * CONFLICT is a special case of OUTDATED, but then an error happens during the rebasing. - * - * Workspace Review <----------------------------------- Workspace User-Foo - * | . | - * Content Stream A2 (current) <-- Content Stream B2 (rebasing) | - * Content Stream B1 - */ - case OUTDATED_CONFLICT = 'OUTDATED_CONFLICT'; - public function equals(self $other): bool { return $this->value === $other->value;