Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	composer.json

app/config/cache_pool/cache.memcached.yml

@@ -8,3 +8,10 @@ services:
               # Example from vendor/symfony/symfony/src/Symfony/Component/Cache/Traits/MemcachedTrait.php:
               # memcached://user:pass@localhost?weight=33'
               provider: 'memcached://%cache_dsn%'
+              # Cache namespace prefix overriding the one used by Symfony globally
+              # This makes sure cache is reliably shared across whole cluster and all Symfony env's
+              # Can be used for blue/green deployment strategies when changes affect content cache.
+              # For multi db setup adapt this to be unique per pool (one pool per database)
+              # If you prefer default behaviour set this to null or comment out, and consider for instance:
+              # https://symfony.com/doc/current/reference/configuration/framework.html#prefix-seed
+              namespace: '%cache_namespace%'

app/config/cache_pool/cache.redis.yml

@@ -10,3 +10,10 @@ services:
               # redis://secret@example.com:1234/13
               # redis://secret@/var/run/redis.sock/13?persistent_id=4&class=Redis&timeout=3&retry_interval=3
               provider: 'redis://%cache_dsn%'
+              # Cache namespace prefix overriding the one used by Symfony by default
+              # This makes sure cache is reliably shared across whole cluster and all Symfony env's
+              # Can be used for blue/green deployment strategies when changes affect content cache.
+              # For multi db setup adapt this to be unique per pool (one pool per database)
+              # If you prefer default behaviour set this to null or comment out, and consider for instance:
+              # https://symfony.com/doc/current/reference/configuration/framework.html#prefix-seed
+              namespace: '%cache_namespace%'

app/config/default_parameters.yml

@@ -35,6 +35,10 @@ parameters:
 
     # Cache DSN, see app/config/services/cache.yml for examples:
     cache_dsn: '%env(CACHE_DSN)%'
+
+    # Cache namespace prefix for use with Redis/Memcached, 'ez' by default. 
+    # For further info incl alternatives for "blue/green deployment" and multi repo installs, see: app/config/cache_pool/*.yml
+    cache_namespace: '%env(CACHE_NAMESPACE)%'
 
     # Settings for HttpCache
     purge_server: '%env(HTTPCACHE_PURGE_SERVER)%'
@@ -72,6 +76,8 @@ parameters:
 
     env(CACHE_DSN): localhost
 
+    env(CACHE_NAMESPACE): ez
+
     env(HTTPCACHE_PURGE_SERVER): "http://localhost:80"
 
     env(FASTLY_SERVICE_ID): default_service_id

composer.json

@@ -39,23 +39,23 @@
         "doctrine/orm": "^2.5",
         "sensio/distribution-bundle": "^5.0.22",
         "incenteev/composer-parameter-handler": "^2.1.3",
-        "ezsystems/ezpublish-kernel": "^7.2@dev",
-        "ezsystems/repository-forms": "^2.2@dev",
+        "ezsystems/ezpublish-kernel": "^7.3@dev",
+        "ezsystems/repository-forms": "^2.3@dev",
         "ezsystems/ezplatform-solr-search-engine": "^1.5@dev",
         "ezsystems/ez-support-tools": "^0.2@dev",
         "ezsystems/ezplatform-http-cache": "^0.8@dev",
-        "ezsystems/ezplatform-admin-ui": "^1.2@dev",
-        "ezsystems/ezplatform-admin-ui-modules": "^1.2@dev",
-        "ezsystems/ezplatform-admin-ui-assets": "^3.0@dev",
+        "ezsystems/ezplatform-admin-ui": "^1.3@dev",
+        "ezsystems/ezplatform-admin-ui-modules": "^1.3@dev",
+        "ezsystems/ezplatform-admin-ui-assets": "^3.1@dev",
         "ezsystems/ezplatform-design-engine": "^2.0@dev",
         "ezsystems/ezplatform-standard-design": "^0.1@dev",
         "ezsystems/ezplatform-cron": "^2.0@dev",
-        "ezsystems/date-based-publisher": "^3.0@dev",
-        "ezsystems/flex-workflow": "^3.0@dev",
+        "ezsystems/date-based-publisher": "^3.1@dev",
+        "ezsystems/flex-workflow": "^3.1@dev",
         "ezsystems/ezplatform-page-fieldtype": "^1.1@dev",
         "ezsystems/ezplatform-page-builder": "^1.1@dev",
         "ezsystems/ezplatform-form-builder": "^1.0@dev",
-        "ezsystems/ezplatform-ee-installer": "^2.2@dev",
+        "ezsystems/ezplatform-ee-installer": "^2.3@dev",
         "ezsystems/ezplatform-http-cache-fastly": "^1.1@dev",
         "knplabs/knp-menu-bundle": "^2.2.1",
         "willdurand/js-translation-bundle": "^2.6.6",