Failed Conditions
Pull Request — experimental/3.1 (#2526)
by Kentaro
40:11 queued 13:18
created
src/Eccube/Service/Calculator/OrderItemCollection.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@
 block discarded – undo
63 63
     public function hasProductByName($productName)
64 64
     {
65 65
         $OrderItems = $this->filter(
66
-            function (ItemInterface $OrderItem) use ($productName) {
66
+            function(ItemInterface $OrderItem) use ($productName) {
67 67
                 /* @var OrderItem $OrderItem */
68 68
                 return $OrderItem->getProductName() == $productName;
69 69
             });
Please login to merge, or discard this patch.
src/Eccube/Service/Calculator/CalculateContext.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@
 block discarded – undo
23 23
         $this->buildCalculator($this->CalculateStrategies);
24 24
 
25 25
         /** @var OrderItem $OrderItem */
26
-        foreach($this->OrderItems as $OrderItem) {
26
+        foreach ($this->OrderItems as $OrderItem) {
27 27
             if ($OrderItem instanceof OrderItem) {
28 28
                 if (!$this->Order->getItems()->contains($OrderItem)) {
29 29
                     $OrderItem->setOrder($this->Order);
Please login to merge, or discard this patch.
src/Eccube/Service/PurchaseFlow/ItemCollection.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
     public function getProductClasses()
32 32
     {
33 33
         return $this->filter(
34
-            function (ItemInterface $OrderItem) {
34
+            function(ItemInterface $OrderItem) {
35 35
                 return $OrderItem->isProduct();
36 36
             });
37 37
     }
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
     public function getDeliveryFees()
40 40
     {
41 41
         return $this->filter(
42
-            function (ItemInterface $OrderItem) {
42
+            function(ItemInterface $OrderItem) {
43 43
                 return $OrderItem->isDeliveryFee();
44 44
             });
45 45
     }
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
     public function getCharges()
48 48
     {
49 49
         return $this->filter(
50
-            function (ItemInterface $OrderItem) {
50
+            function(ItemInterface $OrderItem) {
51 51
                 return $OrderItem->isCharge();
52 52
             });
53 53
     }
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
     public function getDiscounts()
56 56
     {
57 57
         return $this->filter(
58
-            function (ItemInterface $OrderItem) {
58
+            function(ItemInterface $OrderItem) {
59 59
                 return $OrderItem->isDiscount();
60 60
             });
61 61
     }
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
     public function hasProductByName($productName)
69 69
     {
70 70
         $OrderItems = $this->filter(
71
-            function (ItemInterface $OrderItem) use ($productName) {
71
+            function(ItemInterface $OrderItem) use ($productName) {
72 72
                 /* @var OrderItem $OrderItem */
73 73
                 return $OrderItem->getProductName() == $productName;
74 74
             });
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
      */
86 86
     public function hasItemByOrderItemType($OrderItemType)
87 87
     {
88
-        $filteredItems = $this->filter(function (ItemInterface $OrderItem) use ($OrderItemType) {
88
+        $filteredItems = $this->filter(function(ItemInterface $OrderItem) use ($OrderItemType) {
89 89
             /* @var OrderItem $OrderItem */
90 90
             return $OrderItem->getOrderItemType() && $OrderItem->getOrderItemType()->getId() == $OrderItemType->getId();
91 91
         });
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
     public function sort()
102 102
     {
103 103
         $Items = $this->toArray();
104
-        usort($Items, function (ItemInterface $a, ItemInterface $b) {
104
+        usort($Items, function(ItemInterface $a, ItemInterface $b) {
105 105
             if ($a->getOrderItemType() === $b->getOrderItemType()) {
106 106
                 return ($a->getId() < $b->getId()) ? -1 : 1;
107 107
             } elseif ($a->isProduct()) {
Please login to merge, or discard this patch.
src/Eccube/ServiceProvider/CompatRepositoryProvider.php 1 patch
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -11,163 +11,163 @@
 block discarded – undo
11 11
     public function register(Container $app)
12 12
     {
13 13
         // Repository
14
-        $app['eccube.repository.master.authority'] = function () use ($app) {
14
+        $app['eccube.repository.master.authority'] = function() use ($app) {
15 15
             return $app['Eccube\Repository\Master\AuthorityRepository'];
16 16
         };
17
-        $app['eccube.repository.master.tag'] = function () use ($app) {
17
+        $app['eccube.repository.master.tag'] = function() use ($app) {
18 18
             return $app['Eccube\Repository\Master\TagRepository'];
19 19
         };
20
-        $app['eccube.repository.master.pref'] = function () use ($app) {
20
+        $app['eccube.repository.master.pref'] = function() use ($app) {
21 21
             return $app['Eccube\Repository\Master\PrefRepository'];
22 22
         };
23
-        $app['eccube.repository.master.sex'] = function () use ($app) {
23
+        $app['eccube.repository.master.sex'] = function() use ($app) {
24 24
             return $app['Eccube\Repository\Master\SexRepository'];
25 25
         };
26
-        $app['eccube.repository.master.product_status'] = function () use ($app) {
26
+        $app['eccube.repository.master.product_status'] = function() use ($app) {
27 27
             return $app['Eccube\Repository\Master\ProductStatusRepository'];
28 28
         };
29
-        $app['eccube.repository.master.product_type'] = function () use ($app) {
29
+        $app['eccube.repository.master.product_type'] = function() use ($app) {
30 30
             return $app['Eccube\Repository\Master\ProductTypeRepository'];
31 31
         };
32
-        $app['eccube.repository.master.page_max'] = function () use ($app) {
32
+        $app['eccube.repository.master.page_max'] = function() use ($app) {
33 33
             return $app['Eccube\Repository\Master\PageMaxRepository'];
34 34
         };
35
-        $app['eccube.repository.master.order_status'] = function () use ($app) {
35
+        $app['eccube.repository.master.order_status'] = function() use ($app) {
36 36
             return $app['Eccube\Repository\Master\OrderStatusRepository'];
37 37
         };
38
-        $app['eccube.repository.master.product_list_max'] = function () use ($app) {
38
+        $app['eccube.repository.master.product_list_max'] = function() use ($app) {
39 39
             return $app['Eccube\Repository\Master\ProductListMaxRepository'];
40 40
         };
41
-        $app['eccube.repository.master.product_list_order_by'] = function () use ($app) {
41
+        $app['eccube.repository.master.product_list_order_by'] = function() use ($app) {
42 42
             return $app['Eccube\Repository\Master\ProductListOrderByRepository'];
43 43
         };
44
-        $app['eccube.repository.master.device_type'] = function () use ($app) {
44
+        $app['eccube.repository.master.device_type'] = function() use ($app) {
45 45
             return $app['Eccube\Repository\Master\DeviceTypeRepository'];
46 46
         };
47
-        $app['eccube.repository.master.csv_type'] = function () use ($app) {
47
+        $app['eccube.repository.master.csv_type'] = function() use ($app) {
48 48
             return $app['Eccube\Repository\Master\CsvTypeRepository'];
49 49
         };
50
-        $app['eccube.repository.master.order_item_type'] = function () use ($app) {
50
+        $app['eccube.repository.master.order_item_type'] = function() use ($app) {
51 51
             return $app['Eccube\Repository\Master\OrderItemTypeRepository'];
52 52
         };
53
-        $app['eccube.repository.base_info'] = function () use ($app) {
53
+        $app['eccube.repository.base_info'] = function() use ($app) {
54 54
             return $app['Eccube\Repository\BaseInfoRepository'];
55 55
         };
56
-        $app['eccube.repository.delivery'] = function () use ($app) {
56
+        $app['eccube.repository.delivery'] = function() use ($app) {
57 57
             return $app['Eccube\Repository\DeliveryRepository'];
58 58
         };
59
-        $app['eccube.repository.delivery_date'] = function () use ($app) {
59
+        $app['eccube.repository.delivery_date'] = function() use ($app) {
60 60
             return $app['Eccube\Repository\DeliveryDateRepository'];
61 61
         };
62
-        $app['eccube.repository.delivery_fee'] = function () use ($app) {
62
+        $app['eccube.repository.delivery_fee'] = function() use ($app) {
63 63
             return $app['Eccube\Repository\DeliveryFeeRepository'];
64 64
         };
65
-        $app['eccube.repository.delivery_time'] = function () use ($app) {
65
+        $app['eccube.repository.delivery_time'] = function() use ($app) {
66 66
             return $app['Eccube\Repository\DeliveryTimeRepository'];
67 67
         };
68
-        $app['eccube.repository.payment'] = function () use ($app) {
68
+        $app['eccube.repository.payment'] = function() use ($app) {
69 69
             return $app['Eccube\Repository\PaymentRepository'];
70 70
         };
71
-        $app['eccube.repository.payment_option'] = function () use ($app) {
71
+        $app['eccube.repository.payment_option'] = function() use ($app) {
72 72
             return $app['Eccube\Repository\PaymentOptionRepository'];
73 73
         };
74
-        $app['eccube.repository.customer'] = function () use ($app) {
74
+        $app['eccube.repository.customer'] = function() use ($app) {
75 75
             return $app['Eccube\Repository\CustomerRepository'];
76 76
         };
77
-        $app['eccube.repository.news'] = function () use ($app) {
77
+        $app['eccube.repository.news'] = function() use ($app) {
78 78
             return $app['Eccube\Repository\NewsRepository'];
79 79
         };
80
-        $app['eccube.repository.mail_history'] = function () use ($app) {
80
+        $app['eccube.repository.mail_history'] = function() use ($app) {
81 81
             return $app['Eccube\Repository\MailHistoryRepository'];
82 82
         };
83
-        $app['eccube.repository.member'] = function () use ($app) {
83
+        $app['eccube.repository.member'] = function() use ($app) {
84 84
             return $app['Eccube\Repository\MemberRepository'];
85 85
         };
86
-        $app['eccube.repository.order'] = function () use ($app) {
86
+        $app['eccube.repository.order'] = function() use ($app) {
87 87
             return $app['Eccube\Repository\OrderRepository'];
88 88
         };
89
-        $app['eccube.repository.product'] = function () use ($app) {
89
+        $app['eccube.repository.product'] = function() use ($app) {
90 90
             return $app['Eccube\Repository\ProductRepository'];
91 91
         };
92
-        $app['eccube.repository.product_image'] = function () use ($app) {
92
+        $app['eccube.repository.product_image'] = function() use ($app) {
93 93
             return $app['Eccube\Repository\ProductImageRepository'];
94 94
         };
95
-        $app['eccube.repository.product_class'] = function () use ($app) {
95
+        $app['eccube.repository.product_class'] = function() use ($app) {
96 96
             return $app['Eccube\Repository\ProductClassRepository'];
97 97
         };
98
-        $app['eccube.repository.product_stock'] = function () use ($app) {
98
+        $app['eccube.repository.product_stock'] = function() use ($app) {
99 99
             return $app['Eccube\Repository\ProductStockRepository'];
100 100
         };
101
-        $app['eccube.repository.product_tag'] = function () use ($app) {
101
+        $app['eccube.repository.product_tag'] = function() use ($app) {
102 102
             return $app['Eccube\Repository\ProductTagRepository'];
103 103
         };
104
-        $app['eccube.repository.class_name'] = function () use ($app) {
104
+        $app['eccube.repository.class_name'] = function() use ($app) {
105 105
             return $app['Eccube\Repository\ClassNameRepository'];
106 106
         };
107
-        $app['eccube.repository.class_category'] = function () use ($app) {
107
+        $app['eccube.repository.class_category'] = function() use ($app) {
108 108
             return $app['Eccube\Repository\ClassCategoryRepository'];
109 109
         };
110
-        $app['eccube.repository.customer_favorite_product'] = function () use ($app) {
110
+        $app['eccube.repository.customer_favorite_product'] = function() use ($app) {
111 111
             return $app['Eccube\Repository\CustomerFavoriteProductRepository'];
112 112
         };
113
-        $app['eccube.repository.tax_rule'] = function () use ($app) {
113
+        $app['eccube.repository.tax_rule'] = function() use ($app) {
114 114
             return $app['Eccube\Repository\TaxRuleRepository'];
115 115
         };
116
-        $app['eccube.repository.page'] = function () use ($app) {
116
+        $app['eccube.repository.page'] = function() use ($app) {
117 117
             return $app['Eccube\Repository\PageRepository'];
118 118
         };
119
-        $app['eccube.repository.block'] = function () use ($app) {
119
+        $app['eccube.repository.block'] = function() use ($app) {
120 120
             return $app['Eccube\Repository\BlockRepository'];
121 121
         };
122
-        $app['eccube.repository.order'] = function () use ($app) {
122
+        $app['eccube.repository.order'] = function() use ($app) {
123 123
             return $app['Eccube\Repository\OrderRepository'];
124 124
         };
125
-        $app['eccube.repository.customer_address'] = function () use ($app) {
125
+        $app['eccube.repository.customer_address'] = function() use ($app) {
126 126
             return $app['Eccube\Repository\CustomerAddressRepository'];
127 127
         };
128
-        $app['eccube.repository.shipping'] = function () use ($app) {
128
+        $app['eccube.repository.shipping'] = function() use ($app) {
129 129
             return $app['Eccube\Repository\ShippingRepository'];
130 130
         };
131
-        $app['eccube.repository.order_item'] = function () use ($app) {
131
+        $app['eccube.repository.order_item'] = function() use ($app) {
132 132
             return $app['Eccube\Repository\OrderItemRepository'];
133 133
         };
134
-        $app['eccube.repository.master.customer_status'] = function () use ($app) {
134
+        $app['eccube.repository.master.customer_status'] = function() use ($app) {
135 135
             return $app['Eccube\Repository\Master\CustomerStatusRepository'];
136 136
         };
137 137
 
138
-        $app['eccube.repository.mail_template'] = function () use ($app) {
138
+        $app['eccube.repository.mail_template'] = function() use ($app) {
139 139
             return $app['Eccube\Repository\MailTemplateRepository'];
140 140
         };
141
-        $app['eccube.repository.csv'] = function () use ($app) {
141
+        $app['eccube.repository.csv'] = function() use ($app) {
142 142
             return $app['Eccube\Repository\CsvRepository'];
143 143
         };
144
-        $app['eccube.repository.template'] = function () use ($app) {
144
+        $app['eccube.repository.template'] = function() use ($app) {
145 145
             return $app['Eccube\Repository\TemplateRepository'];
146 146
         };
147
-        $app['eccube.repository.authority_role'] = function () use ($app) {
147
+        $app['eccube.repository.authority_role'] = function() use ($app) {
148 148
             return $app['Eccube\Repository\AuthorityRoleRepository'];
149 149
         };
150
-        $app['eccube.repository.category'] = function () use ($app) {
150
+        $app['eccube.repository.category'] = function() use ($app) {
151 151
             return $app['Eccube\Repository\CategoryRepository'];
152 152
         };
153
-        $app['eccube.repository.help'] = function () use ($app) {
153
+        $app['eccube.repository.help'] = function() use ($app) {
154 154
             return $app['Eccube\Repository\HelpRepository'];
155 155
         };
156
-        $app['eccube.repository.plugin'] = function () use ($app) {
156
+        $app['eccube.repository.plugin'] = function() use ($app) {
157 157
             return $app['Eccube\Repository\PluginRepository'];
158 158
         };
159
-        $app['eccube.repository.plugin_event_handler'] = function () use ($app) {
159
+        $app['eccube.repository.plugin_event_handler'] = function() use ($app) {
160 160
             return $app['Eccube\Repository\PluginEventHandlerRepository'];
161 161
         };
162
-        $app['eccube.repository.layout'] = function () use ($app) {
162
+        $app['eccube.repository.layout'] = function() use ($app) {
163 163
             return $app['Eccube\Repository\LayoutRepository'];
164 164
         };
165 165
 
166 166
         // alias
167
-        $app['eccube.repository.order_status'] = function () use ($app) {
167
+        $app['eccube.repository.order_status'] = function() use ($app) {
168 168
             return $app['Eccube\Repository\Master\OrderStatusRepository'];
169 169
         };
170
-        $app['eccube.repository.customer_status'] = function () use ($app) {
170
+        $app['eccube.repository.customer_status'] = function() use ($app) {
171 171
             return $app['Eccube\Repository\Master\CustomerStatusRepository'];
172 172
         };
173 173
     }
Please login to merge, or discard this patch.
src/Eccube/Form/Type/ShippingMultipleType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@
 block discarded – undo
61 61
         $app = $this->app;
62 62
 
63 63
         $builder
64
-            ->addEventListener(FormEvents::POST_SET_DATA, function ($event) use ($app) {
64
+            ->addEventListener(FormEvents::POST_SET_DATA, function($event) use ($app) {
65 65
                 /** @var \Eccube\Entity\OrderItem $data */
66 66
                 $data = $event->getData();
67 67
                 /** @var \Symfony\Component\Form\Form $form */
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/OrderType.php 1 patch
Spacing   +9 added lines, -11 removed lines patch added patch discarded remove patch
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
         /**
259 259
          * 複数配送オプション有効時の画面制御を行う.
260 260
          */
261
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
261
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) {
262 262
 
263 263
             if ($this->BaseInfo->getOptionMultipleShipping() != Constant::ENABLED) {
264 264
                 return;
@@ -268,17 +268,16 @@  discard block
 block discarded – undo
268 268
             $orderDetails = &$data['OrderDetails'];
269 269
 
270 270
             // 数量0フィルター
271
-            $quantityFilter = function ($v) {
271
+            $quantityFilter = function($v) {
272 272
                 return !(isset($v['quantity']) && preg_match('/^0+$/', trim($v['quantity'])));
273 273
             };
274 274
 
275 275
             // $shippings = &$data['Shippings'];
276 276
 
277 277
             // 数量を抽出
278
-            $getQuantity = function ($v) {
278
+            $getQuantity = function($v) {
279 279
                 return (isset($v['quantity']) && preg_match('/^\d+$/', trim($v['quantity']))) ?
280
-                    trim($v['quantity']) :
281
-                    0;
280
+                    trim($v['quantity']) : 0;
282 281
             };
283 282
 
284 283
             // foreach ($shippings as &$shipping) {
@@ -295,7 +294,7 @@  discard block
 block discarded – undo
295 294
                     $orderDetail['quantity'] = 0;
296 295
 
297 296
                     // 受注詳細と同じ商品規格のみ抽出
298
-                    $productClassFilter = function ($v) use ($orderDetail) {
297
+                    $productClassFilter = function($v) use ($orderDetail) {
299 298
                         return $orderDetail['ProductClass'] === $v['ProductClass'];
300 299
                     };
301 300
 
@@ -304,10 +303,9 @@  discard block
 block discarded – undo
304 303
                         if (!empty($shipping['OrderItems'])) {
305 304
 
306 305
                             // 同じ商品規格の受注詳細の価格を適用
307
-                            $applyPrice = function (&$v) use ($orderDetail) {
306
+                            $applyPrice = function(&$v) use ($orderDetail) {
308 307
                                 $v['price'] = ($v['ProductClass'] === $orderDetail['ProductClass']) ?
309
-                                    $orderDetail['price'] :
310
-                                    $v['price'];
308
+                                    $orderDetail['price'] : $v['price'];
311 309
                             };
312 310
                             array_walk($shipping['OrderItems'], $applyPrice);
313 311
 
@@ -336,7 +334,7 @@  discard block
 block discarded – undo
336 334
         //     }
337 335
         // });
338 336
         // 選択された支払い方法の名称をエンティティにコピーする
339
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
337
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
340 338
             $Order = $event->getData();
341 339
             $Payment = $Order->getPayment();
342 340
             if (!is_null($Payment)) {
@@ -344,7 +342,7 @@  discard block
 block discarded – undo
344 342
             }
345 343
         });
346 344
         // 会員受注の場合、会員の性別/職業/誕生日をエンティティにコピーする
347
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
345
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
348 346
             $Order = $event->getData();
349 347
             $Customer = $Order->getCustomer();
350 348
             if (!is_null($Customer)) {
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/OrderDetailType.php 1 patch
Spacing   +5 added lines, -9 removed lines patch added patch discarded remove patch
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
                 )));
148 148
 
149 149
         $app = $this->app;
150
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) {
150
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) {
151 151
             // モーダルからのPOST時に、金額等をセットする.
152 152
             if ('modal' === $this->requestStack->getCurrentRequest()->get('modal')) {
153 153
                 $data = $event->getData();
@@ -164,17 +164,13 @@  discard block
 block discarded – undo
164 164
                     $data['product_name'] = $Product->getName();
165 165
                     $data['product_code'] = $ProductClass->getCode();
166 166
                     $data['class_name1'] = $ProductClass->hasClassCategory1() ?
167
-                        $ProductClass->getClassCategory1()->getClassName() :
168
-                        null;
167
+                        $ProductClass->getClassCategory1()->getClassName() : null;
169 168
                     $data['class_name2'] = $ProductClass->hasClassCategory2() ?
170
-                        $ProductClass->getClassCategory2()->getClassName() :
171
-                        null;
169
+                        $ProductClass->getClassCategory2()->getClassName() : null;
172 170
                     $data['class_category_name1'] = $ProductClass->hasClassCategory1() ?
173
-                        $ProductClass->getClassCategory1()->getName() :
174
-                        null;
171
+                        $ProductClass->getClassCategory1()->getName() : null;
175 172
                     $data['class_category_name2'] = $ProductClass->hasClassCategory2() ?
176
-                        $ProductClass->getClassCategory2()->getName() :
177
-                        null;
173
+                        $ProductClass->getClassCategory2()->getName() : null;
178 174
                     $data['tax_rule'] = $TaxRule->getRoundingType()->getId();
179 175
                     $data['price'] = $ProductClass->getPrice02();
180 176
                     $data['quantity'] = empty($data['quantity']) ? 1 : $data['quantity'];
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/ShippingType.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
                 'prototype' => true,
200 200
             ))
201 201
 
202
-            ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
202
+            ->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) {
203 203
                 if ($this->BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) {
204 204
                     $form = $event->getForm();
205 205
                     $form->add('OrderItems', CollectionType::class, array(
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
                     ));
211 211
                 }
212 212
             })
213
-            ->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) {
213
+            ->addEventListener(FormEvents::POST_SET_DATA, function(FormEvent $event) {
214 214
                 /** @var \Eccube\Entity\Shipping $data */
215 215
                 $data = $event->getData();
216 216
                 /** @var \Symfony\Component\Form\Form $form */
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
                     'choice_label' => 'delivery_time',
230 230
                     'placeholder' => '指定なし',
231 231
                     'required' => false,
232
-                    'query_builder' => function (EntityRepository $er) use($Delivery) {
232
+                    'query_builder' => function(EntityRepository $er) use($Delivery) {
233 233
                         return $er->createQueryBuilder('dt')
234 234
                             ->where('dt.Delivery = :Delivery')
235 235
                             ->setParameter('Delivery', $Delivery);
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
                 ));
238 238
 
239 239
             })
240
-            ->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
240
+            ->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) {
241 241
                 $data = $event->getData();
242 242
                 $form = $event->getForm();
243 243
                 if (!$data) {
@@ -257,14 +257,14 @@  discard block
 block discarded – undo
257 257
                     'choice_label' => 'delivery_time',
258 258
                     'placeholder' => '指定なし',
259 259
                     'required' => false,
260
-                    'query_builder' => function (EntityRepository $er) use($Delivery) {
260
+                    'query_builder' => function(EntityRepository $er) use($Delivery) {
261 261
                         return $er->createQueryBuilder('dt')
262 262
                             ->where('dt.Delivery = :Delivery')
263 263
                             ->setParameter('Delivery', $Delivery);
264 264
                     },
265 265
                 ));
266 266
             })
267
-            ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
267
+            ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
268 268
                 if ($this->BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) {
269 269
                     $form = $event->getForm();
270 270
                     $OrderItems = $form['OrderItems']->getData();
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
                     }
276 276
                 }
277 277
             })
278
-            ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
278
+            ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
279 279
                 $Shipping = $event->getData();
280 280
                 $Delivery = $Shipping->getDelivery();
281 281
                 $Shipping->setShippingDeliveryName($Delivery ? $Delivery : null);
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/OrderItemType.php 1 patch
Spacing   +6 added lines, -10 removed lines patch added patch discarded remove patch
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
         $app = $this->app;
179 179
         // XXX price を priceIncTax にセットし直す
180 180
         // OrderItem::getTotalPrice でもやっているので、どこか一箇所にまとめたい
181
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use ($app) {
181
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) use ($app) {
182 182
                 /** @var \Eccube\Entity\OrderItem $OrderItem */
183 183
                 $OrderItem = $event->getData();
184 184
                 $TaxDisplayType = $OrderItem->getTaxDisplayType();
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 
197 197
                 $event->setData($OrderItem);
198 198
         });
199
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) {
199
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) {
200 200
             // モーダルからのPOST時に、金額等をセットする.
201 201
             if ('modal' === $this->requestStack->getCurrentRequest()->get('modal')) {
202 202
                 $data = $event->getData();
@@ -266,17 +266,13 @@  discard block
 block discarded – undo
266 266
                                 $data['product_name'] = $Product->getName();
267 267
                                 $data['product_code'] = $ProductClass->getCode();
268 268
                                 $data['class_name1'] = $ProductClass->hasClassCategory1() ?
269
-                                    $ProductClass->getClassCategory1()->getClassName() :
270
-                                    null;
269
+                                    $ProductClass->getClassCategory1()->getClassName() : null;
271 270
                                 $data['class_name2'] = $ProductClass->hasClassCategory2() ?
272
-                                    $ProductClass->getClassCategory2()->getClassName() :
273
-                                    null;
271
+                                    $ProductClass->getClassCategory2()->getClassName() : null;
274 272
                                 $data['class_category_name1'] = $ProductClass->hasClassCategory1() ?
275
-                                    $ProductClass->getClassCategory1()->getName() :
276
-                                    null;
273
+                                    $ProductClass->getClassCategory1()->getName() : null;
277 274
                                 $data['class_category_name2'] = $ProductClass->hasClassCategory2() ?
278
-                                    $ProductClass->getClassCategory2()->getName() :
279
-                                    null;
275
+                                    $ProductClass->getClassCategory2()->getName() : null;
280 276
                                 $data['price'] = $ProductClass->getPrice02();
281 277
                                 $data['quantity'] = empty($data['quantity']) ? 1 : $data['quantity'];
282 278
                                 $data['tax_type'] = TaxType::TAXATION;
Please login to merge, or discard this patch.