From ac3ae707cb8e08527f6175461f808ed3b74b98b3 Mon Sep 17 00:00:00 2001 From: Aaron Scherer Date: Mon, 19 Mar 2018 11:38:56 -0700 Subject: [PATCH 1/4] Fixing incompatible env variable usage --- cache/adapter-bundle/1.1/config/packages/cache_adapter.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cache/adapter-bundle/1.1/config/packages/cache_adapter.yaml b/cache/adapter-bundle/1.1/config/packages/cache_adapter.yaml index a9317d57..6a5d8fe1 100644 --- a/cache/adapter-bundle/1.1/config/packages/cache_adapter.yaml +++ b/cache/adapter-bundle/1.1/config/packages/cache_adapter.yaml @@ -1,5 +1,5 @@ cache_adapter: providers: default: - factory: "cache.factory.%env(DEFAULT_CACHE_PROVIDER)%" + factory: "%env(DEFAULT_CACHE_PROVIDER_FACTORY)%" options: "%env(json:DEFAULT_CACHE_PROVIDER_OPTIONS)%" From 56fcddfae6b30d30854064aaf09e7c6672884557 Mon Sep 17 00:00:00 2001 From: Aaron Scherer Date: Mon, 19 Mar 2018 11:40:02 -0700 Subject: [PATCH 2/4] Update manifest.json --- cache/adapter-bundle/1.1/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cache/adapter-bundle/1.1/manifest.json b/cache/adapter-bundle/1.1/manifest.json index b7db6a29..8952f6e5 100644 --- a/cache/adapter-bundle/1.1/manifest.json +++ b/cache/adapter-bundle/1.1/manifest.json @@ -7,7 +7,7 @@ }, "env": { "#1": "Provider types described at: See http://www.php-cache.com/en/latest/symfony/adapter-bundle/#configuration", - "DEFAULT_CACHE_PROVIDER": "array", + "DEFAULT_CACHE_PROVIDER_FACTORY": "array", "DEFAULT_CACHE_PROVIDER_OPTIONS": "[]" } } From 5d625561edc30b76d1059dac459a2603e85e50e9 Mon Sep 17 00:00:00 2001 From: Aaron Scherer Date: Mon, 19 Mar 2018 11:46:03 -0700 Subject: [PATCH 3/4] Update manifest.json --- cache/adapter-bundle/1.1/manifest.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cache/adapter-bundle/1.1/manifest.json b/cache/adapter-bundle/1.1/manifest.json index 8952f6e5..2e1582e8 100644 --- a/cache/adapter-bundle/1.1/manifest.json +++ b/cache/adapter-bundle/1.1/manifest.json @@ -4,10 +4,5 @@ }, "copy-from-recipe": { "config/": "%CONFIG_DIR%/" - }, - "env": { - "#1": "Provider types described at: See http://www.php-cache.com/en/latest/symfony/adapter-bundle/#configuration", - "DEFAULT_CACHE_PROVIDER_FACTORY": "array", - "DEFAULT_CACHE_PROVIDER_OPTIONS": "[]" } } From 4428f5ef223b19c1f7279bc48b76040429cb222e Mon Sep 17 00:00:00 2001 From: Aaron Scherer Date: Mon, 19 Mar 2018 11:46:31 -0700 Subject: [PATCH 4/4] Update cache_adapter.yaml --- cache/adapter-bundle/1.1/config/packages/cache_adapter.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cache/adapter-bundle/1.1/config/packages/cache_adapter.yaml b/cache/adapter-bundle/1.1/config/packages/cache_adapter.yaml index 6a5d8fe1..b543b530 100644 --- a/cache/adapter-bundle/1.1/config/packages/cache_adapter.yaml +++ b/cache/adapter-bundle/1.1/config/packages/cache_adapter.yaml @@ -1,5 +1,4 @@ cache_adapter: providers: default: - factory: "%env(DEFAULT_CACHE_PROVIDER_FACTORY)%" - options: "%env(json:DEFAULT_CACHE_PROVIDER_OPTIONS)%" + factory: cache.factory.array