FEATURE: Allow to have empty uriSegment for host-based default

Classes/Aspects/RouteCacheAspect.php

@@ -0,0 +1,55 @@
+<?php
+namespace Flownative\Neos\HostBasedDefaultPreset\Aspects;
+
+/*
+ * This file is part of the Flownative.Neos.HostBasedDefaultPreset package.
+ *
+ * (c) 2017 Karsten Dambekalns, Flownative GmbH
+ *
+ * This package is Open Source Software. For the full copyright and license
+ * information, please view the LICENSE file which was distributed with this
+ * source code.
+ */
+
+use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Aop\JoinPointInterface;
+use Neos\Flow\Core\Bootstrap;
+use Neos\Flow\Http\HttpRequestHandlerInterface;
+
+/**
+ * @Flow\Scope("singleton")
+ * @Flow\Aspect
+ */
+class RouteCacheAspect
+{
+    /**
+     * @Flow\Inject
+     * @var Bootstrap
+     */
+    protected $bootstrap;
+
+    /**
+     * Add the request host as a tag for the route cache entry
+     *
+     * @Flow\Around("method(Neos\Flow\Mvc\Routing\RouterCachingService->buildResolveCacheIdentifier())")
+     * @param JoinPointInterface $joinPoint The current join point
+     * @return array
+     * @throws \Exception
+     */
+    public function addHostname(JoinPointInterface $joinPoint)
+    {
+        $resolveCacheIdentifier = $joinPoint->getAdviceChain()->proceed($joinPoint);
+
+        $activeRequestHandler = $this->bootstrap->getActiveRequestHandler();
+        if ($activeRequestHandler instanceof HttpRequestHandlerInterface) {
+            $requestedHost = $activeRequestHandler->getHttpRequest()->getUri()->getHost();
+            $resolveCacheIdentifier = md5(sprintf(
+                '%s_%s',
+                $resolveCacheIdentifier,
+                $requestedHost
+            ));
+        }
+
+        return $resolveCacheIdentifier;
+    }
+}

Classes/Service/ConfigurationContentDimensionPresetSource.php

@@ -30,6 +30,12 @@ class ConfigurationContentDimensionPresetSource extends NeosConfigurationContent
      */
     protected $configuration;
 
+    /**
+     * @Flow\InjectConfiguration(path="forceEmptyUriSegment")
+     * @var array
+     */
+    protected $forceEmptyUriSegment;
+
     /**
      * @Flow\InjectConfiguration(path="dimensions")
      * @var array
@@ -42,6 +48,11 @@ class ConfigurationContentDimensionPresetSource extends NeosConfigurationContent
      */
     protected $bootstrap;
 
+    /**
+     * Adjusts the incoming configuration as needed when the object is instantiated.
+     *
+     * @return void
+     */
     protected function initializeObject()
     {
         if ($this->dimensionsSettings === []) {
@@ -58,7 +69,13 @@ protected function initializeObject()
                     $this->dimensionsSettings[$dimensionName],
                     $this->dimensionsSettings[$dimensionName]['defaultPresetByHost'][$requestedHost]
                 )) {
-                    $dimensionConfiguration['defaultPreset'] = $this->dimensionsSettings[$dimensionName]['defaultPresetByHost'][$requestedHost];
+                    $newDefaultPreset = $this->dimensionsSettings[$dimensionName]['defaultPresetByHost'][$requestedHost];
+
+                    $dimensionConfiguration['defaultPreset'] = $newDefaultPreset;
+
+                    if ($this->forceEmptyUriSegment === true) {
+                        $dimensionConfiguration['presets'][$newDefaultPreset]['uriSegment'] = '';
+                    }
                 }
             }
         }

Configuration/Settings.yaml

@@ -1,4 +1,5 @@
 Flownative:
   Neos:
     HostBasedDefaultPreset:
+      forceEmptyUriSegment: false
       dimensions: []

README.md

@@ -19,6 +19,16 @@ After setting up your content dimensions as usual, configure the default presets
                 'acme.com': 'en'
                 'acme.de': 'de'
 
+If you like, you can configure the package to set the `uriSegment` for each default preset to an empty string:
+
+    Flownative:
+      Neos:
+        HostBasedDefaultPreset:
+          forceEmptyUriSegment: true
+
+This way the default dimension value "disappears" from the URL. Make sure to set a segment for all values in the
+"real" dimension configuration, to be able to switch on all hosts without issues!
+
 ## Credits
 
 Development of this package has been sponsored by web&co OG, Vienna, Austria.