Merge branch '9.0' into 5034-workspaceBasedTests

neos · May 11, 2024 · c5d4946 · c5d4946
2 parents a772403 + 6a47318
commit c5d4946
Show file tree

Hide file tree

Showing 16 changed files with 61 additions and 41 deletions.
diff --git a/...lAdapter/Tests/Behavior/Features/Bootstrap/ProjectionIntegrityViolationDetectionTrait.php b/...lAdapter/Tests/Behavior/Features/Bootstrap/ProjectionIntegrityViolationDetectionTrait.php
@@ -52,11 +52,11 @@ trait ProjectionIntegrityViolationDetectionTrait
      */
     abstract private function getObject(string $className): object;
 
-    protected function getTableNamePrefix(): string
+    private function tableNames(): ContentGraphTableNames
     {
         return ContentGraphTableNames::create(
             $this->currentContentRepository->id
-        )->tableNamePrefix;
+        );
     }
 
     public function setupDbalGraphAdapterIntegrityViolationTrait()
@@ -80,7 +80,7 @@ public function iRemoveTheFollowingSubtreeTag(TableNode $payloadTable): void
             throw new \RuntimeException(sprintf('Failed to remove subtree tag "%s" because that tag is not set', $subtreeTagToRemove->value), 1708618267);
         }
         $this->dbalClient->getConnection()->update(
-            $this->getTableNamePrefix() . '_hierarchyrelation',
+            $this->tableNames()->hierarchyRelation(),
             [
                 'subtreetags' => json_encode($subtreeTags->without($subtreeTagToRemove), JSON_THROW_ON_ERROR | JSON_FORCE_OBJECT),
             ],
@@ -97,7 +97,7 @@ public function iAddTheFollowingHierarchyRelation(TableNode $payloadTable): void
         $dataset = $this->transformPayloadTableToDataset($payloadTable);
         $record = $this->transformDatasetToHierarchyRelationRecord($dataset);
         $this->dbalClient->getConnection()->insert(
-            $this->getTableNamePrefix() . '_hierarchyrelation',
+            $this->tableNames()->hierarchyRelation(),
             $record
         );
     }
@@ -114,7 +114,7 @@ public function iChangeTheFollowingHierarchyRelationsDimensionSpacePointHash(Tab
         unset($record['position']);
 
         $this->dbalClient->getConnection()->update(
-            $this->getTableNamePrefix() . '_hierarchyrelation',
+            $this->tableNames()->hierarchyRelation(),
             [
                 'dimensionspacepointhash' => $dataset['newDimensionSpacePointHash']
             ],
@@ -134,7 +134,7 @@ public function iChangeTheFollowingHierarchyRelationsEdgeName(TableNode $payload
         unset($record['position']);
 
         $this->dbalClient->getConnection()->update(
-            $this->getTableNamePrefix() . '_hierarchyrelation',
+            $this->tableNames()->hierarchyRelation(),
             [
                 'name' => $dataset['newName']
             ],
@@ -158,7 +158,7 @@ public function iSetTheFollowingPosition(TableNode $payloadTable): void
         ];
 
         $this->dbalClient->getConnection()->update(
-            $this->getTableNamePrefix() . '_hierarchyrelation',
+            $this->tableNames()->hierarchyRelation(),
             [
                 'position' => $dataset['newPosition']
             ],
@@ -176,7 +176,7 @@ public function iDetachTheFollowingReferenceRelationFromItsSource(TableNode $pay
         $dataset = $this->transformPayloadTableToDataset($payloadTable);
 
         $this->dbalClient->getConnection()->update(
-            $this->getTableNamePrefix() . '_referencerelation',
+            $this->tableNames()->referenceRelation(),
             [
                 'nodeanchorpoint' => 7777777
             ],
@@ -194,7 +194,7 @@ public function iSetTheFollowingReferencePosition(TableNode $payloadTable): void
         $dataset = $this->transformPayloadTableToDataset($payloadTable);
 
         $this->dbalClient->getConnection()->update(
-            $this->getTableNamePrefix() . '_referencerelation',
+            $this->tableNames()->referenceRelation(),
             [
                 'position' => $dataset['newPosition']
             ],
@@ -265,8 +265,8 @@ private function findHierarchyRelationByIds(
     ): array {
         $nodeRecord = $this->dbalClient->getConnection()->executeQuery(
             'SELECT h.*
-                FROM ' . $this->getTableNamePrefix() . '_node n
-                INNER JOIN ' . $this->getTableNamePrefix() . '_hierarchyrelation h
+                FROM ' . $this->tableNames()->node() . ' n
+                INNER JOIN ' . $this->tableNames()->hierarchyRelation() . ' h
                 ON n.relationanchorpoint = h.childnodeanchor
                 WHERE n.nodeaggregateid = :nodeAggregateId
                 AND h.contentstreamid = :contentStreamId

diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/ContentGraphTableNames.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/ContentGraphTableNames.php
@@ -11,7 +11,7 @@
 final readonly class ContentGraphTableNames
 {
     private function __construct(
-        public string $tableNamePrefix
+        private string $tableNamePrefix
     ) {
     }
 

diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ContentGraph.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ContentGraph.php
@@ -20,7 +20,6 @@
 use Doctrine\DBAL\Query\QueryBuilder;
 use Doctrine\DBAL\Result;
 use Neos\ContentGraph\DoctrineDbalAdapter\ContentGraphTableNames;
-use Neos\ContentGraph\DoctrineDbalAdapter\DoctrineDbalContentGraphProjection;
 use Neos\ContentGraph\DoctrineDbalAdapter\NodeQueryBuilder;
 use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint;
 use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePointSet;
@@ -316,15 +315,6 @@ public function findUsedNodeTypeNames(): iterable
         );
     }
 
-    /**
-     * @return ContentSubgraphWithRuntimeCaches[]
-     * @internal only used for {@see DoctrineDbalContentGraphProjection}
-     */
-    public function getSubgraphs(): array
-    {
-        return $this->subgraphs;
-    }
-
     private function createQueryBuilder(): QueryBuilder
     {
         return $this->client->getConnection()->createQueryBuilder();

diff --git a/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/HypergraphProjection.php b/Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/HypergraphProjection.php
@@ -149,11 +149,6 @@ public function reset(): void
 
         $this->checkpointStorage->acquireLock();
         $this->checkpointStorage->updateAndReleaseLock(SequenceNumber::none());
-
-        //$contentGraph = $this->getState();
-        //foreach ($contentGraph->getSubgraphs() as $subgraph) {
-        //    $subgraph->inMemoryCache->enable();
-        //}
     }
 
     private function truncateDatabaseTables(): void

diff --git a/Neos.ContentRepository.Core/Classes/Feature/Common/ConstraintChecks.php b/Neos.ContentRepository.Core/Classes/Feature/Common/ConstraintChecks.php
@@ -671,7 +671,7 @@ protected function requireNodeAggregateToOccupyDimensionSpacePoint(
     ): void {
         if (!$nodeAggregate->occupiesDimensionSpacePoint($originDimensionSpacePoint)) {
             throw new DimensionSpacePointIsNotYetOccupied(
-                'Dimension space point ' . json_encode($originDimensionSpacePoint, JSON_THROW_ON_ERROR)
+                'Dimension space point ' . json_encode($originDimensionSpacePoint, JSON_PARTIAL_OUTPUT_ON_ERROR)
                     . ' is not yet occupied by node aggregate "' . $nodeAggregate->nodeAggregateId->value . '"',
                 1552595396
             );
@@ -687,7 +687,7 @@ protected function requireNodeAggregateToNotOccupyDimensionSpacePoint(
     ): void {
         if ($nodeAggregate->occupiesDimensionSpacePoint($originDimensionSpacePoint)) {
             throw new DimensionSpacePointIsAlreadyOccupied(
-                'Dimension space point ' . json_encode($originDimensionSpacePoint, JSON_THROW_ON_ERROR)
+                'Dimension space point ' . json_encode($originDimensionSpacePoint, JSON_PARTIAL_OUTPUT_ON_ERROR)
                     . ' is already occupied by node aggregate "' . $nodeAggregate->nodeAggregateId->value . '"',
                 1552595441
             );

diff --git a/Neos.ContentRepository.Core/Classes/Feature/ContentStreamCommandHandler.php b/Neos.ContentRepository.Core/Classes/Feature/ContentStreamCommandHandler.php
@@ -53,7 +53,7 @@ public function canHandle(CommandInterface $command): bool
     public function handle(CommandInterface $command, CommandHandlingDependencies $commandHandlingDependencies): EventsToPublish
     {
         return match ($command::class) {
-            CreateContentStream::class => $this->handleCreateContentStream($command),
+            CreateContentStream::class => $this->handleCreateContentStream($command, $commandHandlingDependencies),
             CloseContentStream::class => $this->handleCloseContentStream($command, $commandHandlingDependencies),
             ReopenContentStream::class => $this->handleReopenContentStream($command, $commandHandlingDependencies),
             ForkContentStream::class => $this->handleForkContentStream($command, $commandHandlingDependencies),
@@ -66,8 +66,10 @@ public function handle(CommandInterface $command, CommandHandlingDependencies $c
      * @throws ContentStreamAlreadyExists
      */
     private function handleCreateContentStream(
-        CreateContentStream $command
+        CreateContentStream $command,
+        CommandHandlingDependencies $commandHandlingDependencies,
     ): EventsToPublish {
+        $this->requireContentStreamToNotExistYet($command->contentStreamId, $commandHandlingDependencies);
         $streamName = ContentStreamEventStreamName::fromContentStreamId($command->contentStreamId)
             ->getEventStreamName();
 
@@ -133,8 +135,8 @@ private function handleForkContentStream(
     ): EventsToPublish {
         $this->requireContentStreamToExist($command->sourceContentStreamId, $commandHandlingDependencies);
         $this->requireContentStreamToNotBeClosed($command->sourceContentStreamId, $commandHandlingDependencies);
+        $this->requireContentStreamToNotExistYet($command->newContentStreamId, $commandHandlingDependencies);
 
-        // TODO: This is not great
         $sourceContentStreamVersion = $commandHandlingDependencies->getContentStreamFinder()->findVersionForContentStream($command->sourceContentStreamId);
 
         $streamName = ContentStreamEventStreamName::fromContentStreamId($command->newContentStreamId)
@@ -178,6 +180,24 @@ private function handleRemoveContentStream(
 
     /**
      * @param ContentStreamId $contentStreamId
+     * @param CommandHandlingDependencies $commandHandlingDependencies
+     * @throws ContentStreamAlreadyExists
+     */
+    protected function requireContentStreamToNotExistYet(
+        ContentStreamId $contentStreamId,
+        CommandHandlingDependencies $commandHandlingDependencies
+    ): void {
+        if ($commandHandlingDependencies->getContentStreamFinder()->hasContentStream($contentStreamId)) {
+            throw new ContentStreamAlreadyExists(
+                'Content stream "' . $contentStreamId->value . '" already exists.',
+                1521386345
+            );
+        }
+    }
+
+    /**
+     * @param ContentStreamId $contentStreamId
+     * @param CommandHandlingDependencies $commandHandlingDependencies
      * @throws ContentStreamDoesNotExistYet
      */
     protected function requireContentStreamToExist(

diff --git a/Neos.ContentRepository.Core/Classes/Projection/ContentStream/ContentStreamFinder.php b/Neos.ContentRepository.Core/Classes/Projection/ContentStream/ContentStreamFinder.php
@@ -179,4 +179,21 @@ public function findVersionForContentStream(ContentStreamId $contentStreamId): M
 
         return MaybeVersion::fromVersionOrNull(Version::fromInteger($version));
     }
+
+    public function hasContentStream(ContentStreamId $contentStreamId): bool
+    {
+        $connection = $this->client->getConnection();
+        /* @var $state string|false */
+        $version = $connection->executeQuery(
+            '
+            SELECT version FROM ' . $this->tableName . '
+                WHERE contentStreamId = :contentStreamId
+            ',
+            [
+                'contentStreamId' => $contentStreamId->value
+            ]
+        )->fetchOne();
+
+        return $version !== false;
+    }
 }
diff --git a/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/CRTestSuiteTrait.php b/Neos.ContentRepository.TestSuite/Classes/Behavior/Features/Bootstrap/CRTestSuiteTrait.php
@@ -106,6 +106,7 @@ public function beforeEventSourcedScenarioDispatcher(BeforeScenarioScope $scope)
         $this->currentDimensionSpacePoint = null;
         $this->currentRootNodeAggregateId = null;
         $this->currentContentStreamId = null;
+        $this->currentWorkspaceName = null;
         $this->currentNodeAggregate = null;
         $this->currentNode = null;
     }

diff --git a/Neos.Neos/Classes/AssetUsage/Dto/AssetIdAndOriginalAssetId.php b/Neos.Neos/Classes/AssetUsage/Dto/AssetIdAndOriginalAssetId.php
@@ -9,7 +9,6 @@
 /**
  * @internal
  */
-
 #[Flow\Proxy(false)]
 readonly class AssetIdAndOriginalAssetId
 {

diff --git a/Neos.Neos/Classes/Fusion/Cache/ContentCacheFlusher.php b/Neos.Neos/Classes/Fusion/Cache/ContentCacheFlusher.php
@@ -65,8 +65,6 @@ public function __construct(
     /**
      * Main entry point to *directly* flush the caches of a given NodeAggregate
      *
-     * FIXME workspaceName instead of contentStreamId
-     *
      * @param ContentRepository $contentRepository
      * @param ContentStreamId $contentStreamId
      * @param NodeAggregateId $nodeAggregateId

diff --git a/Neos.Neos/Documentation/References/CommandReference.rst b/Neos.Neos/Documentation/References/CommandReference.rst
@@ -19,7 +19,7 @@ commands that may be available, use::
 
   ./flow help
 
-The following reference was automatically generated from code on 2024-05-06
+The following reference was automatically generated from code on 2024-05-11
 
 
 .. _`Neos Command Reference: NEOS.FLOW`:

diff --git a/Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst b/Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst
@@ -3,7 +3,7 @@
 FluidAdaptor ViewHelper Reference
 #################################
 
-This reference was automatically generated from code on 2024-05-06
+This reference was automatically generated from code on 2024-05-11
 
 
 .. _`FluidAdaptor ViewHelper Reference: f:debug`:

diff --git a/Neos.Neos/Documentation/References/ViewHelpers/Form.rst b/Neos.Neos/Documentation/References/ViewHelpers/Form.rst
@@ -3,7 +3,7 @@
 Form ViewHelper Reference
 #########################
 
-This reference was automatically generated from code on 2024-05-06
+This reference was automatically generated from code on 2024-05-11
 
 
 .. _`Form ViewHelper Reference: neos.form:form`:

diff --git a/Neos.Neos/Documentation/References/ViewHelpers/Media.rst b/Neos.Neos/Documentation/References/ViewHelpers/Media.rst
@@ -3,7 +3,7 @@
 Media ViewHelper Reference
 ##########################
 
-This reference was automatically generated from code on 2024-05-06
+This reference was automatically generated from code on 2024-05-11
 
 
 .. _`Media ViewHelper Reference: neos.media:fileTypeIcon`:

diff --git a/Neos.Neos/Documentation/References/ViewHelpers/Neos.rst b/Neos.Neos/Documentation/References/ViewHelpers/Neos.rst
@@ -3,7 +3,7 @@
 Neos ViewHelper Reference
 #########################
 
-This reference was automatically generated from code on 2024-05-06
+This reference was automatically generated from code on 2024-05-11
 
 
 .. _`Neos ViewHelper Reference: neos:backend.authenticationProviderLabel`:

diff --git a/Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst b/Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst
@@ -3,7 +3,7 @@
 TYPO3 Fluid ViewHelper Reference
 ################################
 
-This reference was automatically generated from code on 2024-05-06
+This reference was automatically generated from code on 2024-05-11
 
 
 .. _`TYPO3 Fluid ViewHelper Reference: f:alias`:
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,6 @@ @@
     /**
      * @internal
      */
     #[Flow\Proxy(false)]
     readonly class AssetIdAndOriginalAssetId
     {
@@ Expand Down @@