Merge pull request #5168 from mhsdesign/task/removeDeprecatedBeta10Apis

TASK: Remove deprecated beta10 apis

Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ContentGraph.php

@@ -186,7 +186,6 @@ public function findNodeAggregateById(
         return $this->nodeFactory->mapNodeRowsToNodeAggregate(
             $this->fetchRows($queryBuilder),
             $this->workspaceName,
-            $this->contentStreamId,
             VisibilityConstraints::withoutRestrictions()
         );
     }
@@ -247,7 +246,6 @@ public function findParentNodeAggregateByChildOriginDimensionSpacePoint(NodeAggr
         return $this->nodeFactory->mapNodeRowsToNodeAggregate(
             $this->fetchRows($queryBuilder),
             $this->workspaceName,
-            $this->contentStreamId,
             VisibilityConstraints::withoutRestrictions()
         );
     }
@@ -334,7 +332,6 @@ private function mapQueryBuilderToNodeAggregate(QueryBuilder $queryBuilder): ?No
         return $this->nodeFactory->mapNodeRowsToNodeAggregate(
             $this->fetchRows($queryBuilder),
             $this->workspaceName,
-            $this->contentStreamId,
             VisibilityConstraints::withoutRestrictions()
         );
     }
@@ -348,7 +345,6 @@ private function mapQueryBuilderToNodeAggregates(QueryBuilder $queryBuilder): No
         return $this->nodeFactory->mapNodeRowsToNodeAggregates(
             $this->fetchRows($queryBuilder),
             $this->workspaceName,
-            $this->contentStreamId,
             VisibilityConstraints::withoutRestrictions()
         );
     }

Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ContentSubgraph.php

@@ -300,7 +300,6 @@ public function findSubtree(NodeAggregateId $entryNodeAggregateId, FindSubtreeFi
             $node = $this->nodeFactory->mapNodeRowToNode(
                 $nodeData,
                 $this->workspaceName,
-                $this->contentStreamId,
                 $this->dimensionSpacePoint,
                 $this->visibilityConstraints
             );
@@ -333,7 +332,6 @@ public function findAncestorNodes(NodeAggregateId $entryNodeAggregateId, FindAnc
         return $this->nodeFactory->mapNodeRowsToNodes(
             $nodeRows,
             $this->workspaceName,
-            $this->contentStreamId,
             $this->dimensionSpacePoint,
             $this->visibilityConstraints
         );
@@ -387,7 +385,6 @@ public function findClosestNode(NodeAggregateId $entryNodeAggregateId, FindClose
         return $this->nodeFactory->mapNodeRowsToNodes(
             $nodeRows,
             $this->workspaceName,
-            $this->contentStreamId,
             $this->dimensionSpacePoint,
             $this->visibilityConstraints
         )->first();
@@ -407,7 +404,6 @@ public function findDescendantNodes(NodeAggregateId $entryNodeAggregateId, FindD
         return $this->nodeFactory->mapNodeRowsToNodes(
             $nodeRows,
             $this->workspaceName,
-            $this->contentStreamId,
             $this->dimensionSpacePoint,
             $this->visibilityConstraints
         );
@@ -679,7 +675,6 @@ private function fetchNode(QueryBuilder $queryBuilder): ?Node
         return $this->nodeFactory->mapNodeRowToNode(
             $nodeRow,
             $this->workspaceName,
-            $this->contentStreamId,
             $this->dimensionSpacePoint,
             $this->visibilityConstraints
         );
@@ -695,7 +690,6 @@ private function fetchNodes(QueryBuilder $queryBuilder): Nodes
         return $this->nodeFactory->mapNodeRowsToNodes(
             $nodeRows,
             $this->workspaceName,
-            $this->contentStreamId,
             $this->dimensionSpacePoint,
             $this->visibilityConstraints
         );
@@ -717,7 +711,12 @@ private function fetchReferences(QueryBuilder $queryBuilder): References
         } catch (DBALException $e) {
             throw new \RuntimeException(sprintf('Failed to fetch references: %s', $e->getMessage()), 1678364944, $e);
         }
-        return $this->nodeFactory->mapReferenceRowsToReferences($referenceRows, $this->workspaceName, $this->contentStreamId, $this->dimensionSpacePoint, $this->visibilityConstraints);
+        return $this->nodeFactory->mapReferenceRowsToReferences(
+            $referenceRows,
+            $this->workspaceName,
+            $this->dimensionSpacePoint,
+            $this->visibilityConstraints
+        );
     }
 
     /**

Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/NodeFactory.php

@@ -64,7 +64,6 @@ public function __construct(
     public function mapNodeRowToNode(
         array $nodeRow,
         WorkspaceName $workspaceName,
-        ContentStreamId $contentStreamId,
         DimensionSpacePoint $dimensionSpacePoint,
         VisibilityConstraints $visibilityConstraints
     ): Node {
@@ -85,8 +84,7 @@ public function mapNodeRowToNode(
                 isset($nodeRow['lastmodified']) ? self::parseDateTimeString($nodeRow['lastmodified']) : null,
                 isset($nodeRow['originallastmodified']) ? self::parseDateTimeString($nodeRow['originallastmodified']) : null,
             ),
-            $visibilityConstraints,
-            $contentStreamId
+            $visibilityConstraints
         );
     }
 
@@ -96,15 +94,13 @@ public function mapNodeRowToNode(
     public function mapNodeRowsToNodes(
         array $nodeRows,
         WorkspaceName $workspaceName,
-        ContentStreamId $contentStreamId,
         DimensionSpacePoint $dimensionSpacePoint,
         VisibilityConstraints $visibilityConstraints
     ): Nodes {
         return Nodes::fromArray(
             array_map(fn (array $nodeRow) => $this->mapNodeRowToNode(
                 $nodeRow,
                 $workspaceName,
-                $contentStreamId,
                 $dimensionSpacePoint,
                 $visibilityConstraints
             ), $nodeRows)
@@ -125,7 +121,6 @@ public function createPropertyCollectionFromJsonString(string $jsonString): Prop
     public function mapReferenceRowsToReferences(
         array $nodeRows,
         WorkspaceName $workspaceName,
-        ContentStreamId $contentStreamId,
         DimensionSpacePoint $dimensionSpacePoint,
         VisibilityConstraints $visibilityConstraints
     ): References {
@@ -134,7 +129,6 @@ public function mapReferenceRowsToReferences(
             $node = $this->mapNodeRowToNode(
                 $nodeRow,
                 $workspaceName,
-                $contentStreamId,
                 $dimensionSpacePoint,
                 $visibilityConstraints
             );
@@ -157,7 +151,6 @@ public function mapReferenceRowsToReferences(
     public function mapNodeRowsToNodeAggregate(
         array $nodeRows,
         WorkspaceName $workspaceName,
-        ContentStreamId $contentStreamId,
         VisibilityConstraints $visibilityConstraints
     ): ?NodeAggregate {
         if (empty($nodeRows)) {
@@ -184,7 +177,6 @@ public function mapNodeRowsToNodeAggregate(
                 $nodesByOccupiedDimensionSpacePoint[$occupiedDimensionSpacePoint->hash] = $this->mapNodeRowToNode(
                     $nodeRow,
                     $workspaceName,
-                    $contentStreamId,
                     $occupiedDimensionSpacePoint->toDimensionSpacePoint(),
                     $visibilityConstraints
                 );
@@ -230,7 +222,6 @@ public function mapNodeRowsToNodeAggregate(
             $nodesByCoveredDimensionSpacePoints,
             OriginByCoverage::fromArray($occupationByCovering),
             $dimensionSpacePointsBySubtreeTags,
-            $contentStreamId,
         );
     }
 
@@ -241,7 +232,6 @@ public function mapNodeRowsToNodeAggregate(
     public function mapNodeRowsToNodeAggregates(
         array $nodeRows,
         WorkspaceName $workspaceName,
-        ContentStreamId $contentStreamId,
         VisibilityConstraints $visibilityConstraints
     ): NodeAggregates {
         if (empty($nodeRows)) {
@@ -274,7 +264,6 @@ public function mapNodeRowsToNodeAggregates(
                     [$rawNodeAggregateId][$occupiedDimensionSpacePoint->hash] = $this->mapNodeRowToNode(
                         $nodeRow,
                         $workspaceName,
-                        $contentStreamId,
                         $occupiedDimensionSpacePoint->toDimensionSpacePoint(),
                         $visibilityConstraints
                     );
@@ -338,7 +327,6 @@ public function mapNodeRowsToNodeAggregates(
                     $occupationByCoveringByNodeAggregate[$rawNodeAggregateId]
                 ),
                 $dimensionSpacePointsBySubtreeTagsByNodeAggregate[$rawNodeAggregateId],
-                $contentStreamId,
             );
         }
 

Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Repository/NodeFactory.php

@@ -65,8 +65,7 @@ public function __construct(
     public function mapNodeRowToNode(
         array $nodeRow,
         VisibilityConstraints $visibilityConstraints,
-        ?DimensionSpacePoint $dimensionSpacePoint = null,
-        ?ContentStreamId $contentStreamId = null
+        ?DimensionSpacePoint $dimensionSpacePoint = null
     ): Node {
         return Node::create(
             $this->contentRepositoryId,
@@ -92,7 +91,6 @@ public function mapNodeRowToNode(
                 isset($nodeRow['originallastmodified']) ? self::parseDateTimeString($nodeRow['originallastmodified']) : null,
             ),
             $visibilityConstraints,
-            $contentStreamId ?: ContentStreamId::fromString($nodeRow['contentstreamid']),
         );
     }
 
@@ -101,16 +99,14 @@ public function mapNodeRowToNode(
      */
     public function mapNodeRowsToNodes(
         array $nodeRows,
-        VisibilityConstraints $visibilityConstraints,
-        ContentStreamId $contentStreamId = null
+        VisibilityConstraints $visibilityConstraints
     ): Nodes {
         $nodes = [];
         foreach ($nodeRows as $nodeRow) {
             $nodes[] = $this->mapNodeRowToNode(
                 $nodeRow,
                 $visibilityConstraints,
-                null,
-                $contentStreamId
+                null
             );
         }
 
@@ -122,17 +118,15 @@ public function mapNodeRowsToNodes(
      */
     public function mapReferenceRowsToReferences(
         array $referenceRows,
-        VisibilityConstraints $visibilityConstraints,
-        ContentStreamId $contentStreamId = null
+        VisibilityConstraints $visibilityConstraints
     ): References {
         $references = [];
         foreach ($referenceRows as $referenceRow) {
             $references[] = new Reference(
                 $this->mapNodeRowToNode(
                     $referenceRow,
                     $visibilityConstraints,
-                    null,
-                    $contentStreamId
+                    null
                 ),
                 ReferenceName::fromString($referenceRow['referencename']),
                 $referenceRow['referenceproperties']
@@ -205,8 +199,7 @@ public function mapNodeRowsToNodeAggregate(
             $node = $this->mapNodeRowToNode(
                 $nodeRow,
                 $visibilityConstraints,
-                null,
-                $contentStreamId
+                null
             );
             $nodeAggregateId = $nodeAggregateId
                 ?: NodeAggregateId::fromString($nodeRow['nodeaggregateid']);
@@ -247,7 +240,6 @@ public function mapNodeRowsToNodeAggregate(
             OriginByCoverage::fromArray($occupationByCovered),
             // TODO implement (see \Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\NodeFactory::mapNodeRowsToNodeAggregate())
             DimensionSpacePointsBySubtreeTags::create(),
-            $contentStreamId,
         );
     }
 
@@ -292,8 +284,7 @@ public function mapNodeRowsToNodeAggregates(array $nodeRows, VisibilityConstrain
             $node = $this->mapNodeRowToNode(
                 $nodeRow,
                 $visibilityConstraints,
-                null,
-                $contentStreamId
+                null
             );
             $nodeAggregateIds[$key] = NodeAggregateId::fromString(
                 $nodeRow['nodeaggregateid']
@@ -346,7 +337,6 @@ public function mapNodeRowsToNodeAggregates(array $nodeRows, VisibilityConstrain
                 OriginByCoverage::fromArray($occupationByCovered[$key]),
                 // TODO implement (see \Neos\ContentGraph\DoctrineDbalAdapter\Domain\Repository\NodeFactory::mapNodeRowsToNodeAggregates())
                 DimensionSpacePointsBySubtreeTags::create(),
-                $contentStreamId,
             );
         }
 

Neos.ContentRepository.Core/Classes/CommandHandler/CommandResult.php

@@ -12,16 +12,12 @@
  *
  * This will no longer be required in the future see https://github.com/neos/neos-development-collection/pull/4988
  *
- * @deprecated this b/c layer will be removed with the next beta or before Neos 9 final release
- * @api
+ * TODO decide whether it might be useful to have some return type that tells something about the published events
+ * (e.g. last sequence number) and maybe even about the updated/skipped projections
+ * see discussion: https://github.com/neos/neos-development-collection/pull/5061#issuecomment-2117643465
+ *
+ * @internal this object will either be transformed into something useful and made API or deleted.
  */
 final readonly class CommandResult
 {
-    /**
-     * We block by default thus you must not call this method or use this legacy stub
-     * @deprecated this b/c layer will be removed with the next beta or before Neos 9 final release
-     */
-    public function block(): void
-    {
-    }
 }

Neos.ContentRepository.Core/Classes/ContentRepository.php

@@ -90,10 +90,6 @@ public function __construct(
     /**
      * The only API to send commands (mutation intentions) to the system.
      *
-     * The system is ASYNCHRONOUS by default, so that means the projection is not directly up to date. If you
-     * need to be synchronous, call {@see CommandResult::block()} on the returned CommandResult - then the system
-     * waits until the projections are up to date.
-     *
      * @param CommandInterface $command
      * @return CommandResult
      */