Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Twig] twig >= 3.14 is compatible again #2719

Merged
merged 2 commits into from
Oct 16, 2024
Merged

[Twig] twig >= 3.14 is compatible again #2719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6aa3b3
[Twig] twig >= 3.14 is compatible again
dpfaffenbauer Oct 1, 2024
041592e
[Twig] remove deferred blocks
dpfaffenbauer Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
6 changes: 3 additions & 3 deletions src/CoreShop/Bundle/FrontendBundle/Resources/views/layout.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -53,7 +53,7 @@
{% include '@CoreShopFrontend/_footer.html.twig' %}
{% endblock %}

{% block scripts deferred %}
{% block scripts %}
{{ pimcore_head_script() }}
{% endblock %}
</body>
Expand Down