Merge branch '2.2'

ezecosystem · Aug 3, 2018 · bc5a69b · bc5a69b
2 parents 3c1c943 + 98dfbe3
commit bc5a69b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -65,8 +65,8 @@ framework:
     session:
         # https://symfony.com/doc/current/reference/configuration/framework.html#handler-id
         # if handler_id set to null will use default session handler from php.ini
-        handler_id: '%session.handler_id%'
-        save_path: '%session.save_path%'
+        handler_id: '%ezplatform.session.handler_id%'
+        save_path: '%ezplatform.session.save_path%'
         # Note: eZ Platform also allows session name and session cookie configuration to be per SiteAccess, by
         #       default session name will be set to "eZSESSID{siteaccess_hash}" (unique session name per siteaccess)
         #       Further reading on sessions: http://doc.ezplatform.com/en/latest/guide/sessions/

diff --git a/app/config/default_parameters.yml b/app/config/default_parameters.yml
@@ -48,7 +48,7 @@ parameters:
     httpcache_default_ttl: '%env(HTTPCACHE_DEFAULT_TTL)%'
 
     # Session save path as used by symfony session handlers (eg. used for dsn with redis)
-    session.save_path: '%env(SESSION_SAVE_PATH)%'
+    ezplatform.session.save_path: '%env(SESSION_SAVE_PATH)%'
 
     # Recommendation Bundle params
     ez_recommendation.default.yoochoose.customer_id: '%env(RECOMMENDATIONS_CUSTOMER_ID)%'
@@ -102,9 +102,9 @@ parameters:
     # env: HTTPCACHE_PURGE_TYPE
     purge_type: local
 
-    ## Session handler, by default set to file based in order to be able to use %session.save_path%
+    ## Session handler, by default set to file based (instead of ~) in order to be able to use %ezplatform.session.save_path%
     # env: SESSION_HANDLER_ID
-    session.handler_id: session.handler.native_file
+    ezplatform.session.handler_id: session.handler.native_file
 
     # Admin siteaccess group name
     admin_group_name: admin_group
diff --git a/app/config/env/generic.php b/app/config/env/generic.php
@@ -69,5 +69,5 @@
 }
 
 if ($value = getenv('SESSION_HANDLER_ID')) {
-    $container->setParameter('session.handler_id', $value);
+    $container->setParameter('ezplatform.session.handler_id', $value);
 }
diff --git a/app/config/env/platformsh.php b/app/config/env/platformsh.php
@@ -104,16 +104,16 @@
             continue;
         }
 
-        $container->setParameter('session.handler_id', 'ezplatform.core.session.handler.native_redis');
-        $container->setParameter('session.save_path', sprintf('%s:%d', $endpoint['host'], $endpoint['port']));
+        $container->setParameter('ezplatform.session.handler_id', 'ezplatform.core.session.handler.native_redis');
+        $container->setParameter('ezplatform.session.save_path', sprintf('%s:%d', $endpoint['host'], $endpoint['port']));
     }
 } elseif (isset($relationships['rediscache'])) {
     foreach ($relationships['rediscache'] as $endpoint) {
         if ($endpoint['scheme'] !== 'redis') {
             continue;
         }
 
-        $container->setParameter('session.handler_id', 'ezplatform.core.session.handler.native_redis');
-        $container->setParameter('session.save_path', sprintf('%s:%d', $endpoint['host'], $endpoint['port']));
+        $container->setParameter('ezplatform.session.handler_id', 'ezplatform.core.session.handler.native_redis');
+        $container->setParameter('ezplatform.session.save_path', sprintf('%s:%d', $endpoint['host'], $endpoint['port']));
     }
 }