Merge branch '4.1' into next

* 4.1: [Release] 3.2.14 Revert "Revert "[Twig] twig >= 3.14 is compatible again"" Revert "[Twig] twig >= 3.14 is compatible again" [Store] fix cached store context [Twig] remove deferred blocks [Twig] twig >= 3.14 is compatible again
coreshop · Oct 16, 2024 · e7260f5 · e7260f5
2 parents 3a4c523 + b6428b2
commit e7260f5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git 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/composer.json b/composer.json
@@ -142,7 +142,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"
   },
   "autoload": {

diff --git 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 %}
 </head>
@@ -53,7 +53,7 @@
     {% include '@CoreShopFrontend/_footer.html.twig' %}
 {% endblock %}
 
-{% block scripts deferred %}
+{% block scripts %}
     {{ pimcore_head_script() }}
 {% endblock %}
 </body>

diff --git 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();
         }