From a6aa3b3d65c99f997cd446ef70d23fcd49b5c783 Mon Sep 17 00:00:00 2001 From: Dominik Pfaffenbauer Date: Tue, 1 Oct 2024 08:40:43 +0200 Subject: [PATCH 1/6] [Twig] twig >= 3.14 is compatible again --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e1bee994ab..b0d3973183 100644 --- a/composer.json +++ b/composer.json @@ -139,7 +139,7 @@ }, "conflict": { "jms/serializer-bundle": "4.1.0", - "twig/twig": "^3.9.0", + "twig/twig": ">=3.9.0 <3.14.0", "pimcore/pimcore": "11.3.1" }, "suggest": { From 041592e8eb44f61e7f016c3f798866e84e3fdbee Mon Sep 17 00:00:00 2001 From: Dominik Pfaffenbauer Date: Fri, 4 Oct 2024 10:03:21 +0200 Subject: [PATCH 2/6] [Twig] remove deferred blocks --- .../Bundle/FrontendBundle/Resources/views/layout.html.twig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CoreShop/Bundle/FrontendBundle/Resources/views/layout.html.twig b/src/CoreShop/Bundle/FrontendBundle/Resources/views/layout.html.twig index 9e42a0e732..9a5077c6ad 100644 --- a/src/CoreShop/Bundle/FrontendBundle/Resources/views/layout.html.twig +++ b/src/CoreShop/Bundle/FrontendBundle/Resources/views/layout.html.twig @@ -25,12 +25,12 @@ {% do pimcore_head_title().setSeparator(' | ') %} {%- endapply -%} - {% block layout_head_meta deferred %} + {% block layout_head_meta %} {{ pimcore_head_title('CoreShop') }} {{ pimcore_head_meta() }} {% endblock %} - {% block head_stylesheets deferred %} + {% block head_stylesheets %} {{ pimcore_head_link() }} {% endblock %} @@ -53,7 +53,7 @@ {% include '@CoreShopFrontend/_footer.html.twig' %} {% endblock %} -{% block scripts deferred %} +{% block scripts %} {{ pimcore_head_script() }} {% endblock %} From 22b1f32c4d977ff293b181c4e62689babef1dc1d Mon Sep 17 00:00:00 2001 From: Dominik Pfaffenbauer Date: Wed, 9 Oct 2024 10:22:50 +0200 Subject: [PATCH 3/6] [Store] fix cached store context --- .../Component/Store/Context/RequestBased/CachedStoreContext.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CoreShop/Component/Store/Context/RequestBased/CachedStoreContext.php b/src/CoreShop/Component/Store/Context/RequestBased/CachedStoreContext.php index 4d69fafcfc..01cdf005b9 100644 --- a/src/CoreShop/Component/Store/Context/RequestBased/CachedStoreContext.php +++ b/src/CoreShop/Component/Store/Context/RequestBased/CachedStoreContext.php @@ -36,8 +36,8 @@ public function __construct( public function getStore(): StoreInterface { if (false === $this->initialized) { - $this->initialized = true; $this->cachedStore = $this->requestBasedStoreContext->getStore(); + $this->initialized = true; } elseif (!$this->cachedStore) { throw new StoreNotFoundException(); } From bd184a9388ae5ca2edc27dafa36af94210ded193 Mon Sep 17 00:00:00 2001 From: Dominik Date: Wed, 16 Oct 2024 08:37:52 +0200 Subject: [PATCH 4/6] Revert "[Twig] twig >= 3.14 is compatible again" --- composer.json | 2 +- .../Bundle/FrontendBundle/Resources/views/layout.html.twig | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index b0d3973183..e1bee994ab 100644 --- a/composer.json +++ b/composer.json @@ -139,7 +139,7 @@ }, "conflict": { "jms/serializer-bundle": "4.1.0", - "twig/twig": ">=3.9.0 <3.14.0", + "twig/twig": "^3.9.0", "pimcore/pimcore": "11.3.1" }, "suggest": { diff --git a/src/CoreShop/Bundle/FrontendBundle/Resources/views/layout.html.twig b/src/CoreShop/Bundle/FrontendBundle/Resources/views/layout.html.twig index 9a5077c6ad..9e42a0e732 100644 --- a/src/CoreShop/Bundle/FrontendBundle/Resources/views/layout.html.twig +++ b/src/CoreShop/Bundle/FrontendBundle/Resources/views/layout.html.twig @@ -25,12 +25,12 @@ {% do pimcore_head_title().setSeparator(' | ') %} {%- endapply -%} - {% block layout_head_meta %} + {% block layout_head_meta deferred %} {{ pimcore_head_title('CoreShop') }} {{ pimcore_head_meta() }} {% endblock %} - {% block head_stylesheets %} + {% block head_stylesheets deferred %} {{ pimcore_head_link() }} {% endblock %} @@ -53,7 +53,7 @@ {% include '@CoreShopFrontend/_footer.html.twig' %} {% endblock %} -{% block scripts %} +{% block scripts deferred %} {{ pimcore_head_script() }} {% endblock %} From 9485198f734aea91d14d181707ab79278f1bc865 Mon Sep 17 00:00:00 2001 From: Dominik Date: Wed, 16 Oct 2024 08:44:14 +0200 Subject: [PATCH 5/6] Revert "Revert "[Twig] twig >= 3.14 is compatible again"" --- composer.json | 2 +- .../Bundle/FrontendBundle/Resources/views/layout.html.twig | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index e1bee994ab..b0d3973183 100644 --- a/composer.json +++ b/composer.json @@ -139,7 +139,7 @@ }, "conflict": { "jms/serializer-bundle": "4.1.0", - "twig/twig": "^3.9.0", + "twig/twig": ">=3.9.0 <3.14.0", "pimcore/pimcore": "11.3.1" }, "suggest": { diff --git a/src/CoreShop/Bundle/FrontendBundle/Resources/views/layout.html.twig b/src/CoreShop/Bundle/FrontendBundle/Resources/views/layout.html.twig index 9e42a0e732..9a5077c6ad 100644 --- a/src/CoreShop/Bundle/FrontendBundle/Resources/views/layout.html.twig +++ b/src/CoreShop/Bundle/FrontendBundle/Resources/views/layout.html.twig @@ -25,12 +25,12 @@ {% do pimcore_head_title().setSeparator(' | ') %} {%- endapply -%} - {% block layout_head_meta deferred %} + {% block layout_head_meta %} {{ pimcore_head_title('CoreShop') }} {{ pimcore_head_meta() }} {% endblock %} - {% block head_stylesheets deferred %} + {% block head_stylesheets %} {{ pimcore_head_link() }} {% endblock %} @@ -53,7 +53,7 @@ {% include '@CoreShopFrontend/_footer.html.twig' %} {% endblock %} -{% block scripts deferred %} +{% block scripts %} {{ pimcore_head_script() }} {% endblock %} From ee3c2848070021d3856ada96631da7c34325a24b Mon Sep 17 00:00:00 2001 From: Dominik Pfaffenbauer Date: Wed, 16 Oct 2024 11:46:33 +0200 Subject: [PATCH 6/6] [Release] 3.2.14 --- CHANGELOG-3.2.x.md | 5 +++++ src/CoreShop/Bundle/CoreBundle/Application/Version.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG-3.2.x.md b/CHANGELOG-3.2.x.md index e4b290b20c..bf24adc9c5 100644 --- a/CHANGELOG-3.2.x.md +++ b/CHANGELOG-3.2.x.md @@ -1,3 +1,8 @@ +# 3.2.14 +* [Pimcore] introduce LocalizedFallbackHelper by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2723 +* [Translations] add missing translations by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2721 +* [Payum] 2.6 compatibility by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2722 + # 3.2.13 * [Currency/Money] implement Pimcore Grid Column by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2686 * [StorageList] make sure to remove StorageList from Session on Logout by @dpfaffenbauer in https://github.com/coreshop/CoreShop/pull/2684 diff --git a/src/CoreShop/Bundle/CoreBundle/Application/Version.php b/src/CoreShop/Bundle/CoreBundle/Application/Version.php index 1ca9465a31..1f9253f8b6 100644 --- a/src/CoreShop/Bundle/CoreBundle/Application/Version.php +++ b/src/CoreShop/Bundle/CoreBundle/Application/Version.php @@ -24,7 +24,7 @@ final class Version public const MINOR_VERSION = '2'; - public const RELEASE_VERSION = '13'; + public const RELEASE_VERSION = '14'; public const EXTRA_VERSION = '';