From 85a765ff9661e3a74f8e3b821034c43ea18e9fc2 Mon Sep 17 00:00:00 2001
From: watarukashii <kashii@itm.co.jp>
Date: Tue, 19 Apr 2022 10:17:11 +0900
Subject: [PATCH] =?UTF-8?q?for=E3=82=BF=E3=82=B0=E3=81=ABif=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E3=81=AE=E8=BF=BD=E5=8A=A0=E3=81=AFTwig2.10=E3=81=A7?=
 =?UTF-8?q?=E9=9D=9E=E6=8E=A8=E5=A5=A8=E3=81=AA=E3=81=AE=E3=81=A7=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Resource/template/admin/Setting/System/login_history.twig | 2 +-
 src/Eccube/Resource/template/admin/search_items.twig          | 2 +-
 src/Eccube/Resource/template/default/Shopping/confirm.twig    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Eccube/Resource/template/admin/Setting/System/login_history.twig b/src/Eccube/Resource/template/admin/Setting/System/login_history.twig
index 79124d51b3f..4256a67e126 100644
--- a/src/Eccube/Resource/template/admin/Setting/System/login_history.twig
+++ b/src/Eccube/Resource/template/admin/Setting/System/login_history.twig
@@ -124,7 +124,7 @@ file that was distributed with this source code.
             </div>
 
             {# エンティティ拡張の自動出力 #}
-            {% for f in searchForm if f.vars.eccube_form_options.auto_render %}
+            {% for f in searchForm|filter(f => f.vars.eccube_form_options.auto_render) %}
                 <div class="row mb-2">
                     {% if f.vars.eccube_form_options.form_theme %}
                         {% form_theme f f.vars.eccube_form_options.form_theme %}
diff --git a/src/Eccube/Resource/template/admin/search_items.twig b/src/Eccube/Resource/template/admin/search_items.twig
index 66b7f5f66e0..0cd760a471b 100644
--- a/src/Eccube/Resource/template/admin/search_items.twig
+++ b/src/Eccube/Resource/template/admin/search_items.twig
@@ -9,7 +9,7 @@ For the full copyright and license information, please view the LICENSE
 file that was distributed with this source code.
 #}
 <ul class="list-inline">
-    {% for child in form.children if child.vars.name != '_token' and child.vars.data is not empty %}
+    {% for child in form.children|filter(child => (child.vars.name != '_token' and child.vars.data is not empty)) %}
         {% if false == (child.vars.label == 'admin.list.sort.key' or child.vars.label == 'admin.list.sort.type') %}{# ソートの選択結果は表示しない #}
         <li class="list-inline-item"><span class="font-weight-bold">{{ child.vars.label|trans }}:&nbsp;</span>
             {%- if child.vars.data is iterable -%}
diff --git a/src/Eccube/Resource/template/default/Shopping/confirm.twig b/src/Eccube/Resource/template/default/Shopping/confirm.twig
index 49d5380b397..1121f5f2046 100644
--- a/src/Eccube/Resource/template/default/Shopping/confirm.twig
+++ b/src/Eccube/Resource/template/default/Shopping/confirm.twig
@@ -117,7 +117,7 @@ file that was distributed with this source code.
                             <div class="ec-select">
                                 <label>{{ 'front.shopping.delivery_provider'|trans }}</label>
                                 {% set delivery_fee = 0 %}
-                                {% for item in shipping.order_items if item.isDeliveryFee %}
+                                {% for item in shipping.order_items|filter(item => item.isDeliveryFee) %}
                                     {% set delivery_fee = item.total_price %}
                                 {% endfor %}
                                 {{ Order.Shippings[idx].Delivery }}({{ delivery_fee|price }})
@@ -140,7 +140,7 @@ file that was distributed with this source code.
                 </div>
                 <div class="ec-blockRadio">
                     {% set charge = 0 %}
-                    {% for item in Order.order_items if item.isCharge %}
+                    {% for item in Order.order_items|filter(item => item.isCharge) %}
                         {% set charge = item.total_price %}
                     {% endfor %}
                     {{ Order.Payment }}({{ charge|price }})