BUGFIX: Make cache application identifier configurable

Neos.Flow/Classes/Cache/CacheFactory.php

@@ -81,15 +81,16 @@ public function injectEnvironmentConfiguration(EnvironmentConfiguration $environ
      *
      * @param ApplicationContext $context The current Flow context
      * @param Environment $environment
+     * @param string $applicationIdentifier
      * @Flow\Autowiring(enabled=false)
      */
-    public function __construct(ApplicationContext $context, Environment $environment)
+    public function __construct(ApplicationContext $context, Environment $environment, string $applicationIdentifier)
     {
         $this->context = $context;
         $this->environment = $environment;
 
         $environmentConfiguration = new EnvironmentConfiguration(
-            FLOW_PATH_ROOT . '~' . (string)$environment->getContext(),
+            $applicationIdentifier,
             $environment->getPathToTemporaryDirectory()
         );
 

Neos.Flow/Classes/Core/Booting/Scripts.php

@@ -276,7 +276,7 @@ public static function initializeCacheManagement(Bootstrap $bootstrap)
         $cacheFactoryClass = isset($cacheFactoryObjectConfiguration['className']) ? $cacheFactoryObjectConfiguration['className'] : CacheFactory::class;
 
         /** @var CacheFactory $cacheFactory */
-        $cacheFactory = new $cacheFactoryClass($bootstrap->getContext(), $environment);
+        $cacheFactory = new $cacheFactoryClass($bootstrap->getContext(), $environment, $configurationManager->getConfiguration(ConfigurationManager::CONFIGURATION_TYPE_SETTINGS, 'Neos.Flow.cache.applicationIdentifier'));
 
         $cacheManager = new CacheManager();
         $cacheManager->setCacheConfigurations($configurationManager->getConfiguration(ConfigurationManager::CONFIGURATION_TYPE_CACHES));

Neos.Flow/Classes/Core/Bootstrap.php

@@ -546,8 +546,9 @@ protected function defineConstants()
         }
 
         define('FLOW_ONLY_COMPOSER_LOADER', $onlyUseComposerAutoLoaderForPackageClasses);
-
         define('FLOW_VERSION_BRANCH', '4.3');
+
+        define('FLOW_APPLICATION_CONTEXT', (string)$this->context);
     }
 
     /**

Neos.Flow/Configuration/Objects.yaml

@@ -22,11 +22,15 @@ Composer\Autoload\ClassLoader:
 Neos\Cache\CacheFactoryInterface:
   className: Neos\Flow\Cache\CacheFactory
 
-Neos\Flow\Cache\CacheFactory:
-  arguments:
-    1:
-      setting: Neos.Flow.context
-
+Neos\Flow\Cache\CacheManager:
+  properties:
+    logger:
+      object:
+        factoryObjectName: Neos\Flow\Log\PsrLoggerFactoryInterface
+        factoryMethodName: get
+        arguments:
+          1:
+            value: systemLogger
 
 #                                                                          #
 # I18n                                                                     #

Neos.Flow/Configuration/Settings.Cache.yaml

@@ -0,0 +1,12 @@
+Neos:
+  Flow:
+    cache:
+      # The application identifier can be used by cache backends to differentiate cache entries
+      # with the same cache identifier in the same storage from each other. For example memcache is global,
+      # so if you use it for multiple installations or possibly just for different Flow contexts you need to
+      # find a way to separate entries from each other. This setting will do that.
+      # The default is just for backwards compatibility and might change for the next major. It is not well suited
+      # for installations in which the FLOW_PATH_ROOT changes after each deployment, so in such cases you might
+      # want to exchange it for some hardcoded value identifying this specific installation.
+      # Note that changing it will make cache entries generated with the old identifier useless.
+      applicationIdentifier: '%FLOW_PATH_ROOT%~%FLOW_APPLICATION_CONTEXT%'

Neos.Flow/Tests/Unit/Cache/CacheFactoryTest.php

@@ -75,7 +75,7 @@ public function setUp()
      */
     public function createReturnsInstanceOfTheSpecifiedCacheFrontend()
     {
-        $factory = new CacheFactory(new ApplicationContext('Testing'), $this->mockEnvironment);
+        $factory = new CacheFactory(new ApplicationContext('Testing'), $this->mockEnvironment, 'UnitTesting');
         $factory->injectEnvironmentConfiguration($this->mockEnvironmentConfiguration);
 
         $cache = $factory->create('TYPO3_Flow_Cache_FactoryTest_Cache', VariableFrontend::class, NullBackend::class);
@@ -87,7 +87,7 @@ public function createReturnsInstanceOfTheSpecifiedCacheFrontend()
      */
     public function createInjectsAnInstanceOfTheSpecifiedBackendIntoTheCacheFrontend()
     {
-        $factory = new CacheFactory(new ApplicationContext('Testing'), $this->mockEnvironment);
+        $factory = new CacheFactory(new ApplicationContext('Testing'), $this->mockEnvironment, 'UnitTesting');
         $factory->injectEnvironmentConfiguration($this->mockEnvironmentConfiguration);
 
         $cache = $factory->create('TYPO3_Flow_Cache_FactoryTest_Cache', VariableFrontend::class, FileBackend::class);
@@ -100,7 +100,7 @@ public function createInjectsAnInstanceOfTheSpecifiedBackendIntoTheCacheFrontend
     public function aDifferentDefaultCacheDirectoryIsUsedForPersistentFileCaches()
     {
         $cacheManager = new CacheManager();
-        $factory = new CacheFactory(new ApplicationContext('Testing'), $this->mockEnvironment);
+        $factory = new CacheFactory(new ApplicationContext('Testing'), $this->mockEnvironment, 'UnitTesting');
         $factory->injectCacheManager($cacheManager);
         $factory->injectEnvironmentConfiguration($this->mockEnvironmentConfiguration);