Merge remote-tracking branch 'origin/9.0' into 9.1

Author: mhsdesign

.github/workflows/postgresql-versions.yml

@@ -151,7 +151,6 @@ jobs:
       - name: Run behat tests
         if: ${{matrix.dependencies != 'lowest' }}
         run: |
-          FLOW_CONTEXT=Testing/Behat ./flow behat:setup
           FLOW_CONTEXT=Testing/Behat ./flow doctrine:create
           FLOW_CONTEXT=Testing/Behat ./flow doctrine:migrationversion --add --version all
           bin/behat --stop-on-failure -f progress -c Packages/Neos/Neos.Neos/Tests/Behavior/behat.yml.dist

CONTRIBUTING.md

@@ -48,7 +48,7 @@ We are currently in the process to create the identity for the Neos brand. If yo
 
 ### You have other skills that you think can be useful for the community?
 
-Who knows, some of your skills are not in this list, but can be really useful for the community. You are a project manager, an event organizer, a brewer, a team builder and yoga trainer and you want to support an open source community, connect with us: **hello@neos.io** 
+Who knows, some of your skills are not in this list, but can be really useful for the community. You are a project manager, an event organizer, a brewer, a team builder and yoga trainer and you want to support an open source community, connect with us: **hello@neos.io**
 
 We certainly have a something that matches your dream job and where you can help the project.
 
@@ -67,7 +67,7 @@ We spend our time on the following tools, you should have a good understanding o
 
 - PHPunit (unit and functional testing)
 - Behat (functional testing)
-- GIT 
+- GIT
 
 You can find us on [Github](https://github.com/neos) and we also use it as our main issue tracker.
 
@@ -101,15 +101,15 @@ If you have any questions, [we are happy to help you](https://www.neos.io/contac
 If you want to contribute to Neos and want to set up a development environment, then follow these steps:
 
 ```shell
-composer create-project neos/neos-development-distribution neos-development 8.3.x-dev --keep-vcs
+composer create-project neos/neos-development-distribution neos-development 9.0.x-dev --keep-vcs
 ```
 
 Note the **-distribution** repository you create a project from, instead of just checking out this repository.
 
-If you need a different branch, you can either use it from the start (replace the ``8.3.x-dev`` by ``9.0.x-dev`` or whatever you need), or switch after checkout (just make sure to run composer update afterwards to get matching dependencies installed.) In a nutshell, to switch the branch you intend to work on, run:
+If you need a different branch, you can either use it from the start (replace the ``9.0.x-dev`` by ``8.3.x-dev`` or whatever you need), or switch after checkout (just make sure to run composer update afterwards to get matching dependencies installed.) In a nutshell, to switch the branch you intend to work on, run:
 
 ```shell
-git checkout 9.0 && composer update
+git checkout 8.3 && composer update
 ```
 
 The code of the CMS can then be found inside `Packages/Neos`, which itself is the neos-development-collection Git repository. You commit changes and create pull requests from this repository.

Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/Features/Bootstrap/FeatureContext.php

@@ -17,14 +17,14 @@
 use Behat\Behat\Hook\Scope\BeforeScenarioScope;
 use Neos\Behat\FlowBootstrapTrait;
 use Neos\ContentGraph\DoctrineDbalAdapter\Tests\Behavior\Features\Bootstrap\ProjectionIntegrityViolationDetectionTrait;
-use Neos\ContentRepository\BehavioralTests\TestSuite\Behavior\CRBehavioralTestsSubjectProvider;
 use Neos\ContentRepository\Core\ContentRepository;
 use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryInterface;
 use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceInterface;
 use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
+use Neos\ContentRepository\TestSuite\Behavior\Features\Bootstrap\CRBehavioralTestsSubjectProvider;
 use Neos\ContentRepository\TestSuite\Behavior\Features\Bootstrap\CRTestSuiteTrait;
-use Neos\ContentRepository\TestSuite\Fakes\FakeNodeTypeManagerFactory;
 use Neos\ContentRepository\TestSuite\Fakes\FakeContentDimensionSourceFactory;
+use Neos\ContentRepository\TestSuite\Fakes\FakeNodeTypeManagerFactory;
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 
 /**

Neos.ContentGraph.DoctrineDbalAdapter/composer.json

@@ -13,6 +13,7 @@
   },
   "require": {
     "neos/contentrepository-core": "self.version",
+    "neos/contentrepository-dbal": "self.version",
     "doctrine/dbal": "^3.1.4",
     "doctrine/migrations": "*"
   },

Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphProjection.php

@@ -59,7 +59,6 @@
 use Neos\ContentRepository\Core\Feature\WorkspacePublication\Event\WorkspaceWasPublished;
 use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Event\WorkspaceRebaseFailed;
 use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Event\WorkspaceWasRebased;
-use Neos\ContentRepository\Core\Infrastructure\DbalSchemaDiff;
 use Neos\ContentRepository\Core\NodeType\NodeTypeName;
 use Neos\ContentRepository\Core\Projection\ContentGraph\ContentGraphProjectionInterface;
 use Neos\ContentRepository\Core\Projection\ContentGraph\ContentGraphReadModelInterface;
@@ -71,6 +70,7 @@
 use Neos\ContentRepository\Core\SharedModel\Node\NodeName;
 use Neos\ContentRepository\Core\SharedModel\Node\ReferenceName;
 use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
+use Neos\ContentRepository\Dbal\DbalSchemaDiff;
 use Neos\EventStore\Model\EventEnvelope;
 
 /**

Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphSchemaBuilder.php

@@ -7,13 +7,12 @@
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Exception as DBALException;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
-use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Doctrine\DBAL\Schema\Column;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\DBAL\Types\Types;
-use Neos\ContentRepository\Core\Infrastructure\DbalSchemaFactory;
+use Neos\ContentRepository\Dbal\DbalSchemaFactory;
 
 /**
  * @internal
@@ -101,7 +100,8 @@ private function createReferenceRelationTable(AbstractPlatform $platform): Table
         ]);
 
         return $table
-            ->setPrimaryKey(['name', 'position', 'nodeanchorpoint']);
+            ->setPrimaryKey(['name', 'position', 'nodeanchorpoint'])
+            ->addIndex(['nodeanchorpoint', 'destinationnodeaggregateid', 'position'], 'referenceresolution');
     }
 
     private function createWorkspaceTable(AbstractPlatform $platform): Table

Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/SubtreeTagging.php

@@ -25,34 +25,36 @@ trait SubtreeTagging
     private function addSubtreeTag(ContentStreamId $contentStreamId, NodeAggregateId $nodeAggregateId, DimensionSpacePointSet $affectedDimensionSpacePoints, SubtreeTag $tag): void
     {
         $addTagToDescendantsStatement = <<<SQL
-            UPDATE {$this->tableNames->hierarchyRelation()} h
+        UPDATE {$this->tableNames->hierarchyRelation()} h
+            JOIN (
+                WITH RECURSIVE cte (id, dsp) AS (
+                    SELECT ch.childnodeanchor, ch.dimensionspacepointhash
+                    FROM {$this->tableNames->hierarchyRelation()} ch
+                    INNER JOIN {$this->tableNames->node()} n ON n.relationanchorpoint = ch.parentnodeanchor
+                    WHERE
+                      n.nodeaggregateid = :nodeAggregateId
+                      AND ch.contentstreamid = :contentStreamId
+                      AND ch.dimensionspacepointhash in (:dimensionSpacePointHashes)
+                      AND NOT JSON_CONTAINS_PATH(ch.subtreetags, 'one', :tagPath)
+                    UNION ALL
+                    SELECT
+                      dh.childnodeanchor,
+                      dh.dimensionspacepointhash
+                    FROM
+                      cte
+                      JOIN {$this->tableNames->hierarchyRelation()} dh ON dh.parentnodeanchor = cte.id
+                        AND dh.contentstreamid = :contentStreamId
+                        AND dh.dimensionspacepointhash = cte.dsp
+                    WHERE
+                      NOT JSON_CONTAINS_PATH(dh.subtreetags, 'one', :tagPath)
+                )
+                SELECT * FROM cte
+            ) subquery ON h.dimensionspacepointhash = subquery.dsp
+                AND h.childnodeanchor = subquery.id
             SET h.subtreetags = JSON_INSERT(h.subtreetags, :tagPath, null)
-            WHERE h.childnodeanchor IN (
-              WITH RECURSIVE cte (id) AS (
-                SELECT ch.childnodeanchor
-                FROM {$this->tableNames->hierarchyRelation()} ch
-                INNER JOIN {$this->tableNames->node()} n ON n.relationanchorpoint = ch.parentnodeanchor
-                WHERE
-                  n.nodeaggregateid = :nodeAggregateId
-                  AND ch.contentstreamid = :contentStreamId
-                  AND ch.dimensionspacepointhash in (:dimensionSpacePointHashes)
-                  AND NOT JSON_CONTAINS_PATH(ch.subtreetags, 'one', :tagPath)
-                UNION ALL
-                SELECT
-                  dh.childnodeanchor
-                FROM
-                  cte
-                  JOIN {$this->tableNames->hierarchyRelation()} dh ON dh.parentnodeanchor = cte.id
-                    AND dh.contentstreamid = :contentStreamId
-                    AND dh.dimensionspacepointhash in (:dimensionSpacePointHashes)
-                WHERE
-                  NOT JSON_CONTAINS_PATH(dh.subtreetags, 'one', :tagPath)
-              )
-              SELECT DISTINCT id FROM cte
-            )
-              AND h.contentstreamid = :contentStreamId
-              AND h.dimensionspacepointhash in (:dimensionSpacePointHashes)
+            WHERE h.contentstreamid = :contentStreamId
         SQL;
+
         try {
             $this->dbal->executeStatement($addTagToDescendantsStatement, [
                 'contentStreamId' => $contentStreamId->value,
@@ -63,7 +65,7 @@ private function addSubtreeTag(ContentStreamId $contentStreamId, NodeAggregateId
                 'dimensionSpacePointHashes' => ArrayParameterType::STRING,
             ]);
         } catch (DBALException $e) {
-            throw new \RuntimeException(sprintf('Failed to add subtree tag %s for content stream %s, node aggregate id %s and dimension space points %s: %s', $tag->value, $contentStreamId->value, $nodeAggregateId->value, $affectedDimensionSpacePoints->toJson(), $e->getMessage()), 1716479749, $e);
+            throw new \RuntimeException(sprintf('1: Failed to add subtree tag %s for content stream %s, node aggregate id %s and dimension space points %s: %s', $tag->value, $contentStreamId->value, $nodeAggregateId->value, $affectedDimensionSpacePoints->toJson(), $e->getMessage()), 1716479749, $e);
         }
 
         $addTagToNodeStatement = <<<SQL
@@ -85,31 +87,17 @@ private function addSubtreeTag(ContentStreamId $contentStreamId, NodeAggregateId
                 'dimensionSpacePointHashes' => ArrayParameterType::STRING,
             ]);
         } catch (DBALException $e) {
-            throw new \RuntimeException(sprintf('Failed to add subtree tag %s for content stream %s, node aggregate id %s and dimension space points %s: %s', $tag->value, $contentStreamId->value, $nodeAggregateId->value, $affectedDimensionSpacePoints->toJson(), $e->getMessage()), 1716479840, $e);
+            throw new \RuntimeException(sprintf('2: Failed to add subtree tag %s for content stream %s, node aggregate id %s and dimension space points %s: %s', $tag->value, $contentStreamId->value, $nodeAggregateId->value, $affectedDimensionSpacePoints->toJson(), $e->getMessage()), 1716479840, $e);
         }
     }
 
     private function removeSubtreeTag(ContentStreamId $contentStreamId, NodeAggregateId $nodeAggregateId, DimensionSpacePointSet $affectedDimensionSpacePoints, SubtreeTag $tag): void
     {
         $removeTagStatement = <<<SQL
             UPDATE {$this->tableNames->hierarchyRelation()} h
-            SET subtreetags = IF((
-              SELECT containsTag FROM (SELECT
-                JSON_CONTAINS_PATH(gph.subtreetags, 'one', :tagPath) as containsTag
-              FROM
-                {$this->tableNames->hierarchyRelation()} gph
-                INNER JOIN {$this->tableNames->hierarchyRelation()} ph ON ph.parentnodeanchor = gph.childnodeanchor
-                INNER JOIN {$this->tableNames->node()} n ON n.relationanchorpoint = ph.childnodeanchor
-              WHERE
-                ph.parentnodeanchor = gph.childnodeanchor
-                AND n.nodeaggregateid = :nodeAggregateId
-                AND gph.contentstreamid = :contentStreamId
-                AND gph.dimensionspacepointhash in (:dimensionSpacePointHashes)
-              LIMIT 1) as containsTagSubQuery
-            ), JSON_SET(subtreetags, :tagPath, null), JSON_REMOVE(subtreetags, :tagPath))
-            WHERE childnodeanchor IN (
-              WITH RECURSIVE cte (id) AS (
-                SELECT ph.childnodeanchor
+            JOIN (
+              WITH RECURSIVE cte (id, dsp) AS (
+                SELECT ph.childnodeanchor, ph.dimensionspacepointhash
                 FROM {$this->tableNames->hierarchyRelation()} ph
                 INNER JOIN {$this->tableNames->node()} n ON n.relationanchorpoint = ph.childnodeanchor
                 WHERE
@@ -118,19 +106,35 @@ private function removeSubtreeTag(ContentStreamId $contentStreamId, NodeAggregat
                   AND ph.dimensionspacepointhash in (:dimensionSpacePointHashes)
                 UNION ALL
                 SELECT
-                  dh.childnodeanchor
+                  dh.childnodeanchor,
+                  dh.dimensionspacepointhash
                 FROM
                   cte
                   JOIN {$this->tableNames->hierarchyRelation()} dh ON dh.parentnodeanchor = cte.id
                     AND dh.contentstreamid = :contentStreamId
-                    AND dh.dimensionspacepointhash in (:dimensionSpacePointHashes)
+                    AND dh.dimensionspacepointhash = cte.dsp
                 WHERE
                   JSON_EXTRACT(dh.subtreetags, :tagPath) != TRUE
               )
-              SELECT DISTINCT id FROM cte
-            )
-              AND contentstreamid = :contentStreamId
-              AND dimensionspacepointhash in (:dimensionSpacePointHashes)
+              SELECT * FROM cte
+            ) subquery ON h.dimensionspacepointhash = subquery.dsp
+                AND h.childnodeanchor = subquery.id
+                SET subtreetags = IF(
+                (
+                    SELECT containsTag FROM (SELECT
+                        JSON_CONTAINS_PATH(gph.subtreetags, 'one', :tagPath) as containsTag
+                  FROM
+                    {$this->tableNames->hierarchyRelation()} gph
+                    INNER JOIN {$this->tableNames->hierarchyRelation()} ph ON ph.parentnodeanchor = gph.childnodeanchor
+                    INNER JOIN {$this->tableNames->node()} n ON n.relationanchorpoint = ph.childnodeanchor
+                  WHERE
+                    ph.parentnodeanchor = gph.childnodeanchor
+                    AND n.nodeaggregateid = :nodeAggregateId
+                    AND gph.contentstreamid = :contentStreamId
+                  LIMIT 1) as containsTagSubQuery
+                ), JSON_SET(subtreetags, :tagPath, null), JSON_REMOVE(subtreetags, :tagPath)
+              )
+              WHERE contentstreamid = :contentStreamId
         SQL;
         try {
             $this->dbal->executeStatement($removeTagStatement, [