Completed
Pull Request — experimental/3.1 (#2655)
by chihiro
89:30
created
src/Eccube/Controller/Admin/Shipping/EditController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -446,7 +446,7 @@
 block discarded – undo
446 446
                 $session->set('eccube.admin.order.product.search', $searchData);
447 447
                 $session->set('eccube.admin.order.product.search.page_no', $page_no);
448 448
             } else {
449
-                $searchData = (array)$session->get('eccube.admin.order.product.search');
449
+                $searchData = (array) $session->get('eccube.admin.order.product.search');
450 450
                 if (is_null($page_no)) {
451 451
                     $page_no = intval($session->get('eccube.admin.order.product.search.page_no'));
452 452
                 } else {
Please login to merge, or discard this patch.
src/Eccube/Repository/ShippingRepository.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
     /**
38 38
      *
39 39
      * @param  array        $searchData
40
-     * @return QueryBuilder
40
+     * @return \Doctrine\ORM\QueryBuilder
41 41
      */
42 42
     public function getQueryBuilderBySearchDataForAdmin($searchData)
43 43
     {
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@
 block discarded – undo
56 56
             $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null;
57 57
             $qb
58 58
                 ->andWhere('s.id = :multi OR s.name01 LIKE :likemulti OR s.name02 LIKE :likemulti OR ' .
59
-                           's.kana01 LIKE :likemulti OR s.kana02 LIKE :likemulti OR s.company_name LIKE :likemulti')
59
+                            's.kana01 LIKE :likemulti OR s.kana02 LIKE :likemulti OR s.company_name LIKE :likemulti')
60 60
                 ->setParameter('multi', $multi)
61 61
                 ->setParameter('likemulti', '%' . $searchData['multi'] . '%');
62 62
         }
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -52,13 +52,13 @@  discard block
 block discarded – undo
52 52
                 ->setParameter('shipping_id_start', $searchData['shipping_id_start']);
53 53
         }
54 54
         // multi
55
-        if (isset( $searchData['multi']) && Str::isNotBlank($searchData['multi'])) {
55
+        if (isset($searchData['multi']) && Str::isNotBlank($searchData['multi'])) {
56 56
             $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null;
57 57
             $qb
58
-                ->andWhere('s.id = :multi OR s.name01 LIKE :likemulti OR s.name02 LIKE :likemulti OR ' .
58
+                ->andWhere('s.id = :multi OR s.name01 LIKE :likemulti OR s.name02 LIKE :likemulti OR '.
59 59
                            's.kana01 LIKE :likemulti OR s.kana02 LIKE :likemulti OR s.company_name LIKE :likemulti')
60 60
                 ->setParameter('multi', $multi)
61
-                ->setParameter('likemulti', '%' . $searchData['multi'] . '%');
61
+                ->setParameter('likemulti', '%'.$searchData['multi'].'%');
62 62
         }
63 63
 
64 64
         // shipping_id_end
@@ -91,42 +91,42 @@  discard block
 block discarded – undo
91 91
         if (isset($searchData['name']) && Str::isNotBlank($searchData['name'])) {
92 92
             $qb
93 93
                 ->andWhere('CONCAT(s.name01, s.name02) LIKE :name')
94
-                ->setParameter('name', '%' . $searchData['name'] . '%');
94
+                ->setParameter('name', '%'.$searchData['name'].'%');
95 95
         }
96 96
 
97 97
         // kana
98 98
         if (isset($searchData['kana']) && Str::isNotBlank($searchData['kana'])) {
99 99
             $qb
100 100
                 ->andWhere('CONCAT(s.kana01, s.kana02) LIKE :kana')
101
-                ->setParameter('kana', '%' . $searchData['kana'] . '%');
101
+                ->setParameter('kana', '%'.$searchData['kana'].'%');
102 102
         }
103 103
 
104 104
         // order_name
105 105
         if (isset($searchData['order_name']) && Str::isNotBlank($searchData['order_name'])) {
106 106
             $qb
107 107
                 ->andWhere('CONCAT(o.name01, o.name02) LIKE :order_name')
108
-                ->setParameter('order_name', '%' . $searchData['order_name'] . '%');
108
+                ->setParameter('order_name', '%'.$searchData['order_name'].'%');
109 109
         }
110 110
 
111 111
         // order_kana
112 112
         if (isset($searchData['order_kana']) && Str::isNotBlank($searchData['order_kana'])) {
113 113
             $qb
114 114
                 ->andWhere('CONCAT(o.kana01, s.kana02) LIKE :order_kana')
115
-                ->setParameter('kana', '%' . $searchData['order_kana'] . '%');
115
+                ->setParameter('kana', '%'.$searchData['order_kana'].'%');
116 116
         }
117 117
 
118 118
         // order_email
119 119
         if (isset($searchData['email']) && Str::isNotBlank($searchData['email'])) {
120 120
             $qb
121 121
                 ->andWhere('o.email like :email')
122
-                ->setParameter('email', '%' . $searchData['email'] . '%');
122
+                ->setParameter('email', '%'.$searchData['email'].'%');
123 123
         }
124 124
 
125 125
         // tel
126 126
         if (isset($searchData['tel']) && Str::isNotBlank($searchData['tel'])) {
127 127
             $qb
128 128
                 ->andWhere('CONCAT(s.tel01, s.tel02, s.tel03) LIKE :tel')
129
-                ->setParameter('tel', '%' . $searchData['tel'] . '%');
129
+                ->setParameter('tel', '%'.$searchData['tel'].'%');
130 130
         }
131 131
 
132 132
         // payment
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
         if (isset($searchData['buy_product_name']) && Str::isNotBlank($searchData['buy_product_name'])) {
223 223
             $qb
224 224
                 ->andWhere('si.product_name LIKE :buy_product_name')
225
-                ->setParameter('buy_product_name', '%' . $searchData['buy_product_name'] . '%');
225
+                ->setParameter('buy_product_name', '%'.$searchData['buy_product_name'].'%');
226 226
         }
227 227
 
228 228
         // Order By
Please login to merge, or discard this patch.
app/Plugin/EntityEvent/ServiceProvider/EntityEventServiceProvider.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
     public function register(Container $app)
14 14
     {
15
-        $app['plugin.entity_event.base_info_listener'] = function (Container $container) {
15
+        $app['plugin.entity_event.base_info_listener'] = function(Container $container) {
16 16
             return new BaseInfoListener();
17 17
         };
18 18
     }
Please login to merge, or discard this patch.
app/Plugin/QueryCustomize/ServiceProvider/QueryCustomizeServiceProvider.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
     public function register(Container $app)
14 14
     {
15
-        $app['plugin.query_customize.customer_search'] = function (Container $container) {
15
+        $app['plugin.query_customize.customer_search'] = function(Container $container) {
16 16
             return new AdminCustomerCustomizer();
17 17
         };
18 18
     }
Please login to merge, or discard this patch.
src/Eccube/Command/RouterCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@
 block discarded – undo
94 94
             if (strtoupper($orderby) === "PATH") {
95 95
                 uasort(
96 96
                     $routes,
97
-                    function ($a, $b) {
97
+                    function($a, $b) {
98 98
                         return strcmp($a->getPath(), $b->getPath());
99 99
                     }
100 100
                 );
Please login to merge, or discard this patch.
app/Plugin/Strategy/ServiceProvider/StrategyServiceProvider.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,14 +12,14 @@
 block discarded – undo
12 12
     public function register(Container $app)
13 13
     {
14 14
         // サンプルの空Strategyをコンテナに登録
15
-        $app['eccube.calculate.strategy.empty'] = function () {
15
+        $app['eccube.calculate.strategy.empty'] = function() {
16 16
             return new EmptyStrategy();
17 17
         };
18 18
 
19 19
         // 空Strategyを追加.
20 20
         $app->extend(
21 21
             'eccube.calculate.strategies',
22
-            function (CalculateStrategyCollection $Collection, Container $app) {
22
+            function(CalculateStrategyCollection $Collection, Container $app) {
23 23
                 $Collection->add($app['eccube.calculate.strategy.empty']);
24 24
 
25 25
                 return $Collection;
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.