TASK: Fixup cherry-pick and adjust to use CommandHandlingDependencies

neos · Oct 14, 2024 · ddac2c4 · ddac2c4
1 parent 2a717fd
commit ddac2c4
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 18 deletions.
diff --git a/Neos.ContentRepository.Core/Classes/CommandHandlingDependencies.php b/Neos.ContentRepository.Core/Classes/CommandHandlingDependencies.php
@@ -16,6 +16,8 @@
 
 use Neos\ContentRepository\Core\CommandHandler\CommandInterface;
 use Neos\ContentRepository\Core\CommandHandler\CommandResult;
+use Neos\ContentRepository\Core\EventStore\EventPersister;
+use Neos\ContentRepository\Core\EventStore\EventsToPublish;
 use Neos\ContentRepository\Core\Projection\ContentGraph\ContentGraphInterface;
 use Neos\ContentRepository\Core\Projection\ContentStream\ContentStreamFinder;
 use Neos\ContentRepository\Core\Projection\Workspace\WorkspaceFinder;
@@ -37,15 +39,22 @@ final class CommandHandlingDependencies
      */
     private array $overridenContentGraphInstances = [];
 
-    public function __construct(private readonly ContentRepository $contentRepository)
-    {
+    public function __construct(
+        private readonly ContentRepository $contentRepository,
+        private readonly EventPersister $eventPersister
+    ) {
     }
 
     public function handle(CommandInterface $command): CommandResult
     {
         return $this->contentRepository->handle($command);
     }
 
+    public function publishEvents(EventsToPublish $eventsToPublish): void
+    {
+        $this->eventPersister->publishEvents($this->contentRepository, $eventsToPublish);
+    }
+
     public function getWorkspaceFinder(): WorkspaceFinder
     {
         return $this->contentRepository->getWorkspaceFinder();

diff --git a/Neos.ContentRepository.Core/Classes/ContentRepository.php b/Neos.ContentRepository.Core/Classes/ContentRepository.php
@@ -87,7 +87,7 @@ public function __construct(
         private readonly UserIdProviderInterface $userIdProvider,
         private readonly ClockInterface $clock,
     ) {
-        $this->commandHandlingDependencies = new CommandHandlingDependencies($this);
+        $this->commandHandlingDependencies = new CommandHandlingDependencies($this, $eventPersister);
     }
 
     /**

diff --git a/Neos.ContentRepository.Core/Classes/EventStore/EventPersister.php b/Neos.ContentRepository.Core/Classes/EventStore/EventPersister.php
@@ -22,7 +22,6 @@
     public function __construct(
         private EventStoreInterface $eventStore,
         private EventNormalizer $eventNormalizer,
-        private Projections $projections,
     ) {
     }
 

diff --git a/Neos.ContentRepository.Core/Classes/Factory/ContentRepositoryFactory.php b/Neos.ContentRepository.Core/Classes/Factory/ContentRepositoryFactory.php
@@ -135,7 +135,6 @@ private function buildCommandBus(): CommandBus
                 new ContentStreamCommandHandler(
                 ),
                 new WorkspaceCommandHandler(
-                    $this->buildEventPersister(),
                     $this->projectionFactoryDependencies->eventStore,
                     $this->projectionFactoryDependencies->eventNormalizer,
                 ),
@@ -165,7 +164,6 @@ private function buildEventPersister(): EventPersister
             $this->eventPersister = new EventPersister(
                 $this->projectionFactoryDependencies->eventStore,
                 $this->projectionFactoryDependencies->eventNormalizer,
-                $this->projectionsAndCatchUpHooks->projections,
             );
         }
         return $this->eventPersister;

diff --git a/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php b/Neos.ContentRepository.Core/Classes/Feature/WorkspaceCommandHandler.php
@@ -87,7 +87,6 @@
 final readonly class WorkspaceCommandHandler implements CommandHandlerInterface
 {
     public function __construct(
-        private EventPersister $eventPersister,
         private EventStoreInterface $eventStore,
         private EventNormalizer $eventNormalizer,
     ) {
@@ -240,7 +239,7 @@ private function handlePublishWorkspace(
         $baseWorkspace = $this->requireBaseWorkspace($workspace, $commandHandlingDependencies->getWorkspaceFinder());
 
         $this->publishContentStream(
-            $contentRepository,
+            $commandHandlingDependencies,
             $workspace->currentContentStreamId,
             $baseWorkspace->workspaceName,
             $baseWorkspace->currentContentStreamId
@@ -277,11 +276,11 @@ private function handlePublishWorkspace(
      * @throws \Exception
      */
     private function publishContentStream(
-        ContentRepository $contentRepository,
+        CommandHandlingDependencies $commandHandlingDependencies,
         ContentStreamId $contentStreamId,
         WorkspaceName $baseWorkspaceName,
         ContentStreamId $baseContentStreamId,
-    ): ?CommandResult {
+    ): void {
         $baseWorkspaceContentStreamName = ContentStreamEventStreamName::fromContentStreamId(
             $baseContentStreamId
         );
@@ -326,11 +325,10 @@ private function publishContentStream(
         }
 
         if (count($events) === 0) {
-            return null;
+            return;
         }
         try {
-            return $this->eventPersister->publishEvents(
-                $contentRepository,
+            $commandHandlingDependencies->publishEvents(
                 new EventsToPublish(
                     $baseWorkspaceContentStreamName->getEventStreamName(),
                     Events::fromArray($events),
@@ -543,7 +541,7 @@ function () use ($matchingCommands, $commandHandlingDependencies, $baseWorkspace
 
             // 5) take EVENTS(MATCHING) and apply them to base WS.
             $this->publishContentStream(
-                $contentRepository,
+                $commandHandlingDependencies,
                 $command->contentStreamIdForMatchingPart,
                 $baseWorkspace->workspaceName,
                 $baseWorkspace->currentContentStreamId

diff --git a/Neos.ContentRepository.StructureAdjustment/src/StructureAdjustmentService.php b/Neos.ContentRepository.StructureAdjustment/src/StructureAdjustmentService.php
@@ -38,7 +38,7 @@ class StructureAdjustmentService implements ContentRepositoryServiceInterface
     private readonly ContentGraphInterface $liveContentGraph;
 
     public function __construct(
-        ContentRepository $contentRepository,
+        private readonly ContentRepository $contentRepository,
         private readonly EventPersister $eventPersister,
         NodeTypeManager $nodeTypeManager,
         InterDimensionalVariationGraph $interDimensionalVariationGraph,

diff --git a/Neos.Neos/Classes/Fusion/Cache/GraphProjectorCatchUpHookForCacheFlushing.php b/Neos.Neos/Classes/Fusion/Cache/GraphProjectorCatchUpHookForCacheFlushing.php
@@ -49,9 +49,7 @@
  * is not needed:
  *
  * By calling {@see self::disabled(\Closure)} in your code, all projection updates
- * will never trigger catch up hooks. This will only work when
- * {@see CatchUpTriggerWithSynchronousOption::synchronously()} is called,
- * as otherwise this subprocess won't be called.
+ * will never trigger catch up hooks.
  *
  *
  *                                                  projection update