Completed
Pull Request — experimental/3.1 (#2561)
by k-yamamura
222:41 queued 215:24
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\OrderItem;
11
-use Eccube\Entity\Shipping;
12 8
 use Eccube\Repository\Master\OrderItemTypeRepository;
13 9
 use Eccube\Service\Calculator\OrderItemCollection;
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\OrderItem;
12
-use Eccube\Entity\Shipping;
13 9
 use Eccube\Repository\Master\OrderItemTypeRepository;
14 10
 use Eccube\Service\Calculator\OrderItemCollection;
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\OrderItem;
11
-use Eccube\Entity\Shipping;
12 11
 use Eccube\Repository\Master\OrderItemTypeRepository;
13 12
 use Eccube\Service\Calculator\OrderItemCollection;
14 13
 
Please login to merge, or discard this patch.
src/Eccube/Service/TaxRuleService.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
      * @param  int|null|\Eccube\Entity\ProductClass   $productClass 商品規格
66 66
      * @param  int|null|\Eccube\Entity\Master\Pref    $pref         都道府県
67 67
      * @param  int|null|\Eccube\Entity\Master\Country $country      国
68
-     * @return int
68
+     * @return double
69 69
      */
70 70
     public function getPriceIncTax($price, $product = null, $productClass = null, $pref = null, $country = null)
71 71
     {
@@ -92,8 +92,8 @@  discard block
 block discarded – undo
92 92
     /**
93 93
      * 課税規則に応じて端数処理を行う
94 94
      *
95
-     * @param  float|integer $value    端数処理を行う数値
96
-     * @param  integer       $calcRule 課税規則
95
+     * @param  integer $value    端数処理を行う数値
96
+     * @param integer $RoundingType
97 97
      * @return double        端数処理後の数値
98 98
      */
99 99
     public function roundByRoundingType($value, $RoundingType)
Please login to merge, or discard this patch.
src/Eccube/Repository/PageRepository.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -257,7 +257,7 @@
 block discarded – undo
257 257
         }
258 258
 
259 259
         foreach ($readPaths as $readPath) {
260
-            $filePath = $readPath . '/' . $fileName . '.twig';
260
+            $filePath = $readPath.'/'.$fileName.'.twig';
261 261
             $fs = new Filesystem();
262 262
             if ($fs->exists($filePath)) {
263 263
                 return array(
Please login to merge, or discard this patch.
src/Eccube/Service/Calculator/OrderItemCollection.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
         $OrderItems = $this->filter(
66
-            function (ItemInterface $OrderItem) use ($productName) {
66
+            function(ItemInterface $OrderItem) use ($productName) {
67 67
                 /* @var OrderItem $OrderItem */
68 68
                 return $OrderItem->getProductName() == $productName;
69 69
             });
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 $OrderItem) {
34
+            function(ItemInterface $OrderItem) {
35 35
                 return $OrderItem->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 $OrderItem) {
42
+            function(ItemInterface $OrderItem) {
43 43
                 return $OrderItem->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 $OrderItem) {
50
+            function(ItemInterface $OrderItem) {
51 51
                 return $OrderItem->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 $OrderItem) {
58
+            function(ItemInterface $OrderItem) {
59 59
                 return $OrderItem->isDiscount();
60 60
             });
61 61
     }
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
     public function hasProductByName($productName)
69 69
     {
70 70
         $OrderItems = $this->filter(
71
-            function (ItemInterface $OrderItem) use ($productName) {
71
+            function(ItemInterface $OrderItem) use ($productName) {
72 72
                 /* @var OrderItem $OrderItem */
73 73
                 return $OrderItem->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 $OrderItem) use ($OrderItemType) {
88
+        $filteredItems = $this->filter(function(ItemInterface $OrderItem) use ($OrderItemType) {
89 89
             /* @var OrderItem $OrderItem */
90 90
             return $OrderItem->getOrderItemType() && $OrderItem->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.
src/Eccube/ServiceProvider/CompatRepositoryProvider.php 1 patch
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -11,163 +11,163 @@
 block discarded – undo
11 11
     public function register(Container $app)
12 12
     {
13 13
         // Repository
14
-        $app['eccube.repository.master.authority'] = function () use ($app) {
14
+        $app['eccube.repository.master.authority'] = function() use ($app) {
15 15
             return $app['Eccube\Repository\Master\AuthorityRepository'];
16 16
         };
17
-        $app['eccube.repository.master.tag'] = function () use ($app) {
17
+        $app['eccube.repository.master.tag'] = function() use ($app) {
18 18
             return $app['Eccube\Repository\Master\TagRepository'];
19 19
         };
20
-        $app['eccube.repository.master.pref'] = function () use ($app) {
20
+        $app['eccube.repository.master.pref'] = function() use ($app) {
21 21
             return $app['Eccube\Repository\Master\PrefRepository'];
22 22
         };
23
-        $app['eccube.repository.master.sex'] = function () use ($app) {
23
+        $app['eccube.repository.master.sex'] = function() use ($app) {
24 24
             return $app['Eccube\Repository\Master\SexRepository'];
25 25
         };
26
-        $app['eccube.repository.master.product_status'] = function () use ($app) {
26
+        $app['eccube.repository.master.product_status'] = function() use ($app) {
27 27
             return $app['Eccube\Repository\Master\ProductStatusRepository'];
28 28
         };
29
-        $app['eccube.repository.master.product_type'] = function () use ($app) {
29
+        $app['eccube.repository.master.product_type'] = function() use ($app) {
30 30
             return $app['Eccube\Repository\Master\ProductTypeRepository'];
31 31
         };
32
-        $app['eccube.repository.master.page_max'] = function () use ($app) {
32
+        $app['eccube.repository.master.page_max'] = function() use ($app) {
33 33
             return $app['Eccube\Repository\Master\PageMaxRepository'];
34 34
         };
35
-        $app['eccube.repository.master.order_status'] = function () use ($app) {
35
+        $app['eccube.repository.master.order_status'] = function() use ($app) {
36 36
             return $app['Eccube\Repository\Master\OrderStatusRepository'];
37 37
         };
38
-        $app['eccube.repository.master.product_list_max'] = function () use ($app) {
38
+        $app['eccube.repository.master.product_list_max'] = function() use ($app) {
39 39
             return $app['Eccube\Repository\Master\ProductListMaxRepository'];
40 40
         };
41
-        $app['eccube.repository.master.product_list_order_by'] = function () use ($app) {
41
+        $app['eccube.repository.master.product_list_order_by'] = function() use ($app) {
42 42
             return $app['Eccube\Repository\Master\ProductListOrderByRepository'];
43 43
         };
44
-        $app['eccube.repository.master.device_type'] = function () use ($app) {
44
+        $app['eccube.repository.master.device_type'] = function() use ($app) {
45 45
             return $app['Eccube\Repository\Master\DeviceTypeRepository'];
46 46
         };
47
-        $app['eccube.repository.master.csv_type'] = function () use ($app) {
47
+        $app['eccube.repository.master.csv_type'] = function() use ($app) {
48 48
             return $app['Eccube\Repository\Master\CsvTypeRepository'];
49 49
         };
50
-        $app['eccube.repository.master.order_item_type'] = function () use ($app) {
50
+        $app['eccube.repository.master.order_item_type'] = function() use ($app) {
51 51
             return $app['Eccube\Repository\Master\OrderItemTypeRepository'];
52 52
         };
53
-        $app['eccube.repository.base_info'] = function () use ($app) {
53
+        $app['eccube.repository.base_info'] = function() use ($app) {
54 54
             return $app['Eccube\Repository\BaseInfoRepository'];
55 55
         };
56
-        $app['eccube.repository.delivery'] = function () use ($app) {
56
+        $app['eccube.repository.delivery'] = function() use ($app) {
57 57
             return $app['Eccube\Repository\DeliveryRepository'];
58 58
         };
59
-        $app['eccube.repository.delivery_date'] = function () use ($app) {
59
+        $app['eccube.repository.delivery_date'] = function() use ($app) {
60 60
             return $app['Eccube\Repository\DeliveryDateRepository'];
61 61
         };
62
-        $app['eccube.repository.delivery_fee'] = function () use ($app) {
62
+        $app['eccube.repository.delivery_fee'] = function() use ($app) {
63 63
             return $app['Eccube\Repository\DeliveryFeeRepository'];
64 64
         };
65
-        $app['eccube.repository.delivery_time'] = function () use ($app) {
65
+        $app['eccube.repository.delivery_time'] = function() use ($app) {
66 66
             return $app['Eccube\Repository\DeliveryTimeRepository'];
67 67
         };
68
-        $app['eccube.repository.payment'] = function () use ($app) {
68
+        $app['eccube.repository.payment'] = function() use ($app) {
69 69
             return $app['Eccube\Repository\PaymentRepository'];
70 70
         };
71
-        $app['eccube.repository.payment_option'] = function () use ($app) {
71
+        $app['eccube.repository.payment_option'] = function() use ($app) {
72 72
             return $app['Eccube\Repository\PaymentOptionRepository'];
73 73
         };
74
-        $app['eccube.repository.customer'] = function () use ($app) {
74
+        $app['eccube.repository.customer'] = function() use ($app) {
75 75
             return $app['Eccube\Repository\CustomerRepository'];
76 76
         };
77
-        $app['eccube.repository.news'] = function () use ($app) {
77
+        $app['eccube.repository.news'] = function() use ($app) {
78 78
             return $app['Eccube\Repository\NewsRepository'];
79 79
         };
80
-        $app['eccube.repository.mail_history'] = function () use ($app) {
80
+        $app['eccube.repository.mail_history'] = function() use ($app) {
81 81
             return $app['Eccube\Repository\MailHistoryRepository'];
82 82
         };
83
-        $app['eccube.repository.member'] = function () use ($app) {
83
+        $app['eccube.repository.member'] = function() use ($app) {
84 84
             return $app['Eccube\Repository\MemberRepository'];
85 85
         };
86
-        $app['eccube.repository.order'] = function () use ($app) {
86
+        $app['eccube.repository.order'] = function() use ($app) {
87 87
             return $app['Eccube\Repository\OrderRepository'];
88 88
         };
89
-        $app['eccube.repository.product'] = function () use ($app) {
89
+        $app['eccube.repository.product'] = function() use ($app) {
90 90
             return $app['Eccube\Repository\ProductRepository'];
91 91
         };
92
-        $app['eccube.repository.product_image'] = function () use ($app) {
92
+        $app['eccube.repository.product_image'] = function() use ($app) {
93 93
             return $app['Eccube\Repository\ProductImageRepository'];
94 94
         };
95
-        $app['eccube.repository.product_class'] = function () use ($app) {
95
+        $app['eccube.repository.product_class'] = function() use ($app) {
96 96
             return $app['Eccube\Repository\ProductClassRepository'];
97 97
         };
98
-        $app['eccube.repository.product_stock'] = function () use ($app) {
98
+        $app['eccube.repository.product_stock'] = function() use ($app) {
99 99
             return $app['Eccube\Repository\ProductStockRepository'];
100 100
         };
101
-        $app['eccube.repository.product_tag'] = function () use ($app) {
101
+        $app['eccube.repository.product_tag'] = function() use ($app) {
102 102
             return $app['Eccube\Repository\ProductTagRepository'];
103 103
         };
104
-        $app['eccube.repository.class_name'] = function () use ($app) {
104
+        $app['eccube.repository.class_name'] = function() use ($app) {
105 105
             return $app['Eccube\Repository\ClassNameRepository'];
106 106
         };
107
-        $app['eccube.repository.class_category'] = function () use ($app) {
107
+        $app['eccube.repository.class_category'] = function() use ($app) {
108 108
             return $app['Eccube\Repository\ClassCategoryRepository'];
109 109
         };
110
-        $app['eccube.repository.customer_favorite_product'] = function () use ($app) {
110
+        $app['eccube.repository.customer_favorite_product'] = function() use ($app) {
111 111
             return $app['Eccube\Repository\CustomerFavoriteProductRepository'];
112 112
         };
113
-        $app['eccube.repository.tax_rule'] = function () use ($app) {
113
+        $app['eccube.repository.tax_rule'] = function() use ($app) {
114 114
             return $app['Eccube\Repository\TaxRuleRepository'];
115 115
         };
116
-        $app['eccube.repository.page'] = function () use ($app) {
116
+        $app['eccube.repository.page'] = function() use ($app) {
117 117
             return $app['Eccube\Repository\PageRepository'];
118 118
         };
119
-        $app['eccube.repository.block'] = function () use ($app) {
119
+        $app['eccube.repository.block'] = function() use ($app) {
120 120
             return $app['Eccube\Repository\BlockRepository'];
121 121
         };
122
-        $app['eccube.repository.order'] = function () use ($app) {
122
+        $app['eccube.repository.order'] = function() use ($app) {
123 123
             return $app['Eccube\Repository\OrderRepository'];
124 124
         };
125
-        $app['eccube.repository.customer_address'] = function () use ($app) {
125
+        $app['eccube.repository.customer_address'] = function() use ($app) {
126 126
             return $app['Eccube\Repository\CustomerAddressRepository'];
127 127
         };
128
-        $app['eccube.repository.shipping'] = function () use ($app) {
128
+        $app['eccube.repository.shipping'] = function() use ($app) {
129 129
             return $app['Eccube\Repository\ShippingRepository'];
130 130
         };
131
-        $app['eccube.repository.order_item'] = function () use ($app) {
131
+        $app['eccube.repository.order_item'] = function() use ($app) {
132 132
             return $app['Eccube\Repository\OrderItemRepository'];
133 133
         };
134
-        $app['eccube.repository.master.customer_status'] = function () use ($app) {
134
+        $app['eccube.repository.master.customer_status'] = function() use ($app) {
135 135
             return $app['Eccube\Repository\Master\CustomerStatusRepository'];
136 136
         };
137 137
 
138
-        $app['eccube.repository.mail_template'] = function () use ($app) {
138
+        $app['eccube.repository.mail_template'] = function() use ($app) {
139 139
             return $app['Eccube\Repository\MailTemplateRepository'];
140 140
         };
141
-        $app['eccube.repository.csv'] = function () use ($app) {
141
+        $app['eccube.repository.csv'] = function() use ($app) {
142 142
             return $app['Eccube\Repository\CsvRepository'];
143 143
         };
144
-        $app['eccube.repository.template'] = function () use ($app) {
144
+        $app['eccube.repository.template'] = function() use ($app) {
145 145
             return $app['Eccube\Repository\TemplateRepository'];
146 146
         };
147
-        $app['eccube.repository.authority_role'] = function () use ($app) {
147
+        $app['eccube.repository.authority_role'] = function() use ($app) {
148 148
             return $app['Eccube\Repository\AuthorityRoleRepository'];
149 149
         };
150
-        $app['eccube.repository.category'] = function () use ($app) {
150
+        $app['eccube.repository.category'] = function() use ($app) {
151 151
             return $app['Eccube\Repository\CategoryRepository'];
152 152
         };
153
-        $app['eccube.repository.help'] = function () use ($app) {
153
+        $app['eccube.repository.help'] = function() use ($app) {
154 154
             return $app['Eccube\Repository\HelpRepository'];
155 155
         };
156
-        $app['eccube.repository.plugin'] = function () use ($app) {
156
+        $app['eccube.repository.plugin'] = function() use ($app) {
157 157
             return $app['Eccube\Repository\PluginRepository'];
158 158
         };
159
-        $app['eccube.repository.plugin_event_handler'] = function () use ($app) {
159
+        $app['eccube.repository.plugin_event_handler'] = function() use ($app) {
160 160
             return $app['Eccube\Repository\PluginEventHandlerRepository'];
161 161
         };
162
-        $app['eccube.repository.layout'] = function () use ($app) {
162
+        $app['eccube.repository.layout'] = function() use ($app) {
163 163
             return $app['Eccube\Repository\LayoutRepository'];
164 164
         };
165 165
 
166 166
         // alias
167
-        $app['eccube.repository.order_status'] = function () use ($app) {
167
+        $app['eccube.repository.order_status'] = function() use ($app) {
168 168
             return $app['Eccube\Repository\Master\OrderStatusRepository'];
169 169
         };
170
-        $app['eccube.repository.customer_status'] = function () use ($app) {
170
+        $app['eccube.repository.customer_status'] = function() use ($app) {
171 171
             return $app['Eccube\Repository\Master\CustomerStatusRepository'];
172 172
         };
173 173
     }
Please login to merge, or discard this patch.
src/Eccube/Form/Type/ShippingMultipleType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@
 block discarded – undo
61 61
         $app = $this->app;
62 62
 
63 63
         $builder
64
-            ->addEventListener(FormEvents::POST_SET_DATA, function ($event) use ($app) {
64
+            ->addEventListener(FormEvents::POST_SET_DATA, function($event) use ($app) {
65 65
                 /** @var \Eccube\Entity\OrderItem $data */
66 66
                 $data = $event->getData();
67 67
                 /** @var \Symfony\Component\Form\Form $form */
Please login to merge, or discard this patch.