TASK: Adjust to rename EventThatFailedDuringRebase to `ConflictingE…

…vent`
neos · Nov 9, 2024 · c2e9f67 · c2e9f67
1 parent e2ee696
commit c2e9f67
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Classes/Infrastructure/ContentRepository/ConflictsFactory.php b/Classes/Infrastructure/ContentRepository/ConflictsFactory.php
@@ -27,7 +27,7 @@
 use Neos\ContentRepository\Core\Feature\NodeVariation\Event\NodePeerVariantWasCreated;
 use Neos\ContentRepository\Core\Feature\SubtreeTagging\Event\SubtreeWasTagged;
 use Neos\ContentRepository\Core\Feature\SubtreeTagging\Event\SubtreeWasUntagged;
-use Neos\ContentRepository\Core\Feature\WorkspaceRebase\EventThatFailedDuringRebase;
+use Neos\ContentRepository\Core\Feature\WorkspaceRebase\ConflictingEvent;
 use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Exception\WorkspaceRebaseFailed;
 use Neos\ContentRepository\Core\NodeType\NodeTypeManager;
 use Neos\ContentRepository\Core\Projection\ContentGraph\ContentSubgraphInterface;
@@ -76,7 +76,7 @@ public function fromWorkspaceRebaseFailed(
         /** @var array<string,Conflict> */
         $conflictsByKey = [];
 
-        foreach ($workspaceRebaseFailed->eventsThatFailedDuringRebase as $eventThatFailedDuringRebase) {
+        foreach ($workspaceRebaseFailed->conflictingEvents as $eventThatFailedDuringRebase) {
             $conflict = $this->createConflictFromEventThatFailedDuringRebase($eventThatFailedDuringRebase);
             if (array_key_exists($conflict->key, $conflictsByKey)) {
                 // deduplicate if the conflict affects the same node
@@ -88,7 +88,7 @@ public function fromWorkspaceRebaseFailed(
     }
 
     private function createConflictFromEventThatFailedDuringRebase(
-        EventThatFailedDuringRebase $eventThatFailedDuringRebase
+        ConflictingEvent $eventThatFailedDuringRebase
     ): Conflict {
         $nodeAggregateId = $eventThatFailedDuringRebase->getAffectedNodeAggregateId();
         $subgraph = $this->acquireSubgraph(