Completed
Pull Request — experimental/3.1 (#1985)
by Kentaro
35:59
created
html/index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
 //require __DIR__.'/autoload.php';
28 28
 
29 29
 ini_set('display_errors', 'Off');
30
-error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT);
30
+error_reporting(E_ALL&~E_DEPRECATED&~E_STRICT);
31 31
 
32 32
 // see http://silex.sensiolabs.org/doc/web_servers.html#php-5-4
33 33
 $filename = __DIR__.preg_replace('#(\?.*)$#', '', $_SERVER['REQUEST_URI']);
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/CsvImportType.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -53,8 +53,8 @@
 block discarded – undo
53 53
                 'constraints' => array(
54 54
                     new Assert\NotBlank(array('message' => 'ファイルを選択してください。')),
55 55
                     new Assert\File(array(
56
-                        'maxSize' => $app['config']['csv_size'] . 'M',
57
-                        'maxSizeMessage' => 'CSVファイルは' . $app['config']['csv_size'] . 'M以下でアップロードしてください。',
56
+                        'maxSize' => $app['config']['csv_size'].'M',
57
+                        'maxSizeMessage' => 'CSVファイルは'.$app['config']['csv_size'].'M以下でアップロードしてください。',
58 58
                     )),
59 59
                 ),
60 60
             ));
Please login to merge, or discard this patch.
src/Eccube/Form/Type/AddCartType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@
 block discarded – undo
112 112
                 }
113 113
             }
114 114
 
115
-            $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($Product) {
115
+            $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($Product) {
116 116
                 $data = $event->getData();
117 117
                 $form = $event->getForm();
118 118
                 if (!is_null($Product->getClassName2())) {
Please login to merge, or discard this patch.
src/Eccube/Command/CacheClearCommand.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@
 block discarded – undo
52 52
 
53 53
         $this->app = $this->getSilexApplication();
54 54
         
55
-        \Eccube\Util\Cache::clear($this->app,$input->getOption('all'));
55
+        \Eccube\Util\Cache::clear($this->app, $input->getOption('all'));
56 56
         $output->writeln(sprintf("%s <info>success</info>", 'cache:clear'));
57 57
 
58 58
     }
Please login to merge, or discard this patch.
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -24,7 +24,6 @@
 block discarded – undo
24 24
 
25 25
 namespace Eccube\Command;
26 26
 
27
-use Symfony\Component\Console\Input\InputArgument;
28 27
 use Symfony\Component\Console\Input\InputInterface;
29 28
 use Symfony\Component\Console\Input\InputOption;
30 29
 use Symfony\Component\Console\Output\OutputInterface;
Please login to merge, or discard this patch.
src/Eccube/Log/Monolog/Helper/LogHelper.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -111,7 +111,7 @@
 block discarded – undo
111 111
         $webProcessor = new WebProcessor();
112 112
         $uidProcessor = new UidProcessor(8);
113 113
 
114
-        $FingerCrossedHandler->pushProcessor(function ($record) use ($app, $uidProcessor, $webProcessor) {
114
+        $FingerCrossedHandler->pushProcessor(function($record) use ($app, $uidProcessor, $webProcessor) {
115 115
             // ログフォーマットに出力する値を独自に設定
116 116
 
117 117
             $record['level_name'] = sprintf("%-5s", $record['level_name']);
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Customer/CustomerController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -235,7 +235,7 @@  discard block
 block discarded – undo
235 235
         $em->getConfiguration()->setSQLLogger(null);
236 236
 
237 237
         $response = new StreamedResponse();
238
-        $response->setCallback(function () use ($app, $request) {
238
+        $response->setCallback(function() use ($app, $request) {
239 239
 
240 240
             // CSV種別を元に初期化.
241 241
             $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_CUSTOMER);
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
 
250 250
             // データ行の出力.
251 251
             $app['eccube.service.csv.export']->setExportQueryBuilder($qb);
252
-            $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) {
252
+            $app['eccube.service.csv.export']->exportData(function($entity, $csvService) {
253 253
 
254 254
                 $Csvs = $csvService->getCsvs();
255 255
 
@@ -271,9 +271,9 @@  discard block
 block discarded – undo
271 271
         });
272 272
 
273 273
         $now = new \DateTime();
274
-        $filename = 'customer_' . $now->format('YmdHis') . '.csv';
274
+        $filename = 'customer_'.$now->format('YmdHis').'.csv';
275 275
         $response->headers->set('Content-Type', 'application/octet-stream');
276
-        $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename);
276
+        $response->headers->set('Content-Disposition', 'attachment; filename='.$filename);
277 277
 
278 278
         $response->send();
279 279
 
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
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
         $em->getConfiguration()->setSQLLogger(null);
248 248
 
249 249
         $response = new StreamedResponse();
250
-        $response->setCallback(function () use ($app, $request) {
250
+        $response->setCallback(function() use ($app, $request) {
251 251
 
252 252
             // CSV種別を元に初期化.
253 253
             $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_ORDER);
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
 
262 262
             // データ行の出力.
263 263
             $app['eccube.service.csv.export']->setExportQueryBuilder($qb);
264
-            $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) {
264
+            $app['eccube.service.csv.export']->exportData(function($entity, $csvService) {
265 265
 
266 266
                 $Csvs = $csvService->getCsvs();
267 267
 
@@ -291,9 +291,9 @@  discard block
 block discarded – undo
291 291
         });
292 292
 
293 293
         $now = new \DateTime();
294
-        $filename = 'order_' . $now->format('YmdHis') . '.csv';
294
+        $filename = 'order_'.$now->format('YmdHis').'.csv';
295 295
         $response->headers->set('Content-Type', 'application/octet-stream');
296
-        $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename);
296
+        $response->headers->set('Content-Disposition', 'attachment; filename='.$filename);
297 297
         $response->send();
298 298
 
299 299
         log_info('受注CSV出力ファイル名', array($filename));
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
         $em->getConfiguration()->setSQLLogger(null);
319 319
 
320 320
         $response = new StreamedResponse();
321
-        $response->setCallback(function () use ($app, $request) {
321
+        $response->setCallback(function() use ($app, $request) {
322 322
 
323 323
             // CSV種別を元に初期化.
324 324
             $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_SHIPPING);
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
 
333 333
             // データ行の出力.
334 334
             $app['eccube.service.csv.export']->setExportQueryBuilder($qb);
335
-            $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) {
335
+            $app['eccube.service.csv.export']->exportData(function($entity, $csvService) {
336 336
 
337 337
                 $Csvs = $csvService->getCsvs();
338 338
 
@@ -370,9 +370,9 @@  discard block
 block discarded – undo
370 370
         });
371 371
 
372 372
         $now = new \DateTime();
373
-        $filename = 'shipping_' . $now->format('YmdHis') . '.csv';
373
+        $filename = 'shipping_'.$now->format('YmdHis').'.csv';
374 374
         $response->headers->set('Content-Type', 'application/octet-stream');
375
-        $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename);
375
+        $response->headers->set('Content-Disposition', 'attachment; filename='.$filename);
376 376
         $response->send();
377 377
 
378 378
         log_info('配送CSV出力ファイル名', array($filename));
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
@@ -83,7 +83,7 @@
 block discarded – undo
83 83
             return $log;
84 84
         }
85 85
 
86
-        foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)) as $line) {
86
+        foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES)) as $line) {
87 87
             // 上限に達した場合、処理を抜ける
88 88
             if (count($log) >= $formData['line_max']) {
89 89
                 break;
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.