Completed
Pull Request — experimental/3.1 (#2483)
by Kentaro
44:50
created
src/Eccube/Service/Calculator/Strategy/CalculateChargeStrategy.php 1 patch
Unused Use Statements   -4 removed lines patch added patch discarded remove patch
@@ -2,13 +2,9 @@
 block discarded – undo
2 2
 namespace Eccube\Service\Calculator\Strategy;
3 3
 
4 4
 use Eccube\Application;
5
-use Eccube\Entity\Master\OrderItemType;
6
-use Eccube\Entity\Master\TaxType;
7
-use Eccube\Entity\Master\TaxDisplayType;
8 5
 use Eccube\Entity\Order;
9 6
 use Eccube\Entity\PurchaseInterface;
10 7
 use Eccube\Entity\ShipmentItem;
11
-use Eccube\Entity\Shipping;
12 8
 use Eccube\Repository\Master\OrderItemTypeRepository;
13 9
 use Eccube\Service\Calculator\ShipmentItemCollection;
14 10
 
Please login to merge, or discard this patch.
src/Eccube/Service/Calculator/Strategy/CalculateTotalStrategy.php 1 patch
Unused Use Statements   -4 removed lines patch added patch discarded remove patch
@@ -2,14 +2,10 @@
 block discarded – undo
2 2
 namespace Eccube\Service\Calculator\Strategy;
3 3
 
4 4
 use Eccube\Application;
5
-use Eccube\Entity\Master\OrderItemType;
6
-use Eccube\Entity\Master\TaxType;
7
-use Eccube\Entity\Master\TaxDisplayType;
8 5
 use Eccube\Entity\Cart;
9 6
 use Eccube\Entity\Order;
10 7
 use Eccube\Entity\PurchaseInterface;
11 8
 use Eccube\Entity\ShipmentItem;
12
-use Eccube\Entity\Shipping;
13 9
 use Eccube\Repository\Master\OrderItemTypeRepository;
14 10
 use Eccube\Service\Calculator\ShipmentItemCollection;
15 11
 
Please login to merge, or discard this patch.
src/Eccube/Service/Calculator/Strategy/ChargeStrategy.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,6 @@
 block discarded – undo
8 8
 use Eccube\Entity\Order;
9 9
 use Eccube\Entity\PurchaseInterface;
10 10
 use Eccube\Entity\ShipmentItem;
11
-use Eccube\Entity\Shipping;
12 11
 use Eccube\Repository\Master\OrderItemTypeRepository;
13 12
 use Eccube\Service\Calculator\ShipmentItemCollection;
14 13
 
Please login to merge, or discard this patch.
src/Eccube/Service/Calculator/ShipmentItemCollection.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@
 block discarded – undo
63 63
     public function hasProductByName($productName)
64 64
     {
65 65
         $ShipmentItems = $this->filter(
66
-            function (ItemInterface $ShipmentItem) use ($productName) {
66
+            function(ItemInterface $ShipmentItem) use ($productName) {
67 67
                 /* @var ShipmentItem $ShipmentItem */
68 68
                 return $ShipmentItem->getProductName() == $productName;
69 69
             });
Please login to merge, or discard this patch.
src/Eccube/Service/Calculator/Strategy/CalculateDeliveryFeeStrategy.php 1 patch
Unused Use Statements   -4 removed lines patch added patch discarded remove patch
@@ -2,13 +2,9 @@
 block discarded – undo
2 2
 namespace Eccube\Service\Calculator\Strategy;
3 3
 
4 4
 use Eccube\Application;
5
-use Eccube\Entity\Master\OrderItemType;
6
-use Eccube\Entity\Master\TaxType;
7
-use Eccube\Entity\Master\TaxDisplayType;
8 5
 use Eccube\Entity\Order;
9 6
 use Eccube\Entity\PurchaseInterface;
10 7
 use Eccube\Entity\ShipmentItem;
11
-use Eccube\Entity\Shipping;
12 8
 use Eccube\Repository\Master\OrderItemTypeRepository;
13 9
 use Eccube\Service\Calculator\ShipmentItemCollection;
14 10
 
Please login to merge, or discard this patch.
PurchaseProcessors/ServiceProvider/PurchaseProcessorsServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
     {
15 15
         $app->extend(
16 16
             'eccube.purchase.flow.cart.item_processors',
17
-            function (ArrayCollection $processors, Container $app) {
17
+            function(ArrayCollection $processors, Container $app) {
18 18
                 $processors[] = new EmptyProcessor();
19 19
                 $processors[] = new ValidatableEmptyProcessor();
20 20
                 return $processors;
Please login to merge, or discard this patch.
app/Plugin/FormExtension/ServiceProvider/FormExtensionServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
     {
13 13
         $app->extend(
14 14
             'form.type.extensions',
15
-            function ($extensions) {
15
+            function($extensions) {
16 16
                 $extensions[] = new EntryTypeExtension();
17 17
 
18 18
                 return $extensions;
Please login to merge, or discard this patch.
src/Eccube/Service/PurchaseFlow/PurchaseFlow.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
      */
105 105
     protected function calculateTotal(ItemHolderInterface $itemHolder)
106 106
     {
107
-        $total = $itemHolder->getItems()->reduce(function ($sum, ItemInterface $item) {
107
+        $total = $itemHolder->getItems()->reduce(function($sum, ItemInterface $item) {
108 108
             $sum += $item->getPriceIncTax() * $item->getQuantity();
109 109
 
110 110
             return $sum;
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
     {
122 122
         $total = $itemHolder->getItems()
123 123
             ->getProductClasses()
124
-            ->reduce(function ($sum, ItemInterface $item) {
124
+            ->reduce(function($sum, ItemInterface $item) {
125 125
                 $sum += $item->getPriceIncTax() * $item->getQuantity();
126 126
 
127 127
                 return $sum;
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
     {
141 141
         $total = $itemHolder->getItems()
142 142
             ->getDeliveryFees()
143
-            ->reduce(function ($sum, ItemInterface $item) {
143
+            ->reduce(function($sum, ItemInterface $item) {
144 144
                 $sum += $item->getPriceIncTax() * $item->getQuantity();
145 145
 
146 146
                 return $sum;
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
     {
156 156
         $total = $itemHolder->getItems()
157 157
             ->getDiscounts()
158
-            ->reduce(function ($sum, ItemInterface $item) {
158
+            ->reduce(function($sum, ItemInterface $item) {
159 159
                 $sum += $item->getPriceIncTax() * $item->getQuantity();
160 160
 
161 161
                 return $sum;
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
     {
172 172
         $total = $itemHolder->getItems()
173 173
             ->getCharges()
174
-            ->reduce(function ($sum, ItemInterface $item) {
174
+            ->reduce(function($sum, ItemInterface $item) {
175 175
                 $sum += $item->getPriceIncTax() * $item->getQuantity();
176 176
 
177 177
                 return $sum;
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
     protected function calculateTax(ItemHolderInterface $itemHolder)
186 186
     {
187 187
         $total = $itemHolder->getItems()
188
-            ->reduce(function ($sum, ItemInterface $item) {
188
+            ->reduce(function($sum, ItemInterface $item) {
189 189
                 $sum += ($item->getPriceIncTax() - $item->getPrice()) * $item->getQuantity();
190 190
 
191 191
                 return $sum;
Please login to merge, or discard this patch.
src/Eccube/Service/PurchaseFlow/ItemCollection.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
     public function getProductClasses()
32 32
     {
33 33
         return $this->filter(
34
-            function (ItemInterface $ShipmentItem) {
34
+            function(ItemInterface $ShipmentItem) {
35 35
                 return $ShipmentItem->isProduct();
36 36
             });
37 37
     }
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
     public function getDeliveryFees()
40 40
     {
41 41
         return $this->filter(
42
-            function (ItemInterface $ShipmentItem) {
42
+            function(ItemInterface $ShipmentItem) {
43 43
                 return $ShipmentItem->isDeliveryFee();
44 44
             });
45 45
     }
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
     public function getCharges()
48 48
     {
49 49
         return $this->filter(
50
-            function (ItemInterface $ShipmentItem) {
50
+            function(ItemInterface $ShipmentItem) {
51 51
                 return $ShipmentItem->isCharge();
52 52
             });
53 53
     }
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
     public function getDiscounts()
56 56
     {
57 57
         return $this->filter(
58
-            function (ItemInterface $ShipmentItem) {
58
+            function(ItemInterface $ShipmentItem) {
59 59
                 return $ShipmentItem->isDiscount();
60 60
             });
61 61
     }
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
     public function hasProductByName($productName)
69 69
     {
70 70
         $ShipmentItems = $this->filter(
71
-            function (ItemInterface $ShipmentItem) use ($productName) {
71
+            function(ItemInterface $ShipmentItem) use ($productName) {
72 72
                 /* @var ShipmentItem $ShipmentItem */
73 73
                 return $ShipmentItem->getProductName() == $productName;
74 74
             });
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
      */
86 86
     public function hasItemByOrderItemType($OrderItemType)
87 87
     {
88
-        $filteredItems = $this->filter(function (ItemInterface $ShipmentItem) use ($OrderItemType) {
88
+        $filteredItems = $this->filter(function(ItemInterface $ShipmentItem) use ($OrderItemType) {
89 89
             /* @var ShipmentItem $ShipmentItem */
90 90
             return $ShipmentItem->getOrderItemType() && $ShipmentItem->getOrderItemType()->getId() == $OrderItemType->getId();
91 91
         });
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
     public function sort()
102 102
     {
103 103
         $Items = $this->toArray();
104
-        usort($Items, function (ItemInterface $a, ItemInterface $b) {
104
+        usort($Items, function(ItemInterface $a, ItemInterface $b) {
105 105
             if ($a->getOrderItemType() === $b->getOrderItemType()) {
106 106
                 return ($a->getId() < $b->getId()) ? -1 : 1;
107 107
             } elseif ($a->isProduct()) {
Please login to merge, or discard this patch.