From 74afcd6777d4d27acf2f928a95bd3d12c5919c1a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 10 May 2019 08:05:43 +0200 Subject: [PATCH] removed deprecated usage of some Twig features --- composer.json | 2 +- .../Bridge/Twig/Resources/views/Form/form_div_layout.html.twig | 2 +- src/Symfony/Bridge/Twig/composer.json | 2 +- src/Symfony/Bundle/TwigBundle/composer.json | 2 +- .../Resources/views/Collector/request.html.twig | 2 +- src/Symfony/Bundle/WebProfilerBundle/composer.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index b1fde067a7..8049c9e468 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "doctrine/event-manager": "~1.0", "doctrine/persistence": "~1.0", "fig/link-util": "^1.0", - "twig/twig": "^1.40|^2.9", + "twig/twig": "^1.41|^2.10", "psr/cache": "~1.0", "psr/container": "^1.0", "psr/link": "^1.0", diff --git a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig index 6d96cbd221..a32a19cf05 100644 --- a/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig +++ b/src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig @@ -399,7 +399,7 @@ {# Support #} {%- block form_rows -%} - {% for child in form if not child.rendered %} + {% for child in form|filter(child => not child.rendered) %} {{- form_row(child) -}} {% endfor %} {%- endblock form_rows -%} diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index 9674f21031..345dc26e47 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -18,7 +18,7 @@ "require": { "php": "^7.1.3", "symfony/contracts": "^1.0.2", - "twig/twig": "^1.40|^2.9" + "twig/twig": "^1.41|^2.10" }, "require-dev": { "symfony/asset": "~3.4|~4.0", diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json index 4e163c2eed..d9db82a45c 100644 --- a/src/Symfony/Bundle/TwigBundle/composer.json +++ b/src/Symfony/Bundle/TwigBundle/composer.json @@ -22,7 +22,7 @@ "symfony/http-foundation": "~4.1", "symfony/http-kernel": "~4.1", "symfony/polyfill-ctype": "~1.8", - "twig/twig": "~1.40|~2.9" + "twig/twig": "~1.41|~2.10" }, "require-dev": { "symfony/asset": "~3.4|~4.0", diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig index 923049aebc..03ad94f924 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/request.html.twig @@ -259,7 +259,7 @@

Defined as regular env variables

{% set requestserver = [] %} - {% for key, value in collector.requestserver if key not in collector.dotenvvars.keys %} + {% for key, value in collector.requestserver|filter((_, key) => key not in collector.dotenvvars.keys) %} {% set requestserver = requestserver|merge({(key): value}) %} {% endfor %} {{ include('@WebProfiler/Profiler/table.html.twig', { data: requestserver }, with_context = false) }} diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json index c43de7eef3..7cba80a6c5 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/composer.json +++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json @@ -22,7 +22,7 @@ "symfony/routing": "~3.4|~4.0", "symfony/twig-bundle": "~4.2", "symfony/var-dumper": "~3.4|~4.0", - "twig/twig": "~1.34|~2.4" + "twig/twig": "^1.41|^2.10" }, "require-dev": { "symfony/console": "~3.4|~4.0",