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

…-progress-bar
neos · Aug 26, 2023 · b5f4f8a · b5f4f8a
2 parents 530248c + 0c97437
commit b5f4f8a
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 114 deletions.
diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphProjection.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphProjection.php
@@ -60,8 +60,6 @@
 use Neos\EventStore\Model\EventEnvelope;
 use Neos\EventStore\Model\EventStore\SetupResult;
 
-use function get_debug_type;
-
 /**
  * @implements ProjectionInterface<ContentGraph>
  * @internal but the graph projection is api

diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/HypergraphProjection.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/HypergraphProjection.php
@@ -52,8 +52,6 @@
 use Neos\EventStore\Model\EventEnvelope;
 use Neos\EventStore\Model\EventStore\SetupResult;
 
-use function sprintf;
-
 /**
  * The alternate reality-aware hypergraph projector for the PostgreSQL backend via Doctrine DBAL
  *

diff --git a/Neos.ContentRepository.Core/Classes/CommandHandler/PendingProjections.php b/Neos.ContentRepository.Core/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/Neos.ContentRepository.Core/Classes/ContentRepository.php b/Neos.ContentRepository.Core/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/Neos.ContentRepository.Core/Classes/Projection/ContentStream/ContentStreamProjection.php b/Neos.ContentRepository.Core/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/Neos.ContentRepository.Core/Classes/Projection/NodeHiddenState/NodeHiddenStateProjection.php b/Neos.ContentRepository.Core/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/Neos.ContentRepository.Core/Classes/Projection/Workspace/WorkspaceProjection.php b/Neos.ContentRepository.Core/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>

diff --git a/Neos.ContentRepositoryRegistry/Classes/Command/ContentStreamCommandController.php b/Neos.ContentRepositoryRegistry/Classes/Command/ContentStreamCommandController.php
@@ -15,103 +15,6 @@ class ContentStreamCommandController extends CommandController
      */
     protected $contentRepositoryRegistry;
 
-    /**
-     * @throws \Neos\Flow\Cli\Exception\StopCommandException
-     */
-    public function exportCommand(string $contentStream, string $contentRepository = 'default', int $startSequenceNumber = 0): void
-    {
-        $contentRepositoryId = ContentRepositoryId::fromString($contentRepository);
-        throw new \RuntimeException('TODO IMPL??');
-        // TODO??$events = $this->contentRepositoryEventStore->load(
-        //    StreamName::fromString($contentStream),
-        //    $startSequenceNumber
-        //);
-    }
-
-    /**
-     * Imports events to a content stream from the given file.
-     * Note that the events in the file need to come from the same content stream you import to for now!
-     *
-     * @throws \Neos\ContentRepository\Core\SharedModel\Exception\ContentStreamAlreadyExists
-     * @throws \Neos\ContentRepository\Core\Feature\WorkspaceCreation\Exception\WorkspaceAlreadyExists
-     * @throws \Neos\EventSourcing\EventListener\Exception\EventCouldNotBeAppliedException
-     * @throws \Symfony\Component\Serializer\Exception\ExceptionInterface
-     */
-    public function importCommand(string $contentStream, string $file = null): void
-    {
-        throw new \RuntimeException('TODO IMPL??');
-        // TODO
-//        if ($file !== null) {
-//            $fileStream = fopen($file, 'r');
-//            $this->outputLine('Reading from file: "%s"', [$file]);
-//        } else {
-//            $fileStream = fopen('php://stdin', 'r');
-//            $this->outputLine('Reading import data from standard in.');
-//        }
-//        if (!$fileStream) {
-//            throw new \InvalidArgumentException('Failed to open file ' . $file);
-//        }
-//        $normalizer = new EventNormalizer(new EventTypeResolver());
-//
-//        $contentStreamToImportTo = ContentStreamId::fromString($contentStream);
-//        $eventStreamName = ContentStreamEventStreamName::fromContentStreamId($contentStreamToImportTo)
-//            ->getEventStreamName();
-//
-//        $this->outputLine('Clearing workspace projection to create the workspace to import to.');
-//        $workspaceProjection = $this->projectionManager->getProjection('workspace');
-//        $this->projectionManager->replay($workspaceProjection->getIdentifier());
-//
-//        $commandResult = $this->workspaceCommandHandler->handleCreateRootWorkspace(
-//            new CreateRootWorkspace(
-//                WorkspaceName::forLive(),
-//                WorkspaceTitle::fromString('Live'),
-//                WorkspaceDescription::fromString(''),
-//                UserIdentifier::forSystemUser(),
-//                $contentStreamToImportTo
-//            )
-//        );
-//
-//        $this->outputLine('Created workspace "Live" for the given content stream identifier');
-//
-//        $i = 0;
-//        $domainEvents = DomainEvents::createEmpty();
-//
-//        $this->outputLine('starting import');
-//        $this->output->progressStart();
-//        for ($line = fgets($fileStream); $line !== false; $line = fgets($fileStream)) {
-//            $this->output->progressAdvance();
-//            $i++;
-//            if ($line === '[' || $line === ']') {
-//                continue;
-//            }
-//
-//            $rawEventLine = ltrim($line, ',');
-//            $rawEventProperties = json_decode($rawEventLine, true);
-//            if (!is_array($rawEventProperties)) {
-//                continue;
-//            }
-//
-//            $domainEvent = $normalizer->denormalize($rawEventProperties['payload'], $rawEventProperties['type']);
-//            $domainEvent = DecoratedEvent::addMetadata($domainEvent, $rawEventProperties['metadata']);
-//
-//            $domainEvents = $domainEvents->appendEvent($domainEvent);
-//
-//            if ($i === 10) {
-//                $this->contentRepositoryEventStore->commit($eventStreamName, $domainEvents);
-//                $domainEvents = DomainEvents::createEmpty();
-//                $i = 0;
-//            }
-//        }
-//        $this->output->progressFinish();
-//
-//        $this->contentRepositoryEventStore->commit($eventStreamName, $domainEvents);
-//        fclose($fileStream);
-//        $this->outputLine('');
-//        $this->outputLine('Finished importing events.');
-//        $this->outputLine('Your events and projections are probably out of sync now,'
-//            . ' <error>make sure you replay all projections via "./flow projection:replayall"</error>.');
-    }
-
     /**
      * Remove all content streams which are not needed anymore from the projections.
      *

diff --git a/Neos.Neos/Classes/AssetUsage/Projection/AssetUsageProjection.php b/Neos.Neos/Classes/AssetUsage/Projection/AssetUsageProjection.php
@@ -35,8 +35,6 @@
 use Neos\Utility\Exception\InvalidTypeException;
 use Neos\Utility\TypeHandling;
 
-use function sprintf;
-
 /**
  * @implements ProjectionInterface<AssetUsageFinder>
  * @internal

diff --git a/Neos.Neos/Resources/Private/Translations/es/NodeTypes/ContentCollection.xlf b/Neos.Neos/Resources/Private/Translations/es/NodeTypes/ContentCollection.xlf
@@ -4,7 +4,7 @@
     <body>
       <trans-unit id="ui.label" xml:space="preserve">
 				<source>Content Collection</source>
-        <target state="translated">Recopilación de los contenidos</target>
+        <target state="translated">Colección de contenidos</target>
       </trans-unit>
     </body>
   </file>
-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 @@