Completed
Push — master ( c53dd7...979eb7 )
by chihiro
31:42
created
src/Eccube/Controller/BlockController.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
         if ($app['eccube.layout']) {
40 40
             foreach ($app['eccube.layout']->getBlocPositions() as $blocPositions) {
41
-                if ($blocPositions->getTargetId() == constant("Eccube\Entity\BlocPosition::" . $position)) {
41
+                if ($blocPositions->getTargetId() == constant("Eccube\Entity\BlocPosition::".$position)) {
42 42
                     $blocks[] = $blocPositions->getBloc();
43 43
                 }
44 44
             }
Please login to merge, or discard this patch.
src/Eccube/Controller/UserDataController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
55 55
         $paths[] = $app['config']['user_data_realdir'];
56 56
         $app['twig.loader']->addLoader(new \Twig_Loader_Filesystem($paths));
57 57
 
58
-        $file = $PageLayout->getFileName() . '.twig';
58
+        $file = $PageLayout->getFileName().'.twig';
59 59
 
60 60
         $event = new EventArgs(
61 61
             array(
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/ClassCategoryController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -119,7 +119,7 @@
 block discarded – undo
119 119
         $num = $app['eccube.repository.product_class']->createQueryBuilder('pc')
120 120
             ->select('count(pc.id)')
121 121
             ->where('pc.ClassCategory1 = :id OR pc.ClassCategory2 = :id')
122
-            ->setParameter('id',$id)
122
+            ->setParameter('id', $id)
123 123
             ->getQuery()
124 124
             ->getSingleScalarResult();
125 125
         if ($num > 0) {
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/ProductController.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
                     }
205 205
 
206 206
                     $extension = $image->getClientOriginalExtension();
207
-                    $filename = date('mdHis') . uniqid('_') . '.' . $extension;
207
+                    $filename = date('mdHis').uniqid('_').'.'.$extension;
208 208
                     $image->move($app['config']['image_temp_realdir'], $filename);
209 209
                     $files[] = $filename;
210 210
                 }
@@ -280,7 +280,7 @@  discard block
 block discarded – undo
280 280
         $form = $builder->getForm();
281 281
 
282 282
         if (!$has_class) {
283
-            $ProductClass->setStockUnlimited((boolean)$ProductClass->getStockUnlimited());
283
+            $ProductClass->setStockUnlimited((boolean) $ProductClass->getStockUnlimited());
284 284
             $form['class']->setData($ProductClass);
285 285
         }
286 286
 
@@ -389,7 +389,7 @@  discard block
 block discarded – undo
389 389
                     $app['orm.em']->persist($ProductImage);
390 390
 
391 391
                     // 移動
392
-                    $file = new File($app['config']['image_temp_realdir'] . '/' . $add_image);
392
+                    $file = new File($app['config']['image_temp_realdir'].'/'.$add_image);
393 393
                     $file->move($app['config']['image_save_realdir']);
394 394
                 }
395 395
 
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
409 409
 
410 410
                     // 削除
411 411
                     $fs = new Filesystem();
412
-                    $fs->remove($app['config']['image_save_realdir'] . '/' . $delete_image);
412
+                    $fs->remove($app['config']['image_save_realdir'].'/'.$delete_image);
413 413
                 }
414 414
                 $app['orm.em']->persist($Product);
415 415
                 $app['orm.em']->flush();
@@ -562,7 +562,7 @@  discard block
 block discarded – undo
562 562
                 foreach ($deleteImages as $deleteImage) {
563 563
                     try {
564 564
                         $fs = new Filesystem();
565
-                        $fs->remove($app['config']['image_save_realdir'] . '/' . $deleteImage);
565
+                        $fs->remove($app['config']['image_save_realdir'].'/'.$deleteImage);
566 566
                     } catch (\Exception $e) {
567 567
                         // エラーが発生しても無視する
568 568
                     }
@@ -628,10 +628,10 @@  discard block
 block discarded – undo
628 628
 
629 629
                     // 画像ファイルを新規作成
630 630
                     $extension = pathinfo($Image->getFileName(), PATHINFO_EXTENSION);
631
-                    $filename = date('mdHis') . uniqid('_') . '.' . $extension;
631
+                    $filename = date('mdHis').uniqid('_').'.'.$extension;
632 632
                     try {
633 633
                         $fs = new Filesystem();
634
-                        $fs->copy($app['config']['image_save_realdir'] . '/' . $Image->getFileName(), $app['config']['image_save_realdir'] . '/' . $filename);
634
+                        $fs->copy($app['config']['image_save_realdir'].'/'.$Image->getFileName(), $app['config']['image_save_realdir'].'/'.$filename);
635 635
                     } catch (\Exception $e) {
636 636
                         // エラーが発生しても無視する
637 637
                     }
@@ -706,7 +706,7 @@  discard block
 block discarded – undo
706 706
         $em->getConfiguration()->setSQLLogger(null);
707 707
 
708 708
         $response = new StreamedResponse();
709
-        $response->setCallback(function () use ($app, $request) {
709
+        $response->setCallback(function() use ($app, $request) {
710 710
 
711 711
             // CSV種別を元に初期化.
712 712
             $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_PRODUCT);
@@ -730,7 +730,7 @@  discard block
 block discarded – undo
730 730
 
731 731
             // データ行の出力.
732 732
             $app['eccube.service.csv.export']->setExportQueryBuilder($qb);
733
-            $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) {
733
+            $app['eccube.service.csv.export']->exportData(function($entity, $csvService) {
734 734
 
735 735
                 $Csvs = $csvService->getCsvs();
736 736
 
@@ -762,9 +762,9 @@  discard block
 block discarded – undo
762 762
         });
763 763
 
764 764
         $now = new \DateTime();
765
-        $filename = 'product_' . $now->format('YmdHis') . '.csv';
765
+        $filename = 'product_'.$now->format('YmdHis').'.csv';
766 766
         $response->headers->set('Content-Type', 'application/octet-stream');
767
-        $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename);
767
+        $response->headers->set('Content-Disposition', 'attachment; filename='.$filename);
768 768
         $response->send();
769 769
 
770 770
         return $response;
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/CategoryController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
         $em->getConfiguration()->setSQLLogger(null);
199 199
 
200 200
         $response = new StreamedResponse();
201
-        $response->setCallback(function () use ($app, $request) {
201
+        $response->setCallback(function() use ($app, $request) {
202 202
 
203 203
             // CSV種別を元に初期化.
204 204
             $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_CATEGORY);
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 
213 213
             // データ行の出力.
214 214
             $app['eccube.service.csv.export']->setExportQueryBuilder($qb);
215
-            $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) {
215
+            $app['eccube.service.csv.export']->exportData(function($entity, $csvService) {
216 216
 
217 217
                 $Csvs = $csvService->getCsvs();
218 218
 
@@ -232,9 +232,9 @@  discard block
 block discarded – undo
232 232
         });
233 233
 
234 234
         $now = new \DateTime();
235
-        $filename = 'category_' . $now->format('YmdHis') . '.csv';
235
+        $filename = 'category_'.$now->format('YmdHis').'.csv';
236 236
         $response->headers->set('Content-Type', 'application/octet-stream');
237
-        $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename);
237
+        $response->headers->set('Content-Disposition', 'attachment; filename='.$filename);
238 238
         $response->send();
239 239
 
240 240
         return $response;
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Order/OrderController.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
         $em->getConfiguration()->setSQLLogger(null);
237 237
 
238 238
         $response = new StreamedResponse();
239
-        $response->setCallback(function () use ($app, $request) {
239
+        $response->setCallback(function() use ($app, $request) {
240 240
 
241 241
             // CSV種別を元に初期化.
242 242
             $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_ORDER);
@@ -250,7 +250,7 @@  discard block
 block discarded – undo
250 250
 
251 251
             // データ行の出力.
252 252
             $app['eccube.service.csv.export']->setExportQueryBuilder($qb);
253
-            $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) {
253
+            $app['eccube.service.csv.export']->exportData(function($entity, $csvService) {
254 254
 
255 255
                 $Csvs = $csvService->getCsvs();
256 256
 
@@ -280,9 +280,9 @@  discard block
 block discarded – undo
280 280
         });
281 281
 
282 282
         $now = new \DateTime();
283
-        $filename = 'order_' . $now->format('YmdHis') . '.csv';
283
+        $filename = 'order_'.$now->format('YmdHis').'.csv';
284 284
         $response->headers->set('Content-Type', 'application/octet-stream');
285
-        $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename);
285
+        $response->headers->set('Content-Disposition', 'attachment; filename='.$filename);
286 286
         $response->send();
287 287
 
288 288
         return $response;
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
305 305
         $em->getConfiguration()->setSQLLogger(null);
306 306
 
307 307
         $response = new StreamedResponse();
308
-        $response->setCallback(function () use ($app, $request) {
308
+        $response->setCallback(function() use ($app, $request) {
309 309
 
310 310
             // CSV種別を元に初期化.
311 311
             $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_SHIPPING);
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
 
320 320
             // データ行の出力.
321 321
             $app['eccube.service.csv.export']->setExportQueryBuilder($qb);
322
-            $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) {
322
+            $app['eccube.service.csv.export']->exportData(function($entity, $csvService) {
323 323
 
324 324
                 $Csvs = $csvService->getCsvs();
325 325
 
@@ -357,9 +357,9 @@  discard block
 block discarded – undo
357 357
         });
358 358
 
359 359
         $now = new \DateTime();
360
-        $filename = 'shipping_' . $now->format('YmdHis') . '.csv';
360
+        $filename = 'shipping_'.$now->format('YmdHis').'.csv';
361 361
         $response->headers->set('Content-Type', 'application/octet-stream');
362
-        $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename);
362
+        $response->headers->set('Content-Disposition', 'attachment; filename='.$filename);
363 363
         $response->send();
364 364
 
365 365
         return $response;
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Setting/Shop/PaymentController.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -93,10 +93,10 @@  discard block
 block discarded – undo
93 93
                 // ファイルアップロード
94 94
                 $file = $form['payment_image']->getData();
95 95
                 $fs = new Filesystem();
96
-                if ($file && $fs->exists($app['config']['image_temp_realdir'] . '/' . $file)) {
96
+                if ($file && $fs->exists($app['config']['image_temp_realdir'].'/'.$file)) {
97 97
                     $fs->rename(
98
-                        $app['config']['image_temp_realdir'] . '/' . $file,
99
-                        $app['config']['image_save_realdir'] . '/' . $file
98
+                        $app['config']['image_temp_realdir'].'/'.$file,
99
+                        $app['config']['image_save_realdir'].'/'.$file
100 100
                     );
101 101
                 }
102 102
 
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
             }
145 145
 
146 146
             $extension = $image->guessExtension();
147
-            $filename = date('mdHis') . uniqid('_') . '.' . $extension;
147
+            $filename = date('mdHis').uniqid('_').'.'.$extension;
148 148
             $image->move($app['config']['image_temp_realdir'], $filename);
149 149
         }
150 150
         $event = new EventArgs(
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
180 180
         foreach ($Payments as $Payment) {
181 181
             if ($Payment->getId() != $id) {
182 182
                 $Payment->setRank($rank);
183
-                $rank ++;
183
+                $rank++;
184 184
             }
185 185
         }
186 186
 
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
         );
195 195
         $app['eccube.event.dispatcher']->dispatch(EccubeEvents::ADMIN_SETTING_SHOP_PAYMENT_DELETE_COMPLETE, $event);
196 196
 
197
-        $app->addSuccess('admin.delete.complete', 'admin') ;
197
+        $app->addSuccess('admin.delete.complete', 'admin');
198 198
 
199 199
         return $app->redirect($app->url('admin_setting_shop_payment'));
200 200
     }
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Setting/System/LogController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@
 block discarded – undo
79 79
     {
80 80
         $log = array();
81 81
 
82
-        foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)) as $line) {
82
+        foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES)) as $line) {
83 83
             // 上限に達した場合、処理を抜ける
84 84
             if (count($log) >= $formData['line_max']) {
85 85
                 break;
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Setting/System/SecurityController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -126,7 +126,7 @@
 block discarded – undo
126 126
             if (count($allowHost) > 0) {
127 127
                 $form->get('admin_allow_host')->setData(Str::convertLineFeed(implode("\n", $allowHost)));
128 128
             }
129
-            $form->get('force_ssl')->setData((bool)$app['config']['force_ssl']);
129
+            $form->get('force_ssl')->setData((bool) $app['config']['force_ssl']);
130 130
         }
131 131
 
132 132
         return $app->render('Setting/System/security.twig', array(
Please login to merge, or discard this patch.