Completed
Pull Request — 4.0 (#4380)
by Kentaro
04:54
created
src/Eccube/DependencyInjection/EccubeExtension.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -64,12 +64,12 @@  discard block
 block discarded – undo
64 64
 
65 65
         // SSL強制時は, httpsのみにアクセス制限する
66 66
         $accessControl = [
67
-          ['path' => '^/%eccube_admin_route%/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'],
68
-          ['path' => '^/%eccube_admin_route%/', 'roles' => 'ROLE_ADMIN'],
69
-          ['path' => '^/mypage/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'],
70
-          ['path' => '^/mypage/withdraw_complete', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'],
71
-          ['path' => '^/mypage/change', 'roles' => 'IS_AUTHENTICATED_FULLY'],
72
-          ['path' => '^/mypage/', 'roles' => 'ROLE_USER'],
67
+            ['path' => '^/%eccube_admin_route%/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'],
68
+            ['path' => '^/%eccube_admin_route%/', 'roles' => 'ROLE_ADMIN'],
69
+            ['path' => '^/mypage/login', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'],
70
+            ['path' => '^/mypage/withdraw_complete', 'roles' => 'IS_AUTHENTICATED_ANONYMOUSLY'],
71
+            ['path' => '^/mypage/change', 'roles' => 'IS_AUTHENTICATED_FULLY'],
72
+            ['path' => '^/mypage/', 'roles' => 'ROLE_USER'],
73 73
         ];
74 74
         if ($forceSSL) {
75 75
             foreach ($accessControl as &$control) {
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 
80 80
         // security.ymlでは制御できないため, ここで定義する.
81 81
         $container->prependExtensionConfig('security', [
82
-          'access_control' => $accessControl,
82
+            'access_control' => $accessControl,
83 83
         ]);
84 84
     }
85 85
 
Please login to merge, or discard this patch.
src/Eccube/Service/PurchaseFlow/Processor/AddPointProcessor.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
                 } elseif ($item->isProduct()) {
84 84
                     // ポイント = 単価 * ポイント付与率 * 数量
85 85
                     $point = round($item->getPrice() * ($pointRate / 100)) * $item->getQuantity();
86
-                } elseif($item->isDiscount()) {
86
+                } elseif ($item->isDiscount()) {
87 87
                     $point = round($item->getPrice() * ($pointRate / 100)) * $item->getQuantity();
88 88
                 }
89 89
 
Please login to merge, or discard this patch.
src/Eccube/Service/PurchaseFlow/PurchaseFlow.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -391,7 +391,7 @@
 block discarded – undo
391 391
             'DiscountProcessor' => $this->discountProcessors->map($callback)->toArray(),
392 392
             'ItemHolderPostValidator' => $this->itemHolderPostValidators->map($callback)->toArray()
393 393
         ];
394
-        $tree  = new \RecursiveTreeIterator(new \RecursiveArrayIterator($flows));
394
+        $tree = new \RecursiveTreeIterator(new \RecursiveArrayIterator($flows));
395 395
         $tree->setPrefixPart(\RecursiveTreeIterator::PREFIX_RIGHT, ' ');
396 396
         $tree->setPrefixPart(\RecursiveTreeIterator::PREFIX_MID_LAST, ' ');
397 397
         $tree->setPrefixPart(\RecursiveTreeIterator::PREFIX_MID_HAS_NEXT, '│');
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Content/FileController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -284,7 +284,7 @@
 block discarded – undo
284 284
             $filename = $this->convertStrToServer($file->getClientOriginalName());
285 285
             try {
286 286
                 $file->move($nowDir, $filename);
287
-                $successCount ++;
287
+                $successCount++;
288 288
             } catch (FileException $e) {
289 289
                 $this->errors[] = ['message' => trans('admin.content.file.upload_error', [
290 290
                     '%file_name%' => $filename,
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Product/CsvImportController.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -762,7 +762,7 @@
 block discarded – undo
762 762
     protected function createProductImage($row, Product $Product, $data, $headerByKey)
763 763
     {
764 764
         if (!isset($row[$headerByKey['product_image']])) {
765
-             return;
765
+                return;
766 766
         }
767 767
         if (StringUtil::isNotBlank($row[$headerByKey['product_image']])) {
768 768
             // 画像の削除
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -291,7 +291,7 @@
 block discarded – undo
291 291
                                     $message = trans('admin.common.csv_invalid_description_detail_upper_limit', [
292 292
                                         '%line%' => $line,
293 293
                                         '%name%' => $headerByKey['description_detail'],
294
-                                        '%max%' => $this->eccubeConfig['eccube_ltext_len'],]);
294
+                                        '%max%' => $this->eccubeConfig['eccube_ltext_len'], ]);
295 295
                                     $this->addErrors($message);
296 296
 
297 297
                                     return $this->renderWithError($form, $headers);
Please login to merge, or discard this patch.
src/Eccube/Entity/Order.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
          */
106 106
         public function getTaxableDiscountItems()
107 107
         {
108
-            return array_filter($this->getTaxableItems(), function(OrderItem $Item) {
108
+            return array_filter($this->getTaxableItems(), function (OrderItem $Item) {
109 109
                 return $Item->isDiscount();
110 110
             });
111 111
         }
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
          */
130 130
         public function getTaxFreeDiscountItems()
131 131
         {
132
-            return array_filter($this->OrderItems->toArray(), function(OrderItem $Item) {
132
+            return array_filter($this->OrderItems->toArray(), function (OrderItem $Item) {
133 133
                 return $Item->isPoint() || ($Item->isDiscount() && $Item->getTaxType()->getId() != TaxType::TAXATION);
134 134
             });
135 135
         }
Please login to merge, or discard this patch.
src/Eccube/Service/OrderPdfService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -557,7 +557,7 @@
 block discarded – undo
557 557
             $arrOrder[$i][2] = '';
558 558
             $arrOrder[$i][3] = '';
559 559
 
560
-            foreach($Order->getTaxFreeDiscountItems() as $Item) {
560
+            foreach ($Order->getTaxFreeDiscountItems() as $Item) {
561 561
                 ++$i;
562 562
                 $arrOrder[$i][0] = '';
563 563
                 $arrOrder[$i][1] = '';
Please login to merge, or discard this patch.