Merge pull request #3866 from neos/task/4634-make-content-repository-…

…service-internal Task/4634 make content repository service internal
neos · Oct 17, 2024 · 1831094 · 1831094
2 parents fe52b16 + 79a7154
commit 1831094
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 143 deletions.
diff --git a/Classes/Controller/BackendController.php b/Classes/Controller/BackendController.php
@@ -151,14 +151,11 @@ public function indexAction(string $node = null)
         }
         $contentGraph = $contentRepository->getContentGraph($workspace->workspaceName);
 
-        $backendControllerInternals = $this->contentRepositoryRegistry->buildService(
-            $siteDetectionResult->contentRepositoryId,
-            new BackendControllerInternalsFactory()
-        );
-        $defaultDimensionSpacePoint = $backendControllerInternals->getDefaultDimensionSpacePoint();
+        $rootDimensionSpacePoints = $contentRepository->getVariationGraph()->getRootGeneralizations();
+        $arbitraryRootDimensionSpacePoint = array_shift($rootDimensionSpacePoints);
 
         $subgraph = $contentGraph->getSubgraph(
-            $nodeAddress ? $nodeAddress->dimensionSpacePoint : $defaultDimensionSpacePoint,
+            $nodeAddress ? $nodeAddress->dimensionSpacePoint : $arbitraryRootDimensionSpacePoint,
             VisibilityConstraints::withoutRestrictions()
         );
 
@@ -170,7 +167,7 @@ public function indexAction(string $node = null)
         if (!$rootNodeAggregate) {
             throw new \RuntimeException(sprintf('No sites root node found in content repository "%s", while fetching site node "%s"', $contentRepository->id->value, $siteDetectionResult->siteNodeName->value), 1724849303);
         }
-        $rootNode = $rootNodeAggregate->getNodeByCoveredDimensionSpacePoint($defaultDimensionSpacePoint);
+        $rootNode = $rootNodeAggregate->getNodeByCoveredDimensionSpacePoint($arbitraryRootDimensionSpacePoint);
 
         $siteNode = $subgraph->findNodeByPath(
             $siteDetectionResult->siteNodeName->toNodeName(),

diff --git a/Classes/Controller/BackendControllerInternals.php b/Classes/Controller/BackendControllerInternals.php
diff --git a/Classes/Controller/BackendControllerInternalsFactory.php b/Classes/Controller/BackendControllerInternalsFactory.php
diff --git a/Classes/Fusion/Helper/ContentDimensionsHelper.php b/Classes/Fusion/Helper/ContentDimensionsHelper.php
@@ -36,10 +36,8 @@ class ContentDimensionsHelper implements ProtectedContextAwareInterface
      */
     public function contentDimensionsByName(ContentRepositoryId $contentRepositoryId): array
     {
-        $contentDimensionHelperInternals = $this->contentRepositoryRegistry->buildService($contentRepositoryId, new ContentDimensionsHelperInternalsFactory());
-        assert($contentDimensionHelperInternals instanceof ContentDimensionsHelperInternals);
-        $contentDimensionSource = $contentDimensionHelperInternals->contentDimensionSource;
-
+        $contentDimensionSource = $this->contentRepositoryRegistry->get($contentRepositoryId)
+            ->getContentDimensionSource();
         $dimensions = $contentDimensionSource->getContentDimensionsOrderedByPriority();
 
         $result = [];
@@ -72,8 +70,8 @@ public function contentDimensionsByName(ContentRepositoryId $contentRepositoryId
      */
     public function allowedPresetsByName(DimensionSpacePoint $dimensions, ContentRepositoryId $contentRepositoryId): array|object
     {
-        $contentDimensionHelperInternals = $this->contentRepositoryRegistry->buildService($contentRepositoryId, new ContentDimensionsHelperInternalsFactory());
-        $contentDimensionSource = $contentDimensionHelperInternals->contentDimensionSource;
+        $contentDimensionSource = $this->contentRepositoryRegistry->get($contentRepositoryId)
+            ->getContentDimensionSource();
 
         // TODO: re-implement this here; currently EVERYTHING is allowed!!
         $allowedPresets = [];

diff --git a/Classes/Fusion/Helper/ContentDimensionsHelperInternals.php b/Classes/Fusion/Helper/ContentDimensionsHelperInternals.php
diff --git a/Classes/Fusion/Helper/ContentDimensionsHelperInternalsFactory.php b/Classes/Fusion/Helper/ContentDimensionsHelperInternalsFactory.php