Completed
Pull Request — 3.0.8-for-plugin-test (#2020)
by Kiyotaka
115:14 queued 110:08
created
src/Eccube/Controller/Admin/Order/StatusController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@
 block discarded – undo
42 42
             ->getRepository('\Eccube\Entity\Master\OrderStatus')
43 43
             ->findAllArray()
44 44
         ;
45
-        $CurrentStatus =  $app['orm.em']
45
+        $CurrentStatus = $app['orm.em']
46 46
             ->getRepository('\Eccube\Entity\Master\OrderStatus')
47 47
             ->find($id)
48 48
         ;
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
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
         $em->getConfiguration()->setSQLLogger(null);
165 165
 
166 166
         $response = new StreamedResponse();
167
-        $response->setCallback(function () use ($app, $request) {
167
+        $response->setCallback(function() use ($app, $request) {
168 168
 
169 169
             // CSV種別を元に初期化.
170 170
             $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_CATEGORY);
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 
179 179
             // データ行の出力.
180 180
             $app['eccube.service.csv.export']->setExportQueryBuilder($qb);
181
-            $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) {
181
+            $app['eccube.service.csv.export']->exportData(function($entity, $csvService) {
182 182
 
183 183
                 $Csvs = $csvService->getCsvs();
184 184
 
@@ -198,9 +198,9 @@  discard block
 block discarded – undo
198 198
         });
199 199
 
200 200
         $now = new \DateTime();
201
-        $filename = 'category_' . $now->format('YmdHis') . '.csv';
201
+        $filename = 'category_'.$now->format('YmdHis').'.csv';
202 202
         $response->headers->set('Content-Type', 'application/octet-stream');
203
-        $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename);
203
+        $response->headers->set('Content-Disposition', 'attachment; filename='.$filename);
204 204
         $response->send();
205 205
 
206 206
         return $response;
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
@@ -95,7 +95,7 @@
 block discarded – undo
95 95
         $num = $app['eccube.repository.product_class']->createQueryBuilder('pc')
96 96
             ->select('count(pc.id)')
97 97
             ->where('pc.ClassCategory1 = :id OR pc.ClassCategory2 = :id')
98
-            ->setParameter('id',$id)
98
+            ->setParameter('id', $id)
99 99
             ->getQuery()
100 100
             ->getSingleScalarResult();
101 101
         if ($num > 0) {
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/ProductController.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
             foreach ($images as $img) {
152 152
                 foreach ($img as $image) {
153 153
                     $extension = $image->getClientOriginalExtension();
154
-                    $filename = date('mdHis') . uniqid('_') . '.' . $extension;
154
+                    $filename = date('mdHis').uniqid('_').'.'.$extension;
155 155
                     $image->move($app['config']['image_temp_realdir'], $filename);
156 156
                     $files[] = $filename;
157 157
                 }
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
311 311
                     $app['orm.em']->persist($ProductImage);
312 312
 
313 313
                     // 移動
314
-                    $file = new File($app['config']['image_temp_realdir'] . '/' . $add_image);
314
+                    $file = new File($app['config']['image_temp_realdir'].'/'.$add_image);
315 315
                     $file->move($app['config']['image_save_realdir']);
316 316
                 }
317 317
 
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
 
332 332
                     // 削除
333 333
                     $fs = new Filesystem();
334
-                    $fs->remove($app['config']['image_save_realdir'] . '/' . $delete_image);
334
+                    $fs->remove($app['config']['image_save_realdir'].'/'.$delete_image);
335 335
                 }
336 336
                 $app['orm.em']->persist($Product);
337 337
                 $app['orm.em']->flush();
@@ -430,7 +430,7 @@  discard block
 block discarded – undo
430 430
                 foreach ($deleteImages as $deleteImage) {
431 431
                     try {
432 432
                         $fs = new Filesystem();
433
-                        $fs->remove($app['config']['image_save_realdir'] . '/' . $deleteImage);
433
+                        $fs->remove($app['config']['image_save_realdir'].'/'.$deleteImage);
434 434
                     } catch (\Exception $e) {
435 435
                         // エラーが発生しても無視する
436 436
                     }
@@ -475,10 +475,10 @@  discard block
 block discarded – undo
475 475
 
476 476
                     // 画像ファイルを新規作成
477 477
                     $extension = pathinfo($Image->getFileName(), PATHINFO_EXTENSION);
478
-                    $filename = date('mdHis') . uniqid('_') . '.' . $extension;
478
+                    $filename = date('mdHis').uniqid('_').'.'.$extension;
479 479
                     try {
480 480
                         $fs = new Filesystem();
481
-                        $fs->copy($app['config']['image_save_realdir'] . '/' . $Image->getFileName(), $app['config']['image_save_realdir'] . '/' . $filename);
481
+                        $fs->copy($app['config']['image_save_realdir'].'/'.$Image->getFileName(), $app['config']['image_save_realdir'].'/'.$filename);
482 482
                     } catch (\Exception $e) {
483 483
                         // エラーが発生しても無視する
484 484
                     }
@@ -533,7 +533,7 @@  discard block
 block discarded – undo
533 533
         $em->getConfiguration()->setSQLLogger(null);
534 534
 
535 535
         $response = new StreamedResponse();
536
-        $response->setCallback(function () use ($app, $request) {
536
+        $response->setCallback(function() use ($app, $request) {
537 537
 
538 538
             // CSV種別を元に初期化.
539 539
             $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_PRODUCT);
@@ -557,7 +557,7 @@  discard block
 block discarded – undo
557 557
 
558 558
             // データ行の出力.
559 559
             $app['eccube.service.csv.export']->setExportQueryBuilder($qb);
560
-            $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) {
560
+            $app['eccube.service.csv.export']->exportData(function($entity, $csvService) {
561 561
 
562 562
                 $Csvs = $csvService->getCsvs();
563 563
 
@@ -589,9 +589,9 @@  discard block
 block discarded – undo
589 589
         });
590 590
 
591 591
         $now = new \DateTime();
592
-        $filename = 'product_' . $now->format('YmdHis') . '.csv';
592
+        $filename = 'product_'.$now->format('YmdHis').'.csv';
593 593
         $response->headers->set('Content-Type', 'application/octet-stream');
594
-        $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename);
594
+        $response->headers->set('Content-Disposition', 'attachment; filename='.$filename);
595 595
         $response->send();
596 596
 
597 597
         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
@@ -70,10 +70,10 @@  discard block
 block discarded – undo
70 70
                 // ファイルアップロード
71 71
                 $file = $form['payment_image']->getData();
72 72
                 $fs = new Filesystem();
73
-                if ($file && $fs->exists($app['config']['image_temp_realdir'] . '/' . $file)) {
73
+                if ($file && $fs->exists($app['config']['image_temp_realdir'].'/'.$file)) {
74 74
                     $fs->rename(
75
-                        $app['config']['image_temp_realdir'] . '/' . $file,
76
-                        $app['config']['image_save_realdir'] . '/' . $file
75
+                        $app['config']['image_temp_realdir'].'/'.$file,
76
+                        $app['config']['image_save_realdir'].'/'.$file
77 77
                     );
78 78
                 }
79 79
 
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
         if (isset($images['payment_image_file'])) {
101 101
             $image = $images['payment_image_file'];
102 102
             $extension = $image->guessExtension();
103
-            $filename = date('mdHis') . uniqid('_') . '.' . $extension;
103
+            $filename = date('mdHis').uniqid('_').'.'.$extension;
104 104
             $image->move($app['config']['image_temp_realdir'], $filename);
105 105
         }
106 106
 
@@ -127,12 +127,12 @@  discard block
 block discarded – undo
127 127
         foreach ($Payments as $Payment) {
128 128
             if ($Payment->getId() != $id) {
129 129
                 $Payment->setRank($rank);
130
-                $rank ++;
130
+                $rank++;
131 131
             }
132 132
         }
133 133
         $app['orm.em']->flush();
134 134
 
135
-        $app->addSuccess('admin.delete.complete', 'admin') ;
135
+        $app->addSuccess('admin.delete.complete', 'admin');
136 136
 
137 137
         return $app->redirect($app->url('admin_setting_shop_payment'));
138 138
     }
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
@@ -62,7 +62,7 @@
 block discarded – undo
62 62
         $log = array();
63 63
         $message = array();
64 64
 
65
-        foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)) as $line) {
65
+        foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES)) as $line) {
66 66
             // 上限に達した場合、処理を抜ける
67 67
             if (count($log) >= $formData['line_max']) {
68 68
                 break;
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Setting/System/SystemController.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 
50 50
                 return $phpinfo;
51 51
 
52
-               break;
52
+                break;
53 53
             default:
54 54
                 break;
55 55
         }
@@ -61,8 +61,8 @@  discard block
 block discarded – undo
61 61
         ));
62 62
     }
63 63
 
64
-     public function getSystemInfo(Application $app)
65
-     {
64
+        public function getSystemInfo(Application $app)
65
+        {
66 66
         $system = $app['eccube.service.system'];
67 67
         $server = $app['request'];
68 68
 
@@ -78,5 +78,5 @@  discard block
 block discarded – undo
78 78
         $arrSystemInfo[] = array('title' => 'HTTPユーザーエージェント', 'value' => $server->headers->get('User-Agent'));
79 79
 
80 80
         return $arrSystemInfo;
81
-     }
81
+        }
82 82
 }
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -67,13 +67,13 @@
 block discarded – undo
67 67
         $server = $app['request'];
68 68
 
69 69
         $arrSystemInfo = array(
70
-            array('title' => 'EC-CUBE',     'value' => Constant::VERSION),
71
-            array('title' => 'サーバーOS',    'value' => php_uname()),
72
-            array('title' => 'DBサーバー',    'value' => $system->getDbversion()),
73
-            array('title' => 'WEBサーバー',   'value' => $server->server->get("SERVER_SOFTWARE")),
70
+            array('title' => 'EC-CUBE', 'value' => Constant::VERSION),
71
+            array('title' => 'サーバーOS', 'value' => php_uname()),
72
+            array('title' => 'DBサーバー', 'value' => $system->getDbversion()),
73
+            array('title' => 'WEBサーバー', 'value' => $server->server->get("SERVER_SOFTWARE")),
74 74
         );
75 75
 
76
-        $value = phpversion() . ' (' . implode(', ', get_loaded_extensions()) . ')';
76
+        $value = phpversion().' ('.implode(', ', get_loaded_extensions()).')';
77 77
         $arrSystemInfo[] = array('title' => 'PHP', 'value' => $value);
78 78
         $arrSystemInfo[] = array('title' => 'HTTPユーザーエージェント', 'value' => $server->headers->get('User-Agent'));
79 79
 
Please login to merge, or discard this patch.
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/EntryController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -88,7 +88,7 @@
 block discarded – undo
88 88
                             ->setCompanyName($Customer->getCompanyName())
89 89
                             ->setZip01($Customer->getZip01())
90 90
                             ->setZip02($Customer->getZip02())
91
-                            ->setZipcode($Customer->getZip01() . $Customer->getZip02())
91
+                            ->setZipcode($Customer->getZip01().$Customer->getZip02())
92 92
                             ->setPref($Customer->getPref())
93 93
                             ->setAddr01($Customer->getAddr01())
94 94
                             ->setAddr02($Customer->getAddr02())
Please login to merge, or discard this patch.