Completed
Pull Request — experimental/3.1 (#2483)
by Kentaro
44:50
created
src/Eccube/Form/Extension/DoctrineOrmExtension.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
     {
39 39
         $builder->addEventListener(
40 40
             FormEvents::PRE_SET_DATA,
41
-            function (FormEvent $event) {
41
+            function(FormEvent $event) {
42 42
                 $form = $event->getForm();
43 43
                 $config = $form->getConfig();
44 44
                 // data_classオプションが必要
Please login to merge, or discard this patch.
src/Eccube/ServiceProvider/MobileDetectServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
             return new \Mobile_Detect();
17 17
         };
18 18
 
19
-        $app['mobile_detect.device_type'] = function ($app) {
19
+        $app['mobile_detect.device_type'] = function($app) {
20 20
             if ($app['mobile_detect']->isMobile()) {
21 21
                 return \Eccube\Entity\Master\DeviceType::DEVICE_TYPE_SP;
22 22
             } else {
Please login to merge, or discard this patch.
src/Eccube/Repository/QueryKey.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
 {
29 29
     const PRODUCT_SEARCH = 'Product.getQueryBuilderBySearchData';
30 30
     const PRODUCT_SEARCH_ADMIN = 'Product.getQueryBuilderBySearchDataForAdmin';
31
-    const PRODUCT_GET_FAVORITE  = 'Product.getFavoriteProductQueryBuilderByCustomer';
31
+    const PRODUCT_GET_FAVORITE = 'Product.getFavoriteProductQueryBuilderByCustomer';
32 32
 
33 33
     const CUSTOMER_SEARCH = 'Customer.getQueryBuilderBySearchData';
34 34
 
Please login to merge, or discard this patch.
src/Eccube/Doctrine/Common/CsvDataFixtures/CsvFixture.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
     public function load(ObjectManager $manager)
29 29
     {
30 30
         // CSV Reader に設定
31
-        $this->file->setFlags(\SplFileObject::READ_CSV | \SplFileObject::READ_AHEAD | \SplFileObject::SKIP_EMPTY |\SplFileObject::DROP_NEW_LINE);
31
+        $this->file->setFlags(\SplFileObject::READ_CSV|\SplFileObject::READ_AHEAD|\SplFileObject::SKIP_EMPTY|\SplFileObject::DROP_NEW_LINE);
32 32
 
33 33
         // ヘッダ行を取得
34 34
         $headers = $this->file->current();
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Shopping/OrderType.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
         // 支払い方法のプルダウンを生成
86 86
         $builder->addEventListener(
87 87
             FormEvents::PRE_SET_DATA,
88
-            function (FormEvent $event) {
88
+            function(FormEvent $event) {
89 89
                 /** @var Order $Order */
90 90
                 $Order = $event->getData();
91 91
                 if (is_null($Order) || !$Order->getId()) {
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
         // TODO Calculatorで行うのが適切.
134 134
         $builder->addEventListener(
135 135
             FormEvents::POST_SUBMIT,
136
-            function (FormEvent $event) {
136
+            function(FormEvent $event) {
137 137
                 /** @var Order $Order */
138 138
                 $Order = $event->getData();
139 139
                 $Payment = $Order->getPayment();
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
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
175 175
                 'prototype' => true,
176 176
             ))
177 177
 
178
-            ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($BaseInfo) {
178
+            ->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) use ($BaseInfo) {
179 179
                 if ($BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) {
180 180
                     $form = $event->getForm();
181 181
                     $form->add('ShipmentItems', CollectionType::class, array(
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
                     ));
187 187
                 }
188 188
             })
189
-            ->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) {
189
+            ->addEventListener(FormEvents::POST_SET_DATA, function(FormEvent $event) {
190 190
                 /** @var \Eccube\Entity\Shipping $data */
191 191
                 $data = $event->getData();
192 192
                 /** @var \Symfony\Component\Form\Form $form */
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
205 205
                     'choice_label' => 'delivery_time',
206 206
                     'placeholder' => '指定なし',
207 207
                     'required' => false,
208
-                    'query_builder' => function (EntityRepository $er) use($Delivery) {
208
+                    'query_builder' => function(EntityRepository $er) use($Delivery) {
209 209
                         return $er->createQueryBuilder('dt')
210 210
                             ->where('dt.Delivery = :Delivery')
211 211
                             ->setParameter('Delivery', $Delivery);
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
                 ));
214 214
 
215 215
             })
216
-            ->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) {
216
+            ->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) {
217 217
                 $data = $event->getData();
218 218
                 $form = $event->getForm();
219 219
                 if (!$data) {
@@ -233,14 +233,14 @@  discard block
 block discarded – undo
233 233
                     'choice_label' => 'delivery_time',
234 234
                     'placeholder' => '指定なし',
235 235
                     'required' => false,
236
-                    'query_builder' => function (EntityRepository $er) use($Delivery) {
236
+                    'query_builder' => function(EntityRepository $er) use($Delivery) {
237 237
                         return $er->createQueryBuilder('dt')
238 238
                             ->where('dt.Delivery = :Delivery')
239 239
                             ->setParameter('Delivery', $Delivery);
240 240
                     },
241 241
                 ));
242 242
             })
243
-            ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use ($BaseInfo) {
243
+            ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) use ($BaseInfo) {
244 244
                 if ($BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) {
245 245
                     $form = $event->getForm();
246 246
                     $shipmentItems = $form['ShipmentItems']->getData();
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
                     }
252 252
                 }
253 253
             })
254
-            ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use ($BaseInfo) {
254
+            ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) use ($BaseInfo) {
255 255
                 $Shipping = $event->getData();
256 256
                 $Delivery = $Shipping->getDelivery();
257 257
                 $Shipping->setShippingDeliveryName($Delivery ? $Delivery : null);
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
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
256 256
         /**
257 257
          * 複数配送オプション有効時の画面制御を行う.
258 258
          */
259
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($BaseInfo) {
259
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($BaseInfo) {
260 260
 
261 261
             if ($BaseInfo->getOptionMultipleShipping() != Constant::ENABLED) {
262 262
                 return;
@@ -266,17 +266,16 @@  discard block
 block discarded – undo
266 266
             $orderDetails = &$data['OrderDetails'];
267 267
 
268 268
             // 数量0フィルター
269
-            $quantityFilter = function ($v) {
269
+            $quantityFilter = function($v) {
270 270
                 return !(isset($v['quantity']) && preg_match('/^0+$/', trim($v['quantity'])));
271 271
             };
272 272
 
273 273
             // $shippings = &$data['Shippings'];
274 274
 
275 275
             // 数量を抽出
276
-            $getQuantity = function ($v) {
276
+            $getQuantity = function($v) {
277 277
                 return (isset($v['quantity']) && preg_match('/^\d+$/', trim($v['quantity']))) ?
278
-                    trim($v['quantity']) :
279
-                    0;
278
+                    trim($v['quantity']) : 0;
280 279
             };
281 280
 
282 281
             // foreach ($shippings as &$shipping) {
@@ -293,7 +292,7 @@  discard block
 block discarded – undo
293 292
                     $orderDetail['quantity'] = 0;
294 293
 
295 294
                     // 受注詳細と同じ商品規格のみ抽出
296
-                    $productClassFilter = function ($v) use ($orderDetail) {
295
+                    $productClassFilter = function($v) use ($orderDetail) {
297 296
                         return $orderDetail['ProductClass'] === $v['ProductClass'];
298 297
                     };
299 298
 
@@ -302,10 +301,9 @@  discard block
 block discarded – undo
302 301
                         if (!empty($shipping['ShipmentItems'])) {
303 302
 
304 303
                             // 同じ商品規格の受注詳細の価格を適用
305
-                            $applyPrice = function (&$v) use ($orderDetail) {
304
+                            $applyPrice = function(&$v) use ($orderDetail) {
306 305
                                 $v['price'] = ($v['ProductClass'] === $orderDetail['ProductClass']) ?
307
-                                    $orderDetail['price'] :
308
-                                    $v['price'];
306
+                                    $orderDetail['price'] : $v['price'];
309 307
                             };
310 308
                             array_walk($shipping['ShipmentItems'], $applyPrice);
311 309
 
@@ -334,7 +332,7 @@  discard block
 block discarded – undo
334 332
         //     }
335 333
         // });
336 334
         // 選択された支払い方法の名称をエンティティにコピーする
337
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
335
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
338 336
             $Order = $event->getData();
339 337
             $Payment = $Order->getPayment();
340 338
             if (!is_null($Payment)) {
@@ -342,7 +340,7 @@  discard block
 block discarded – undo
342 340
             }
343 341
         });
344 342
         // 会員受注の場合、会員の性別/職業/誕生日をエンティティにコピーする
345
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
343
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
346 344
             $Order = $event->getData();
347 345
             $Customer = $Order->getCustomer();
348 346
             if (!is_null($Customer)) {
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Shipping/EditController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -446,7 +446,7 @@
 block discarded – undo
446 446
                 $session->set('eccube.admin.order.product.search', $searchData);
447 447
                 $session->set('eccube.admin.order.product.search.page_no', $page_no);
448 448
             } else {
449
-                $searchData = (array)$session->get('eccube.admin.order.product.search');
449
+                $searchData = (array) $session->get('eccube.admin.order.product.search');
450 450
                 if (is_null($page_no)) {
451 451
                     $page_no = intval($session->get('eccube.admin.order.product.search.page_no'));
452 452
                 } else {
Please login to merge, or discard this patch.
src/Eccube/Repository/ShippingRepository.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -52,13 +52,13 @@  discard block
 block discarded – undo
52 52
                 ->setParameter('shipping_id_start', $searchData['shipping_id_start']);
53 53
         }
54 54
         // multi
55
-        if (isset( $searchData['multi']) && Str::isNotBlank($searchData['multi'])) {
55
+        if (isset($searchData['multi']) && Str::isNotBlank($searchData['multi'])) {
56 56
             $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null;
57 57
             $qb
58
-                ->andWhere('s.id = :multi OR s.name01 LIKE :likemulti OR s.name02 LIKE :likemulti OR ' .
58
+                ->andWhere('s.id = :multi OR s.name01 LIKE :likemulti OR s.name02 LIKE :likemulti OR '.
59 59
                            's.kana01 LIKE :likemulti OR s.kana02 LIKE :likemulti OR s.company_name LIKE :likemulti')
60 60
                 ->setParameter('multi', $multi)
61
-                ->setParameter('likemulti', '%' . $searchData['multi'] . '%');
61
+                ->setParameter('likemulti', '%'.$searchData['multi'].'%');
62 62
         }
63 63
 
64 64
         // shipping_id_end
@@ -91,42 +91,42 @@  discard block
 block discarded – undo
91 91
         if (isset($searchData['name']) && Str::isNotBlank($searchData['name'])) {
92 92
             $qb
93 93
                 ->andWhere('CONCAT(s.name01, s.name02) LIKE :name')
94
-                ->setParameter('name', '%' . $searchData['name'] . '%');
94
+                ->setParameter('name', '%'.$searchData['name'].'%');
95 95
         }
96 96
 
97 97
         // kana
98 98
         if (isset($searchData['kana']) && Str::isNotBlank($searchData['kana'])) {
99 99
             $qb
100 100
                 ->andWhere('CONCAT(s.kana01, s.kana02) LIKE :kana')
101
-                ->setParameter('kana', '%' . $searchData['kana'] . '%');
101
+                ->setParameter('kana', '%'.$searchData['kana'].'%');
102 102
         }
103 103
 
104 104
         // order_name
105 105
         if (isset($searchData['order_name']) && Str::isNotBlank($searchData['order_name'])) {
106 106
             $qb
107 107
                 ->andWhere('CONCAT(o.name01, o.name02) LIKE :order_name')
108
-                ->setParameter('order_name', '%' . $searchData['order_name'] . '%');
108
+                ->setParameter('order_name', '%'.$searchData['order_name'].'%');
109 109
         }
110 110
 
111 111
         // order_kana
112 112
         if (isset($searchData['order_kana']) && Str::isNotBlank($searchData['order_kana'])) {
113 113
             $qb
114 114
                 ->andWhere('CONCAT(o.kana01, s.kana02) LIKE :order_kana')
115
-                ->setParameter('kana', '%' . $searchData['order_kana'] . '%');
115
+                ->setParameter('kana', '%'.$searchData['order_kana'].'%');
116 116
         }
117 117
 
118 118
         // order_email
119 119
         if (isset($searchData['email']) && Str::isNotBlank($searchData['email'])) {
120 120
             $qb
121 121
                 ->andWhere('o.email like :email')
122
-                ->setParameter('email', '%' . $searchData['email'] . '%');
122
+                ->setParameter('email', '%'.$searchData['email'].'%');
123 123
         }
124 124
 
125 125
         // tel
126 126
         if (isset($searchData['tel']) && Str::isNotBlank($searchData['tel'])) {
127 127
             $qb
128 128
                 ->andWhere('CONCAT(s.tel01, s.tel02, s.tel03) LIKE :tel')
129
-                ->setParameter('tel', '%' . $searchData['tel'] . '%');
129
+                ->setParameter('tel', '%'.$searchData['tel'].'%');
130 130
         }
131 131
 
132 132
         // payment
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
         if (isset($searchData['buy_product_name']) && Str::isNotBlank($searchData['buy_product_name'])) {
223 223
             $qb
224 224
                 ->andWhere('si.product_name LIKE :buy_product_name')
225
-                ->setParameter('buy_product_name', '%' . $searchData['buy_product_name'] . '%');
225
+                ->setParameter('buy_product_name', '%'.$searchData['buy_product_name'].'%');
226 226
         }
227 227
 
228 228
         // Order By
Please login to merge, or discard this patch.