TASK: Assert that getRootGeneralizations is never empty as part of …

…the interface This removes manual assertions on the calling site which are never expected.
neos · May 13, 2024 · 3febbd6 · 3febbd6
1 parent 47ad799
commit 3febbd6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/Neos.ContentRepository.Core/Classes/DimensionSpace/InterDimensionalVariationGraph.php b/Neos.ContentRepository.Core/Classes/DimensionSpace/InterDimensionalVariationGraph.php
@@ -117,7 +117,10 @@ public function getWeightedDimensionSpacePointByHash(string $hash): ?WeightedDim
     /**
      * Returns the root generalizations indexed by hash
      *
-     * @return array<string,DimensionSpacePoint>
+     * Even in a zero-dimensional content repository the array will have at least one entry
+     * of an empty dimension space point {@see DimensionSpacePoint::createWithoutDimensions()}
+     *
+     * @return non-empty-array<string,DimensionSpacePoint>
      */
     public function getRootGeneralizations(): array
     {
@@ -127,7 +130,13 @@ public function getRootGeneralizations(): array
                 $rootGeneralizations[$dimensionSpacePointHash] = $weightedDimensionSpacePoint->dimensionSpacePoint;
             }
         }
-
+        if (empty($rootGeneralizations)) {
+            // safeguard, should not happen here:
+            throw new \RuntimeException(
+                'The dimension space is empty, please check your configuration.',
+                1710613747
+            );
+        }
         return $rootGeneralizations;
     }
 

diff --git a/Neos.Neos/Classes/Domain/Service/SiteServiceInternals.php b/Neos.Neos/Classes/Domain/Service/SiteServiceInternals.php
@@ -106,12 +106,6 @@ public function createSiteNodeIfNotExists(Site $site, string $nodeTypeName): voi
         }
 
         $rootDimensionSpacePoints = $this->interDimensionalVariationGraph->getRootGeneralizations();
-        if (empty($rootDimensionSpacePoints)) {
-            throw new \InvalidArgumentException(
-                'The dimension space is empty, please check your configuration.',
-                1651957153
-            );
-        }
         $arbitraryRootDimensionSpacePoint = array_shift($rootDimensionSpacePoints);
 
         $siteNodeAggregateId = NodeAggregateId::create();

diff --git a/Neos.Neos/Classes/View/FusionExceptionViewInternals.php b/Neos.Neos/Classes/View/FusionExceptionViewInternals.php
@@ -31,12 +31,6 @@ public function __construct(
     public function getArbitraryDimensionSpacePoint(): DimensionSpacePoint
     {
         $rootDimensionSpacePoints = $this->interDimensionalVariationGraph->getRootGeneralizations();
-        if (empty($rootDimensionSpacePoints)) {
-            throw new \InvalidArgumentException(
-                'The dimension space is empty, please check your configuration.',
-                1651957153
-            );
-        }
         $arbitraryRootDimensionSpacePoint = array_shift($rootDimensionSpacePoints);
         return $arbitraryRootDimensionSpacePoint;
     }