Completed
Pull Request — experimental/3.1 (#2561)
by k-yamamura
222:41 queued 215:24
created
src/Eccube/Resource/config/http_cache.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php return [
2
-  'http_cache' => 
3
-  [
2
+    'http_cache' => 
3
+    [
4 4
     'enabled' => false,
5 5
     'age' => 10,
6 6
     // フロントでキャッシュを適用させる画面のrouteを設定
@@ -17,5 +17,5 @@  discard block
 block discarded – undo
17 17
 //      'help_tradelaw',
18 18
 //      'help_agreement',
19 19
     ],
20
-  ],
20
+    ],
21 21
 ];
Please login to merge, or discard this patch.
src/Eccube/Resource/config/session_handler.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php return [
2
-  'session_handler' =>
3
-  [
2
+    'session_handler' =>
3
+    [
4 4
     // PHP/PHP拡張のセッションハンドラを利用する場合, trueに設定します。
5 5
     'enabled' => false,
6 6
 
@@ -15,5 +15,5 @@  discard block
 block discarded – undo
15 15
     // memcachedの設定例
16 16
     //'save_handler' => 'redis',
17 17
     //'save_path' => '127.0.0.1:6379',
18
-  ],
18
+    ],
19 19
 ];
Please login to merge, or discard this patch.
src/Eccube/Service/OrderHelper.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -6,7 +6,6 @@
 block discarded – undo
6 6
 use Doctrine\ORM\EntityManager;
7 7
 use Eccube\Annotation\Inject;
8 8
 use Eccube\Annotation\Service;
9
-use Eccube\Common\Constant;
10 9
 use Eccube\Entity\CartItem;
11 10
 use Eccube\Entity\Customer;
12 11
 use Eccube\Entity\CustomerAddress;
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Order/OrderController.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
303 303
         log_info('受注削除開始', array($Order->getId()));
304 304
 
305 305
         // 出荷に紐付いている明細がある場合は削除できない.
306
-        $hasShipping = $Order->getItems()->exists(function ($k, $v) {
306
+        $hasShipping = $Order->getItems()->exists(function($k, $v) {
307 307
             return false === is_null($v->getShipping());
308 308
         });
309 309
         if ($hasShipping) {
@@ -361,7 +361,7 @@  discard block
 block discarded – undo
361 361
         $em->getConfiguration()->setSQLLogger(null);
362 362
 
363 363
         $response = new StreamedResponse();
364
-        $response->setCallback(function () use ($app, $request) {
364
+        $response->setCallback(function() use ($app, $request) {
365 365
 
366 366
             // CSV種別を元に初期化.
367 367
             $this->csvExportService->initCsvType(CsvType::CSV_TYPE_ORDER);
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
 
376 376
             // データ行の出力.
377 377
             $this->csvExportService->setExportQueryBuilder($qb);
378
-            $this->csvExportService->exportData(function ($entity, $csvService) use ($app, $request) {
378
+            $this->csvExportService->exportData(function($entity, $csvService) use ($app, $request) {
379 379
 
380 380
                 $Csvs = $csvService->getCsvs();
381 381
 
@@ -416,9 +416,9 @@  discard block
 block discarded – undo
416 416
         });
417 417
 
418 418
         $now = new \DateTime();
419
-        $filename = 'order_' . $now->format('YmdHis') . '.csv';
419
+        $filename = 'order_'.$now->format('YmdHis').'.csv';
420 420
         $response->headers->set('Content-Type', 'application/octet-stream');
421
-        $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename);
421
+        $response->headers->set('Content-Disposition', 'attachment; filename='.$filename);
422 422
         $response->send();
423 423
 
424 424
         log_info('受注CSV出力ファイル名', array($filename));
@@ -445,7 +445,7 @@  discard block
 block discarded – undo
445 445
         $em->getConfiguration()->setSQLLogger(null);
446 446
 
447 447
         $response = new StreamedResponse();
448
-        $response->setCallback(function () use ($app, $request) {
448
+        $response->setCallback(function() use ($app, $request) {
449 449
 
450 450
             // CSV種別を元に初期化.
451 451
             $this->csvExportService->initCsvType(CsvType::CSV_TYPE_SHIPPING);
@@ -459,7 +459,7 @@  discard block
 block discarded – undo
459 459
 
460 460
             // データ行の出力.
461 461
             $this->csvExportService->setExportQueryBuilder($qb);
462
-            $this->csvExportService->exportData(function ($entity, $csvService) use ($app, $request) {
462
+            $this->csvExportService->exportData(function($entity, $csvService) use ($app, $request) {
463 463
 
464 464
                 $Csvs = $csvService->getCsvs();
465 465
 
@@ -509,9 +509,9 @@  discard block
 block discarded – undo
509 509
         });
510 510
 
511 511
         $now = new \DateTime();
512
-        $filename = 'shipping_' . $now->format('YmdHis') . '.csv';
512
+        $filename = 'shipping_'.$now->format('YmdHis').'.csv';
513 513
         $response->headers->set('Content-Type', 'application/octet-stream');
514
-        $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename);
514
+        $response->headers->set('Content-Disposition', 'attachment; filename='.$filename);
515 515
         $response->send();
516 516
 
517 517
         log_info('配送CSV出力ファイル名', array($filename));
Please login to merge, or discard this patch.
src/Eccube/Repository/CustomerRepository.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -392,7 +392,7 @@
 block discarded – undo
392 392
     /**
393 393
      * 会員の初回購入時間、購入時間、購入回数、購入金額を更新する
394 394
      *
395
-     * @param $app
395
+     * @param \Eccube\Application $app
396 396
      * @param  Customer $Customer
397 397
      * @param  $orderStatusId
398 398
      */
Please login to merge, or discard this patch.
src/Eccube/Repository/NewsRepository.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -114,7 +114,7 @@
 block discarded – undo
114 114
      */
115 115
     public function delete($News)
116 116
     {
117
-       $this->createQueryBuilder('n')
117
+        $this->createQueryBuilder('n')
118 118
             ->update()
119 119
             ->set('n.rank', 'n.rank - 1')
120 120
             ->where('n.rank > :rank')
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/ClassCategoryController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
         $num = $this->productClassRepository->createQueryBuilder('pc')
183 183
             ->select('count(pc.id)')
184 184
             ->where('pc.ClassCategory1 = :id OR pc.ClassCategory2 = :id')
185
-            ->setParameter('id',$id)
185
+            ->setParameter('id', $id)
186 186
             ->getQuery()
187 187
             ->getSingleScalarResult();
188 188
         if ($num > 0) {
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
                 log_error('規格分類削除エラー', array($id, $e));
209 209
 
210 210
                 $message = $app->trans('admin.delete.failed.foreign_key', ['%name%' => '規格分類']);
211
-                $app->addError($message, 'admin');            }
211
+                $app->addError($message, 'admin'); }
212 212
         }
213 213
 
214 214
         return $app->redirect($app->url('admin_product_class_category', array('class_name_id' => $ClassName->getId())));
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/ClassNameController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -148,7 +148,7 @@
 block discarded – undo
148 148
         try {
149 149
             $this->classNameRepository->delete($ClassName);
150 150
 
151
-            $event = new EventArgs(['ClassName' => $ClassName,], $request);
151
+            $event = new EventArgs(['ClassName' => $ClassName, ], $request);
152 152
             $this->eventDispatcher->dispatch(EccubeEvents::ADMIN_PRODUCT_CLASS_NAME_DELETE_COMPLETE, $event);
153 153
 
154 154
             $app->addSuccess('admin.class_name.delete.complete', 'admin');
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Setting/Shop/PaymentController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -242,7 +242,7 @@
 block discarded – undo
242 242
             $this->eventDispatcher->dispatch(EccubeEvents::ADMIN_SETTING_SHOP_PAYMENT_DELETE_COMPLETE, $event);
243 243
 
244 244
             $app->addSuccess('admin.delete.complete', 'admin');
245
-        } catch(ForeignKeyConstraintViolationException $e) {
245
+        } catch (ForeignKeyConstraintViolationException $e) {
246 246
             $this->entityManager->rollback();
247 247
 
248 248
             $message = $app->trans('admin.delete.failed.foreign_key', ['%name%' => '支払方法']);
Please login to merge, or discard this patch.