Completed
Pull Request — experimental/3.1 (#2669)
by
unknown
34:00 queued 06:13
created
src/Eccube/Util/StringUtil.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
             return $value;
160 160
         }
161 161
 
162
-        return rtrim(mb_substr($value, 0, $length, 'UTF-8')) . $end;
162
+        return rtrim(mb_substr($value, 0, $length, 'UTF-8')).$end;
163 163
     }
164 164
 
165 165
 
@@ -186,18 +186,18 @@  discard block
 block discarded – undo
186 186
         }
187 187
         if ($diff->m == 1 || $diff->days > 0) {
188 188
             if ($diff->days <= 31) {
189
-                return $diff->days . '日前';
189
+                return $diff->days.'日前';
190 190
             }
191 191
             // return $date->format("Y/m/d H:i");
192 192
             return $date->format("Y/m/d");
193 193
         }
194 194
         if ($diff->h > 0) {
195
-            return $diff->h . "時間前";
195
+            return $diff->h."時間前";
196 196
         }
197 197
         if ($diff->i > 0) {
198
-            return $diff->i . "分前";
198
+            return $diff->i."分前";
199 199
         }
200
-        return $diff->s . "秒前";
200
+        return $diff->s."秒前";
201 201
     }
202 202
 
203 203
     /**
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Shopping/OrderType.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
         // 支払い方法のプルダウンを生成
111 111
         $builder->addEventListener(
112 112
             FormEvents::PRE_SET_DATA,
113
-            function (FormEvent $event) {
113
+            function(FormEvent $event) {
114 114
                 /** @var Order $Order */
115 115
                 $Order = $event->getData();
116 116
                 if (is_null($Order) || !$Order->getId()) {
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
         // TODO Calculatorで行うのが適切.
159 159
         $builder->addEventListener(
160 160
             FormEvents::POST_SUBMIT,
161
-            function (FormEvent $event) {
161
+            function(FormEvent $event) {
162 162
                 /** @var Order $Order */
163 163
                 $Order = $event->getData();
164 164
                 // XXX 非会員購入の際, use_point が null で submit される?
Please login to merge, or discard this patch.
src/Eccube/DI/DIServiceProvider.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 {
13 13
     public function register(Container $app)
14 14
     {
15
-        $app['eccube.di'] = function (Container $app) {
15
+        $app['eccube.di'] = function(Container $app) {
16 16
             $di = new DependencyBuilder(
17 17
                 $app['eccube.di.generator.dir'],
18 18
                 $app['eccube.di.generator.class'],
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 
38 38
         // XXX これを入れないと EntityEventDispatcher が有効になった時テストがコケる
39 39
         if (!$app->offsetExists('eccube.event.dispatcher')) {
40
-            $app['eccube.event.dispatcher'] = function () use ($app) {
40
+            $app['eccube.event.dispatcher'] = function() use ($app) {
41 41
                 return $app['dispatcher'];
42 42
             };
43 43
         }
Please login to merge, or discard this patch.
src/Eccube/ServiceProvider/ComposerServiceProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
      */
39 39
     public function register(Container $app)
40 40
     {
41
-        $app['eccube.service.composer'] = function () use ($app) {
41
+        $app['eccube.service.composer'] = function() use ($app) {
42 42
             /**@var \Eccube\Service\SystemService $systemService */
43 43
             $systemService = $app['eccube.service.system'];
44 44
             $composerMemory = $app['config']['composer_memory_limit'];
Please login to merge, or discard this patch.
src/Eccube/Repository/ProductRepository.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
                         NORMALIZE(p.search_word) LIKE NORMALIZE(:%s) OR 
97 97
                         EXISTS (SELECT wpc%d FROM \Eccube\Entity\ProductClass wpc%d WHERE p = wpc%d.Product AND NORMALIZE(wpc%d.code) LIKE NORMALIZE(:%s))', 
98 98
                         $key, $key, $index, $index, $index, $index, $key))
99
-                    ->setParameter($key, '%' . $keyword . '%');
99
+                    ->setParameter($key, '%'.$keyword.'%');
100 100
             }
101 101
         }
102 102
 
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
             $qb
160 160
                 ->andWhere('p.id = :id OR p.name LIKE :likeid OR pc.code LIKE :likeid')
161 161
                 ->setParameter('id', $id)
162
-                ->setParameter('likeid', '%' . $searchData['id'] . '%');
162
+                ->setParameter('likeid', '%'.$searchData['id'].'%');
163 163
         }
164 164
 
165 165
         // code
Please login to merge, or discard this patch.
src/Eccube/Service/Composer/OutputParser.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
         $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output));
40 40
         $installedLogs = array_filter(
41 41
             array_map(
42
-                function ($line) {
42
+                function($line) {
43 43
                     $matches = array();
44 44
                     preg_match('/^  - Installing (.*?) \((.*?)\) .*/', $line, $matches);
45 45
 
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
     public static function parseInfo($output)
63 63
     {
64 64
         $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output));
65
-        $infoLogs = array_filter(array_map(function ($line) {
65
+        $infoLogs = array_filter(array_map(function($line) {
66 66
             $matches = array();
67 67
             preg_match('/^(name|descrip.|keywords|versions|type|license|source|dist|names)\s*:\s*(.*)$/', $line, $matches);
68 68
 
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
     public static function parseConfig($output)
87 87
     {
88 88
         $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output));
89
-        $rowArray = array_filter($rowArray, function ($line) {
89
+        $rowArray = array_filter($rowArray, function($line) {
90 90
             return !preg_match('/^<warning>.*/', $line);
91 91
         });
92 92
 
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
     public static function parseList($output)
103 103
     {
104 104
         $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output));
105
-        $rawConfig = array_map(function ($line) {
105
+        $rawConfig = array_map(function($line) {
106 106
             $matches = array();
107 107
             preg_match('/^\[(.*?)\]\s?(.*)$/', $line, $matches);
108 108
 
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
     public static function parseComposerVersion($output)
160 160
     {
161 161
         $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output));
162
-        $rowArray = array_filter($rowArray, function ($line) {
162
+        $rowArray = array_filter($rowArray, function($line) {
163 163
             return preg_match('/^Composer */', $line);
164 164
         });
165 165
         return array_shift($rowArray);
Please login to merge, or discard this patch.
src/Eccube/Service/Composer/ComposerProcessService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -269,7 +269,7 @@
 block discarded – undo
269 269
     public function composerVersion()
270 270
     {
271 271
         $this->init();
272
-        $command = $this->pathPHP . ' ' . $this->composerFile . ' -V';
272
+        $command = $this->pathPHP.' '.$this->composerFile.' -V';
273 273
         return exec($command);
274 274
     }
275 275
 
Please login to merge, or discard this patch.
src/Eccube/Repository/OrderRepository.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -109,14 +109,14 @@  discard block
 block discarded – undo
109 109
         if (isset($searchData['name']) && StringUtil::isNotBlank($searchData['name'])) {
110 110
             $qb
111 111
                 ->andWhere('CONCAT(o.name01, o.name02) LIKE :name')
112
-                ->setParameter('name', '%' . $searchData['name'] . '%');
112
+                ->setParameter('name', '%'.$searchData['name'].'%');
113 113
         }
114 114
 
115 115
         // kana
116 116
         if (isset($searchData['kana']) && StringUtil::isNotBlank($searchData['kana'])) {
117 117
             $qb
118 118
                 ->andWhere('CONCAT(o.kana01, o.kana02) LIKE :kana')
119
-                ->setParameter('kana', '%' . $searchData['kana'] . '%');
119
+                ->setParameter('kana', '%'.$searchData['kana'].'%');
120 120
         }
121 121
 
122 122
         // email
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
             $qb
248 248
                 ->leftJoin('o.OrderItems', 'oi')
249 249
                 ->andWhere('oi.product_name LIKE :buy_product_name')
250
-                ->setParameter('buy_product_name', '%' . $searchData['buy_product_name'] . '%');
250
+                ->setParameter('buy_product_name', '%'.$searchData['buy_product_name'].'%');
251 251
         }
252 252
 
253 253
         // Order By
@@ -273,13 +273,13 @@  discard block
 block discarded – undo
273 273
                 ->setParameter('order_id_start', $searchData['order_id_start']);
274 274
         }
275 275
         // multi
276
-        if (isset( $searchData['multi']) && StringUtil::isNotBlank($searchData['multi'])) {
276
+        if (isset($searchData['multi']) && StringUtil::isNotBlank($searchData['multi'])) {
277 277
             $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null;
278 278
             $qb
279
-                ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR ' .
279
+                ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR '.
280 280
                            'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti')
281 281
                 ->setParameter('multi', $multi)
282
-                ->setParameter('likemulti', '%' . $searchData['multi'] . '%');
282
+                ->setParameter('likemulti', '%'.$searchData['multi'].'%');
283 283
         }
284 284
 
285 285
         // order_id_end
@@ -316,21 +316,21 @@  discard block
 block discarded – undo
316 316
         if (isset($searchData['name']) && StringUtil::isNotBlank($searchData['name'])) {
317 317
             $qb
318 318
                 ->andWhere('CONCAT(o.name01, o.name02) LIKE :name')
319
-                ->setParameter('name', '%' . $searchData['name'] . '%');
319
+                ->setParameter('name', '%'.$searchData['name'].'%');
320 320
         }
321 321
 
322 322
         // kana
323 323
         if (isset($searchData['kana']) && StringUtil::isNotBlank($searchData['kana'])) {
324 324
             $qb
325 325
                 ->andWhere('CONCAT(o.kana01, o.kana02) LIKE :kana')
326
-                ->setParameter('kana', '%' . $searchData['kana'] . '%');
326
+                ->setParameter('kana', '%'.$searchData['kana'].'%');
327 327
         }
328 328
 
329 329
         // email
330 330
         if (isset($searchData['email']) && StringUtil::isNotBlank($searchData['email'])) {
331 331
             $qb
332 332
                 ->andWhere('o.email like :email')
333
-                ->setParameter('email', '%' . $searchData['email'] . '%');
333
+                ->setParameter('email', '%'.$searchData['email'].'%');
334 334
         }
335 335
 
336 336
         // tel
@@ -338,7 +338,7 @@  discard block
 block discarded – undo
338 338
             $tel = preg_replace('/[^0-9]/ ', '', $searchData['tel']);
339 339
             $qb
340 340
                 ->andWhere('CONCAT(o.tel01, o.tel02, o.tel03) LIKE :tel')
341
-                ->setParameter('tel', '%' . $tel . '%');
341
+                ->setParameter('tel', '%'.$tel.'%');
342 342
         }
343 343
 
344 344
         // sex
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
442 442
             $qb
443 443
                 ->leftJoin('o.OrderItems', 'oi')
444 444
                 ->andWhere('oi.product_name LIKE :buy_product_name')
445
-                ->setParameter('buy_product_name', '%' . $searchData['buy_product_name'] . '%');
445
+                ->setParameter('buy_product_name', '%'.$searchData['buy_product_name'].'%');
446 446
         }
447 447
 
448 448
         // Order By
Please login to merge, or discard this patch.
src/Eccube/Repository/ShippingRepository.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -55,13 +55,13 @@  discard block
 block discarded – undo
55 55
                 ->setParameter('shipping_id_start', $searchData['shipping_id_start']);
56 56
         }
57 57
         // multi
58
-        if (isset( $searchData['multi']) && StringUtil::isNotBlank($searchData['multi'])) {
58
+        if (isset($searchData['multi']) && StringUtil::isNotBlank($searchData['multi'])) {
59 59
             $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null;
60 60
             $qb
61
-                ->andWhere('s.id = :multi OR s.name01 LIKE :likemulti OR s.name02 LIKE :likemulti OR ' .
61
+                ->andWhere('s.id = :multi OR s.name01 LIKE :likemulti OR s.name02 LIKE :likemulti OR '.
62 62
                            's.kana01 LIKE :likemulti OR s.kana02 LIKE :likemulti OR s.company_name LIKE :likemulti')
63 63
                 ->setParameter('multi', $multi)
64
-                ->setParameter('likemulti', '%' . $searchData['multi'] . '%');
64
+                ->setParameter('likemulti', '%'.$searchData['multi'].'%');
65 65
         }
66 66
 
67 67
         // shipping_id_end
@@ -95,35 +95,35 @@  discard block
 block discarded – undo
95 95
         if (isset($searchData['name']) && StringUtil::isNotBlank($searchData['name'])) {
96 96
             $qb
97 97
                 ->andWhere('CONCAT(s.name01, s.name02) LIKE :name')
98
-                ->setParameter('name', '%' . $searchData['name'] . '%');
98
+                ->setParameter('name', '%'.$searchData['name'].'%');
99 99
         }
100 100
 
101 101
         // kana
102 102
         if (isset($searchData['kana']) && StringUtil::isNotBlank($searchData['kana'])) {
103 103
             $qb
104 104
                 ->andWhere('CONCAT(s.kana01, s.kana02) LIKE :kana')
105
-                ->setParameter('kana', '%' . $searchData['kana'] . '%');
105
+                ->setParameter('kana', '%'.$searchData['kana'].'%');
106 106
         }
107 107
 
108 108
         // order_name
109 109
         if (isset($searchData['order_name']) && StringUtil::isNotBlank($searchData['order_name'])) {
110 110
             $qb
111 111
                 ->andWhere('CONCAT(o.name01, o.name02) LIKE :order_name')
112
-                ->setParameter('order_name', '%' . $searchData['order_name'] . '%');
112
+                ->setParameter('order_name', '%'.$searchData['order_name'].'%');
113 113
         }
114 114
 
115 115
         // order_kana
116 116
         if (isset($searchData['order_kana']) && StringUtil::isNotBlank($searchData['order_kana'])) {
117 117
             $qb
118 118
                 ->andWhere('CONCAT(o.kana01, s.kana02) LIKE :order_kana')
119
-                ->setParameter('kana', '%' . $searchData['order_kana'] . '%');
119
+                ->setParameter('kana', '%'.$searchData['order_kana'].'%');
120 120
         }
121 121
 
122 122
         // order_email
123 123
         if (isset($searchData['email']) && StringUtil::isNotBlank($searchData['email'])) {
124 124
             $qb
125 125
                 ->andWhere('o.email like :email')
126
-                ->setParameter('email', '%' . $searchData['email'] . '%');
126
+                ->setParameter('email', '%'.$searchData['email'].'%');
127 127
         }
128 128
 
129 129
         // tel
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
             $tel = preg_replace('/[^0-9]/ ', '', $searchData['tel']);
132 132
             $qb
133 133
                 ->andWhere('CONCAT(s.tel01, s.tel02, s.tel03) LIKE :tel')
134
-                ->setParameter('tel', '%' . $tel . '%');
134
+                ->setParameter('tel', '%'.$tel.'%');
135 135
         }
136 136
 
137 137
         // payment
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
         if (isset($searchData['buy_product_name']) && StringUtil::isNotBlank($searchData['buy_product_name'])) {
228 228
             $qb
229 229
                 ->andWhere('si.product_name LIKE :buy_product_name')
230
-                ->setParameter('buy_product_name', '%' . $searchData['buy_product_name'] . '%');
230
+                ->setParameter('buy_product_name', '%'.$searchData['buy_product_name'].'%');
231 231
         }
232 232
 
233 233
         // Order By
Please login to merge, or discard this patch.