Merge pull request #2719 from dpfaffenbauer/twig

[Twig] twig >= 3.14 is compatible again
coreshop · Oct 16, 2024 · 2c54d6a · 2c54d6a
2 parents 44ebd84 + 041592e
commit 2c54d6a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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>