Merge pull request #4329 from neos/zeroDimensionalUriPaths

BUGFIX: Zero dimensional uri paths
neos · Jun 28, 2023 · 35bc7f7 · 35bc7f7
2 parents 37e31aa + 0d2b80b
commit 35bc7f7
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 27 deletions.
diff --git a/....Neos/Classes/FrontendRouting/DimensionResolution/Resolver/AutoUriPathResolverFactory.php b/....Neos/Classes/FrontendRouting/DimensionResolution/Resolver/AutoUriPathResolverFactory.php
@@ -30,7 +30,6 @@
 use Neos\Neos\FrontendRouting\DimensionResolution\Resolver\UriPathResolver\Segments;
 use Neos\Neos\FrontendRouting\DimensionResolution\Resolver\UriPathResolver\Separator;
 
-
 /**
  * @api
  */
@@ -50,33 +49,35 @@ public function create(
             ->getContentDimensionSource()
             ->getContentDimensionsOrderedByPriority();
 
-        if (count($contentDimensions) >= 2) {
-            throw new AutoUriPathResolverConfigurationException(
-                'The AutoUriPathResolverFactory is only meant for single-dimension use cases.'
-                    . ' For everything more advanced, please manually configure UriPathResolver in Settings.yaml.'
-            );
-        }
+        switch (count($contentDimensions)) {
+            case 0:
+                return UriPathResolver::createForNoDimensions();
+            case 1:
+                $contentDimension = reset($contentDimensions);
+                assert($contentDimension instanceof ContentDimension);
+                $mapping = [];
+                foreach ($contentDimension->values as $value) {
+                    // we'll take the Dimension Value as Uri Path Segment value.
+                    $mapping[] = SegmentMappingElement::create($value, $value->value);
+                }
 
-        $contentDimension = reset($contentDimensions);
-        assert($contentDimension instanceof ContentDimension);
-        $mapping = [];
-        foreach ($contentDimension->values as $value) {
-            // we'll take the Dimension Value as Uri Path Segment value.
-            $mapping[] = SegmentMappingElement::create($value, $value->value);
+                $segments = Segments::create(
+                    Segment::create(
+                        $contentDimension->id,
+                        SegmentMapping::create(...$mapping)
+                    )
+                );
+                return UriPathResolver::create(
+                    $segments,
+                    Separator::fromString('-'),
+                    $contentRepository->getContentDimensionSource(),
+                    $siteConfiguration->defaultDimensionSpacePoint
+                );
+            default:
+                throw new AutoUriPathResolverConfigurationException(
+                    'The AutoUriPathResolverFactory is only meant for single-dimension use cases.'
+                    . ' For everything more advanced, please manually configure UriPathResolver in Settings.yaml.'
+                );
         }
-
-        $segments = Segments::create(
-            Segment::create(
-                $contentDimension->id,
-                SegmentMapping::create(...$mapping)
-            )
-        );
-
-        return UriPathResolver::create(
-            $segments,
-            Separator::fromString('-'),
-            $contentRepository->getContentDimensionSource(),
-            $siteConfiguration->defaultDimensionSpacePoint
-        );
     }
 }
diff --git a/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/UriPathResolver.php b/Neos.Neos/Classes/FrontendRouting/DimensionResolution/Resolver/UriPathResolver.php
@@ -76,6 +76,16 @@ public static function create(
         );
     }
 
+    public static function createForNoDimensions(): self
+    {
+        return new self(
+            [],
+            [],
+            Segments::create(),
+            DimensionSpacePoint::fromArray([])
+        );
+    }
+
     private static function validate(
         Segments $segments,
         Separator $separator,