Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 7ca637e

Browse filesBrowse files
fabpotfabpot
committed
bug #31456 Remove deprecated usage of some Twig features (fabpot)
This PR was merged into the 4.2 branch. Discussion ---------- Remove deprecated usage of some Twig features | Q | A | ------------- | --- | Branch? | 4.2 | Bug fix? | yes | New feature? | no <!-- please update src/**/CHANGELOG.md files --> | BC breaks? | no <!-- see https://symfony.com/bc --> | Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files --> | Tests pass? | yes <!-- please add some, will be required by reviewers --> | Fixed tickets | n/a | License | MIT | Doc PR | n/a <!-- Replace this notice by a short README for your feature/bugfix. This will help people understand your PR and can be used as a start for the documentation. Additionally (see https://symfony.com/roadmap): - Bug fixes must be submitted against the lowest maintained branch where they apply (lowest branches are regularly merged to upper ones so they get the fixes too). - Features and deprecations must be submitted against the master branch. --> Commits ------- 74afcd6 removed deprecated usage of some Twig features
2 parents 3fcec72 + 74afcd6 commit 7ca637e
Copy full SHA for 7ca637e

File tree

6 files changed

+6
-6
lines changed
Filter options

6 files changed

+6
-6
lines changed

‎composer.json

Copy file name to clipboardExpand all lines: composer.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"doctrine/event-manager": "~1.0",
2323
"doctrine/persistence": "~1.0",
2424
"fig/link-util": "^1.0",
25-
"twig/twig": "^1.40|^2.9",
25+
"twig/twig": "^1.41|^2.10",
2626
"psr/cache": "~1.0",
2727
"psr/container": "^1.0",
2828
"psr/link": "^1.0",

‎src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@
399399
{# Support #}
400400

401401
{%- block form_rows -%}
402-
{% for child in form if not child.rendered %}
402+
{% for child in form|filter(child => not child.rendered) %}
403403
{{- form_row(child) -}}
404404
{% endfor %}
405405
{%- endblock form_rows -%}

‎src/Symfony/Bridge/Twig/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Twig/composer.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"require": {
1919
"php": "^7.1.3",
2020
"symfony/contracts": "^1.0.2",
21-
"twig/twig": "^1.40|^2.9"
21+
"twig/twig": "^1.41|^2.10"
2222
},
2323
"require-dev": {
2424
"symfony/asset": "~3.4|~4.0",

‎src/Symfony/Bundle/TwigBundle/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/composer.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"symfony/http-foundation": "~4.1",
2323
"symfony/http-kernel": "~4.1",
2424
"symfony/polyfill-ctype": "~1.8",
25-
"twig/twig": "~1.40|~2.9"
25+
"twig/twig": "~1.41|~2.10"
2626
},
2727
"require-dev": {
2828
"symfony/asset": "~3.4|~4.0",

‎src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@
259259

260260
<h4>Defined as regular env variables</h4>
261261
{% set requestserver = [] %}
262-
{% for key, value in collector.requestserver if key not in collector.dotenvvars.keys %}
262+
{% for key, value in collector.requestserver|filter((_, key) => key not in collector.dotenvvars.keys) %}
263263
{% set requestserver = requestserver|merge({(key): value}) %}
264264
{% endfor %}
265265
{{ include('@WebProfiler/Profiler/table.html.twig', { data: requestserver }, with_context = false) }}

‎src/Symfony/Bundle/WebProfilerBundle/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebProfilerBundle/composer.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"symfony/routing": "~3.4|~4.0",
2323
"symfony/twig-bundle": "~4.2",
2424
"symfony/var-dumper": "~3.4|~4.0",
25-
"twig/twig": "~1.34|~2.4"
25+
"twig/twig": "^1.41|^2.10"
2626
},
2727
"require-dev": {
2828
"symfony/console": "~3.4|~4.0",

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.