WIP: Rework CatchUp and CatchUp hooks

.composer.json

@@ -42,26 +42,16 @@
       "@test:behat-cli -c Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/behat.yml.dist",
       "@test:behat-cli -c Neos.ContentRepository.Export/Tests/Behavior/behat.yml.dist",
       "@test:behat-cli -c Neos.TimeableNodeVisibility/Tests/Behavior/behat.yml.dist",
-      "../../flow doctrine:migrate --quiet; ../../flow cr:setup",
       "@test:behat-cli -c Neos.Neos/Tests/Behavior/behat.yml"
     ],
-    "test:behavioral:sync": [
-      "@putenv CATCHUPTRIGGER_ENABLE_SYNCHRONOUS_OPTION=1",
-      "@test:behavioral"
-    ],
     "test:behavioral:stop-on-failure": [
       "@test:behat-cli -vvv --stop-on-failure -c Neos.ContentRepository.BehavioralTests/Tests/Behavior/behat.yml.dist",
       "@test:behat-cli -vvv --stop-on-failure -c Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/behat.yml.dist",
       "@test:behat-cli -vvv --stop-on-failure -c Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/behat.yml.dist",
       "@test:behat-cli -vvv --stop-on-failure -c Neos.ContentRepository.Export/Tests/Behavior/behat.yml.dist",
       "@test:behat-cli -vvv --stop-on-failure -c Neos.TimeableNodeVisibility/Tests/Behavior/behat.yml.dist",
-      "../../flow doctrine:migrate --quiet; ../../flow cr:setup",
       "@test:behat-cli -vvv --stop-on-failure -c Neos.Neos/Tests/Behavior/behat.yml"
     ],
-    "test:behavioral:stop-on-failure:sync": [
-      "@putenv CATCHUPTRIGGER_ENABLE_SYNCHRONOUS_OPTION=1",
-      "@test:behavioral:stop-on-failure"
-    ],
     "test": [
       "@test:unit",
       "@test:functional",

.github/workflows/build.yml

@@ -180,11 +180,9 @@ jobs:
               # We enable the race condition tracker
               presets:
                 'default':
-                  projections:
-                    'Neos.ContentRepository:ContentGraph':
-                      catchUpHooks:
-                        'Neos.ContentRepository.BehavioralTests:RaceConditionTracker':
-                          factoryObjectName: Neos\ContentRepository\BehavioralTests\ProjectionRaceConditionTester\RaceTrackerCatchUpHookFactory
+                  hooks:
+                    'Neos.ContentRepository.BehavioralTests:RaceConditionTracker':
+                      factoryObjectName: Neos\ContentRepository\BehavioralTests\ProjectionRaceConditionTester\RaceTrackerContentRepositoryHookFactory
             ContentRepository:
               BehavioralTests:
                 raceConditionTracker:
@@ -249,7 +247,7 @@ jobs:
           # DEBUG MODE: ALTERNATIVELY, comment in the following lines to dump the DB.
           # do not exit the script if the tests break; as we want to upload the database dumps afterwards.
           set +e
-          composer test:behavioral:stop-on-failure:sync
+          composer test:behavioral:stop-on-failure
           retVal=$?
 
           # automatically search for race conditions

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

@@ -44,7 +44,6 @@ public function __construct()
         self::bootstrapFlow();
         $this->contentRepositoryRegistry = $this->getObject(ContentRepositoryRegistry::class);
 
-        $this->setupCRTestSuiteTrait();
         $this->setupDbalGraphAdapterIntegrityViolationTrait();
     }
 

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

@@ -15,6 +15,7 @@
 namespace Neos\ContentGraph\DoctrineDbalAdapter\Tests\Behavior\Features\Bootstrap;
 
 use Behat\Gherkin\Node\TableNode;
+use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Exception\InvalidArgumentException;
 use Neos\ContentGraph\DoctrineDbalAdapter\DoctrineDbalContentGraphProjectionFactory;
@@ -26,7 +27,6 @@
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
 use Neos\ContentRepository\TestSuite\Behavior\Features\Bootstrap\CRTestSuiteRuntimeVariables;
-use Neos\ContentRepositoryRegistry\DoctrineDbalClient\DoctrineDbalClient;
 use Neos\Error\Messages\Error;
 use Neos\Error\Messages\Result;
 use PHPUnit\Framework\Assert;
@@ -40,7 +40,7 @@ trait ProjectionIntegrityViolationDetectionTrait
 {
     use CRTestSuiteRuntimeVariables;
 
-    private DoctrineDbalClient $dbalClient;
+    private Connection $dbal;
 
     protected Result $lastIntegrityViolationDetectionResult;
 
@@ -61,7 +61,7 @@ protected function getTableNamePrefix(): string
 
     public function setupDbalGraphAdapterIntegrityViolationTrait()
     {
-        $this->dbalClient = $this->getObject(DoctrineDbalClient::class);
+        $this->dbal = $this->getObject(Connection::class);
     }
 
     /**
@@ -79,7 +79,7 @@ public function iRemoveTheFollowingSubtreeTag(TableNode $payloadTable): void
         if (!$subtreeTags->contain($subtreeTagToRemove)) {
             throw new \RuntimeException(sprintf('Failed to remove subtree tag "%s" because that tag is not set', $subtreeTagToRemove->value), 1708618267);
         }
-        $this->dbalClient->getConnection()->update(
+        $this->dbal->update(
             $this->getTableNamePrefix() . '_hierarchyrelation',
             [
                 'subtreetags' => json_encode($subtreeTags->without($subtreeTagToRemove), JSON_THROW_ON_ERROR | JSON_FORCE_OBJECT),
@@ -96,7 +96,7 @@ public function iAddTheFollowingHierarchyRelation(TableNode $payloadTable): void
     {
         $dataset = $this->transformPayloadTableToDataset($payloadTable);
         $record = $this->transformDatasetToHierarchyRelationRecord($dataset);
-        $this->dbalClient->getConnection()->insert(
+        $this->dbal->insert(
             $this->getTableNamePrefix() . '_hierarchyrelation',
             $record
         );
@@ -113,7 +113,7 @@ public function iChangeTheFollowingHierarchyRelationsDimensionSpacePointHash(Tab
         $record = $this->transformDatasetToHierarchyRelationRecord($dataset);
         unset($record['position']);
 
-        $this->dbalClient->getConnection()->update(
+        $this->dbal->update(
             $this->getTableNamePrefix() . '_hierarchyrelation',
             [
                 'dimensionspacepointhash' => $dataset['newDimensionSpacePointHash']
@@ -133,7 +133,7 @@ public function iChangeTheFollowingHierarchyRelationsEdgeName(TableNode $payload
         $record = $this->transformDatasetToHierarchyRelationRecord($dataset);
         unset($record['position']);
 
-        $this->dbalClient->getConnection()->update(
+        $this->dbal->update(
             $this->getTableNamePrefix() . '_hierarchyrelation',
             [
                 'name' => $dataset['newName']
@@ -157,7 +157,7 @@ public function iSetTheFollowingPosition(TableNode $payloadTable): void
             'childnodeanchor' => $this->findRelationAnchorPointByDataset($dataset)
         ];
 
-        $this->dbalClient->getConnection()->update(
+        $this->dbal->update(
             $this->getTableNamePrefix() . '_hierarchyrelation',
             [
                 'position' => $dataset['newPosition']
@@ -175,7 +175,7 @@ public function iDetachTheFollowingReferenceRelationFromItsSource(TableNode $pay
     {
         $dataset = $this->transformPayloadTableToDataset($payloadTable);
 
-        $this->dbalClient->getConnection()->update(
+        $this->dbal->update(
             $this->getTableNamePrefix() . '_referencerelation',
             [
                 'nodeanchorpoint' => 7777777
@@ -193,7 +193,7 @@ public function iSetTheFollowingReferencePosition(TableNode $payloadTable): void
     {
         $dataset = $this->transformPayloadTableToDataset($payloadTable);
 
-        $this->dbalClient->getConnection()->update(
+        $this->dbal->update(
             $this->getTableNamePrefix() . '_referencerelation',
             [
                 'position' => $dataset['newPosition']
@@ -263,7 +263,7 @@ private function findHierarchyRelationByIds(
         DimensionSpacePoint $dimensionSpacePoint,
         NodeAggregateId $nodeAggregateId
     ): array {
-        $nodeRecord = $this->dbalClient->getConnection()->executeQuery(
+        $nodeRecord = $this->dbal->executeQuery(
             'SELECT h.*
                 FROM ' . $this->getTableNamePrefix() . '_node n
                 INNER JOIN ' . $this->getTableNamePrefix() . '_hierarchyrelation h
@@ -299,7 +299,7 @@ private function transformPayloadTableToDataset(TableNode $payloadTable): array
      */
     public function iRunIntegrityViolationDetection(): void
     {
-        $projectionIntegrityViolationDetectionRunner = $this->getContentRepositoryService(new DoctrineDbalProjectionIntegrityViolationDetectionRunnerFactory($this->dbalClient));
+        $projectionIntegrityViolationDetectionRunner = $this->getContentRepositoryService(new DoctrineDbalProjectionIntegrityViolationDetectionRunnerFactory($this->dbal));
         $this->lastIntegrityViolationDetectionResult = $projectionIntegrityViolationDetectionRunner->run();
     }
 

Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/Features/Projection/ProjectionIntegrityViolationDetection/HierarchyIntegrityIsProvided.feature

@@ -19,7 +19,6 @@ Feature: Run integrity violation detection regarding hierarchy relations and nod
       | workspaceTitle       | "Live"               |
       | workspaceDescription | "The live workspace" |
       | newContentStreamId   | "cs-identifier"      |
-    And the graph projection is fully up to date
     And I am in the active content stream of workspace "live" and dimension space point {}
     And the command CreateRootNodeAggregateWithNode is executed with payload:
       | Key                         | Value                                                    |
@@ -35,7 +34,6 @@ Feature: Run integrity violation detection regarding hierarchy relations and nod
       | parentNodeAggregateId       | "lady-eleonode-rootford"                                 |
       | nodeName                    | "child-document"                                         |
       | nodeAggregateClassification | "regular"                                                |
-    And the graph projection is fully up to date
 
   Scenario: Detach a hierarchy relation from its parent
     When I add the following hierarchy relation:

Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/Features/Projection/ProjectionIntegrityViolationDetection/NodesHaveAtMostOneParentPerSubgraph.feature

@@ -19,7 +19,6 @@ Feature: Run integrity violation detection regarding parent relations
       | workspaceTitle       | "Live"               |
       | workspaceDescription | "The live workspace" |
       | newContentStreamId   | "cs-identifier"      |
-    And the graph projection is fully up to date
     And I am in the active content stream of workspace "live" and dimension space point {"language":"de"}
     And the command CreateRootNodeAggregateWithNode is executed with payload:
       | Key                         | Value                                                    |
@@ -55,7 +54,6 @@ Feature: Run integrity violation detection regarding parent relations
       | parentNodeAggregateId       | "sir-david-nodenborough"                                 |
       | nodeName                    | "child-document"                                         |
       | nodeAggregateClassification | "regular"                                                |
-    And the graph projection is fully up to date
 
   Scenario: Set a second parent for Nody McNodeface
     And I add the following hierarchy relation:

Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/Features/Projection/ProjectionIntegrityViolationDetection/ReferenceIntegrityIsProvided.feature

@@ -22,7 +22,6 @@ Feature: Run integrity violation detection regarding reference relations
       | workspaceTitle       | "Live"               |
       | workspaceDescription | "The live workspace" |
       | newContentStreamId   | "cs-identifier"      |
-    And the graph projection is fully up to date
     And I am in the active content stream of workspace "live" and dimension space point {"language":"de"}
     And the command CreateRootNodeAggregateWithNode is executed with payload:
       | Key                         | Value                                                    |
@@ -46,7 +45,6 @@ Feature: Run integrity violation detection regarding reference relations
       | coveredDimensionSpacePoints | [{"language":"de"},{"language":"gsw"},{"language":"fr"}] |
       | parentNodeAggregateId       | "lady-eleonode-rootford"                                 |
       | nodeAggregateClassification | "regular"                                                |
-    And the graph projection is fully up to date
 
   Scenario: Detach a reference relation from its source
     When the command SetNodeReferences is executed with payload:
@@ -55,7 +53,6 @@ Feature: Run integrity violation detection regarding reference relations
       | sourceNodeAggregateId           | "source-nodandaise"               |
       | referenceName                   | "referenceProperty"               |
       | references                      | [{"target": "anthony-destinode"}] |
-    And the graph projection is fully up to date
     And I detach the following reference relation from its source:
       | Key                        | Value               |
       | contentStreamId            | "cs-identifier"     |

Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/Features/Projection/ProjectionIntegrityViolationDetection/SiblingsAreDistinctlySorted.feature

@@ -19,13 +19,11 @@ Feature: Run integrity violation detection regarding sibling sorting
       | workspaceTitle       | "Live"               |
       | workspaceDescription | "The live workspace" |
       | newContentStreamId   | "cs-identifier"      |
-    And the graph projection is fully up to date
     And I am in the active content stream of workspace "live" and dimension space point {"language":"de"}
     And the command CreateRootNodeAggregateWithNode is executed with payload:
       | Key                         | Value                                                    |
       | nodeAggregateId             | "lady-eleonode-rootford"                                 |
       | nodeTypeName                | "Neos.ContentRepository:Root"                            |
-    And the graph projection is fully up to date
 
   Scenario: Create two siblings and set the sorting to the same value
     When the event NodeAggregateWithNodeWasCreated was published with payload:
@@ -46,7 +44,6 @@ Feature: Run integrity violation detection regarding sibling sorting
       | coveredDimensionSpacePoints | [{"language":"de"},{"language":"gsw"},{"language":"fr"}] |
       | parentNodeAggregateId       | "lady-eleonode-rootford"                                 |
       | nodeAggregateClassification | "regular"                                                |
-    And the graph projection is fully up to date
     And I set the following position:
       | Key                  | Value              |
       | contentStreamId      | "cs-identifier"    |

Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/Features/Projection/ProjectionIntegrityViolationDetection/SubtreeTagsAreInherited.feature

@@ -19,13 +19,11 @@ Feature: Run integrity violation detection regarding subtree tag inheritance
       | workspaceTitle       | "Live"               |
       | workspaceDescription | "The live workspace" |
       | newContentStreamId   | "cs-identifier"      |
-    And the graph projection is fully up to date
     And I am in the active content stream of workspace "live" and dimension space point {"language":"de"}
     And the command CreateRootNodeAggregateWithNode is executed with payload:
       | Key                         | Value                                                    |
       | nodeAggregateId             | "lady-eleonode-rootford"                                 |
       | nodeTypeName                | "Neos.ContentRepository:Root"                            |
-    And the graph projection is fully up to date
 
   Scenario: Create nodes, disable the topmost and remove some restriction edges manually
     When the event NodeAggregateWithNodeWasCreated was published with payload:
@@ -64,7 +62,6 @@ Feature: Run integrity violation detection regarding subtree tag inheritance
       | nodeAggregateId              | "sir-david-nodenborough"                                 |
       | affectedDimensionSpacePoints | [{"language":"de"},{"language":"gsw"},{"language":"fr"}] |
       | tag                          | "disabled"                                               |
-    And the graph projection is fully up to date
     And I remove the following subtree tag:
       | Key                   | Value                        |
       | contentStreamId       | "cs-identifier"              |

Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/Features/Projection/ProjectionIntegrityViolationDetection/TetheredNodesAreNamed.feature

@@ -19,7 +19,6 @@ Feature: Run projection integrity violation detection regarding naming of tether
       | workspaceTitle             | "Live"                                 |
       | workspaceDescription       | "The live workspace"                   |
       | newContentStreamId | "cs-identifier"                        |
-    And the graph projection is fully up to date
     And I am in the active content stream of workspace "live" and dimension space point {"language":"de"}
     And the command CreateRootNodeAggregateWithNode is executed with payload:
       | Key                         | Value                                  |
@@ -35,7 +34,6 @@ Feature: Run projection integrity violation detection regarding naming of tether
       | parentNodeAggregateId | "lady-eleonode-rootford"                  |
       | nodeName                      | "document"                                |
       | nodeAggregateClassification   | "regular"                                 |
-    And the graph projection is fully up to date
 
   Scenario: Create node variants of different type
     When the event NodeAggregateWithNodeWasCreated was published with payload:
@@ -48,7 +46,6 @@ Feature: Run projection integrity violation detection regarding naming of tether
       | parentNodeAggregateId | "sir-david-nodenborough"                  |
       | nodeName                      | "to-be-hacked-to-null"                    |
       | nodeAggregateClassification   | "tethered"                                |
-    And the graph projection is fully up to date
     And I change the following hierarchy relation's name:
       | Key                        | Value                    |
       | contentStreamId            | "cs-identifier"          |