From 9175b0ea265565441fb5ce1cbe164780bf0046cb Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sat, 9 Nov 2024 19:27:05 +0100
Subject: [PATCH] TASK: Adjust to rename `EventThatFailedDuringRebase` to
 `ConflictingEvent` 2

---
 .../ContentRepository/ConflictsFactory.php           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Classes/Infrastructure/ContentRepository/ConflictsFactory.php b/Classes/Infrastructure/ContentRepository/ConflictsFactory.php
index 8fd34f809c..013215e7c1 100644
--- 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()
             )
         );
     }