Completed
Pull Request — 4.0 (#4790)
by k-yamamura
11:10
created
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/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.
src/Eccube/Controller/EntryController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -251,7 +251,7 @@
 block discarded – undo
251 251
             ]
252 252
         );
253 253
 
254
-        if(!is_null($qtyInCart)) {
254
+        if (!is_null($qtyInCart)) {
255 255
 
256 256
             return [
257 257
                 'qtyInCart' => $qtyInCart,
Please login to merge, or discard this patch.
src/Eccube/Repository/ProductRepository.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -226,7 +226,7 @@
 block discarded – undo
226 226
 
227 227
         // id
228 228
         if (isset($searchData['id']) && StringUtil::isNotBlank($searchData['id'])) {
229
-            $id = preg_match('/^\d{0,10}$/', $searchData['id'])  ? $searchData['id'] : null;
229
+            $id = preg_match('/^\d{0,10}$/', $searchData['id']) ? $searchData['id'] : null;
230 230
             if ($id && $id > '2147483647' && $this->isPostgreSQL()) {
231 231
                 $id = null;
232 232
             }
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Setting/System/LogController.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -71,13 +71,13 @@
 block discarded – undo
71 71
         if ($form->getClickedButton() && $form->getClickedButton()->getName() === 'download') {
72 72
             $bufferSize = 1024 * 50;
73 73
             $response = new StreamedResponse();
74
-            $response->headers->set('Content-Length',filesize($logFile));
75
-            $response->headers->set('Content-Disposition','attachment; filename=' . basename($logFile));
76
-            $response->headers->set('Content-Type','application/octet-stream');
77
-            $response->setCallback(function() use($logFile,$bufferSize) {
78
-                if ($fh = fopen($logFile,'r')) {
74
+            $response->headers->set('Content-Length', filesize($logFile));
75
+            $response->headers->set('Content-Disposition', 'attachment; filename='.basename($logFile));
76
+            $response->headers->set('Content-Type', 'application/octet-stream');
77
+            $response->setCallback(function () use($logFile, $bufferSize) {
78
+                if ($fh = fopen($logFile, 'r')) {
79 79
                     while (!feof($fh)) {
80
-                        echo fread($fh,$bufferSize);
80
+                        echo fread($fh, $bufferSize);
81 81
                     }
82 82
                 }
83 83
             });
Please login to merge, or discard this patch.
src/Eccube/Form/Type/PostalType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
     public function configureOptions(OptionsResolver $resolver)
57 57
     {
58 58
         $eccubeConfig = $this->eccubeConfig;
59
-        $constraints = function(Options $options) use ($eccubeConfig) {
59
+        $constraints = function (Options $options) use ($eccubeConfig) {
60 60
             $constraints = [];
61 61
             // requiredがtrueに指定されている場合, NotBlankを追加
62 62
             if (isset($options['required']) && true === $options['required']) {
Please login to merge, or discard this patch.