TASK: Adjust to rename EventThatFailedDuringRebase to `ConflictingE…

…vent` 2
neos · Nov 9, 2024 · 9175b0e · 9175b0e
1 parent c2e9f67
commit 9175b0e
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/Classes/Infrastructure/ContentRepository/ConflictsFactory.php b/Classes/Infrastructure/ContentRepository/ConflictsFactory.php
@@ -87,12 +87,12 @@ public function fromWorkspaceRebaseFailed(
         return new Conflicts(...$conflictsByKey);
     }
 
-    private function createConflictFromEventThatFailedDuringRebase(
-        ConflictingEvent $eventThatFailedDuringRebase
+    private function createConflict(
+        ConflictingEvent $conflictingEvent
     ): Conflict {
-        $nodeAggregateId = $eventThatFailedDuringRebase->getAffectedNodeAggregateId();
+        $nodeAggregateId = $conflictingEvent->getAffectedNodeAggregateId();
         $subgraph = $this->acquireSubgraph(
-            $eventThatFailedDuringRebase->getEvent(),
+            $conflictingEvent->getEvent(),
             $nodeAggregateId
         );
         $affectedSite = $nodeAggregateId
@@ -125,10 +125,10 @@ private function createConflictFromEventThatFailedDuringRebase(
                 ? $this->createIconLabelForNode($affectedNode)
                 : null,
             typeOfChange: $this->createTypeOfChange(
-                $eventThatFailedDuringRebase->getEvent()
+                $conflictingEvent->getEvent()
             ),
             reasonForConflict: $this->createReasonForConflictFromException(
-                $eventThatFailedDuringRebase->getException()
+                $conflictingEvent->getException()
             )
         );
     }