removed deprecated usage of some Twig features

fabpot · fabpot · commit b49ac82bd93e · 2019-05-10T08:53:51.000+02:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -259,7 +259,7 @@
 
                 <h4>Defined as regular env variables</h4>
                 {% 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) }}
