Merge branch 'feature/4289-overhaul-catchup' into feature/4200-replay…

…-progress-bar
neos · Aug 26, 2023 · 9bc2085 · 9bc2085
2 parents cfc6f49 + d6211ea
commit 9bc2085
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 10 deletions.
diff --git a/Classes/CommandHandler/PendingProjections.php b/Classes/CommandHandler/PendingProjections.php
@@ -100,10 +100,10 @@ public static function fromProjectionsAndEventsAndSequenceNumber(
         $pendingProjectionsArray = [];
         $sequenceNumberPerProjection = [];
         foreach ($events as $event) {
+            if ($event instanceof DecoratedEvent) {
+                $event = $event->innerEvent;
+            }
             foreach ($allProjections as $projection) {
-                if ($event instanceof DecoratedEvent) {
-                    $event = $event->innerEvent;
-                }
                 if ($projection->canHandle($event)) {
                     $sequenceNumberPerProjection[$projection::class] = $sequenceNumberInteger;
                     if (!in_array($projection, $pendingProjectionsArray, true)) {

diff --git a/Classes/ContentRepository.php b/Classes/ContentRepository.php
@@ -150,7 +150,7 @@ public function projectionState(string $projectionStateClassName): ProjectionSta
                 return $projectionState;
             }
         }
-        throw new \InvalidArgumentException(sprintf('a projection state of type "%s" is not registered in this content repository instance.', $projectionStateClassName), 1662033650);
+        throw new \InvalidArgumentException(sprintf('A projection state of type "%s" is not registered in this content repository instance.', $projectionStateClassName), 1662033650);
     }
 
     /**

diff --git a/Classes/Projection/ContentStream/ContentStreamProjection.php b/Classes/Projection/ContentStream/ContentStreamProjection.php
@@ -42,8 +42,6 @@
 use Neos\EventStore\Model\Event\SequenceNumber;
 use Neos\EventStore\Model\EventEnvelope;
 
-use function sprintf;
-
 /**
  * See {@see ContentStreamFinder} for explanation.
  *

diff --git a/Classes/Projection/NodeHiddenState/NodeHiddenStateProjection.php b/Classes/Projection/NodeHiddenState/NodeHiddenStateProjection.php
@@ -31,8 +31,6 @@
 use Neos\EventStore\Model\Event\SequenceNumber;
 use Neos\EventStore\Model\EventEnvelope;
 
-use function sprintf;
-
 /**
  * TODO: this class needs proper testing
  * @internal

diff --git a/Classes/Projection/Workspace/WorkspaceProjection.php b/Classes/Projection/Workspace/WorkspaceProjection.php
@@ -42,8 +42,6 @@
 use Neos\EventStore\Model\Event\SequenceNumber;
 use Neos\EventStore\Model\EventEnvelope;
 
-use function sprintf;
-
 /**
  * @internal
  * @implements ProjectionInterface<WorkspaceFinder>
-Original file line number
+Diff line change
@@ Expand Up @@
                     return $projectionState;
                 }
             }
-            throw new \InvalidArgumentException(sprintf('a projection state of type "%s" is not registered in this content repository instance.', $projectionStateClassName), 1662033650);
+            throw new \InvalidArgumentException(sprintf('A projection state of type "%s" is not registered in this content repository instance.', $projectionStateClassName), 1662033650);
         }
         /**
@@ Expand Down @@