Completed
Pull Request — experimental/3.1 (#2566)
by chihiro
155:15 queued 121:52
created
src/Eccube/Doctrine/Filter/NoStockHiddenFilter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
32 32
     public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias)
33 33
     {
34 34
         if ($targetEntity->reflClass->getName() === 'Eccube\Entity\ProductClass') {
35
-            return $targetTableAlias . '.stock >= 1 OR ' . $targetTableAlias . '.stock_unlimited = 1';
35
+            return $targetTableAlias.'.stock >= 1 OR '.$targetTableAlias.'.stock_unlimited = 1';
36 36
         } else {
37 37
             return "";
38 38
         }
Please login to merge, or discard this patch.
src/Eccube/Doctrine/Filter/OrderStatusFilter.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -33,12 +33,12 @@
 block discarded – undo
33 33
     {
34 34
         // 決済処理中/購入処理中を除く.
35 35
         if ($targetEntity->reflClass->getName() === 'Eccube\Entity\Order') {
36
-            return $targetTableAlias . '.status <> 7 AND ' . $targetTableAlias . '.status <> 8';
36
+            return $targetTableAlias.'.status <> 7 AND '.$targetTableAlias.'.status <> 8';
37 37
         }
38 38
 
39 39
         // 決済処理中/購入処理中を除く.
40 40
         if ($targetEntity->reflClass->getName() === 'Eccube\Entity\Master\OrderStatus') {
41
-            return $targetTableAlias . '.id <> 7 AND ' . $targetTableAlias . '.id <> 8';
41
+            return $targetTableAlias.'.id <> 7 AND '.$targetTableAlias.'.id <> 8';
42 42
         }
43 43
 
44 44
         return '';
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/ProductClassType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -148,7 +148,7 @@
 block discarded – undo
148 148
                 'required' => false,
149 149
                 'value' => 1,
150 150
             ))
151
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) {
151
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) {
152 152
                 $form = $event->getForm();
153 153
                 $data = $form->getData();
154 154
 
Please login to merge, or discard this patch.
src/Eccube/Form/Type/NameType.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -62,10 +62,10 @@
 block discarded – undo
62 62
         }
63 63
 
64 64
         if (empty($options['lastname_name'])) {
65
-            $options['lastname_name'] = $builder->getName() . '01';
65
+            $options['lastname_name'] = $builder->getName().'01';
66 66
         }
67 67
         if (empty($options['firstname_name'])) {
68
-            $options['firstname_name'] = $builder->getName() . '02';
68
+            $options['firstname_name'] = $builder->getName().'02';
69 69
         }
70 70
 
71 71
         $builder
Please login to merge, or discard this patch.
src/Eccube/Repository/OrderRepository.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -274,7 +274,7 @@
 block discarded – undo
274 274
             $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null;
275 275
             $qb
276 276
                 ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR ' .
277
-                           'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti')
277
+                            'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti')
278 278
                 ->setParameter('multi', $multi)
279 279
                 ->setParameter('likemulti', '%' . $searchData['multi'] . '%');
280 280
         }
Please login to merge, or discard this 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']) && Str::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']) && Str::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']) && Str::isNotBlank($searchData['multi'])) {
276
+        if (isset($searchData['multi']) && Str::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,28 +316,28 @@  discard block
 block discarded – undo
316 316
         if (isset($searchData['name']) && Str::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']) && Str::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']) && Str::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
337 337
         if (isset($searchData['tel']) && Str::isNotBlank($searchData['tel'])) {
338 338
             $qb
339 339
                 ->andWhere('CONCAT(o.tel01, o.tel02, o.tel03) LIKE :tel')
340
-                ->setParameter('tel', '%' . $searchData['tel'] . '%');
340
+                ->setParameter('tel', '%'.$searchData['tel'].'%');
341 341
         }
342 342
 
343 343
         // sex
@@ -441,7 +441,7 @@  discard block
 block discarded – undo
441 441
             $qb
442 442
                 ->leftJoin('o.OrderItems', 'oi')
443 443
                 ->andWhere('oi.product_name LIKE :buy_product_name')
444
-                ->setParameter('buy_product_name', '%' . $searchData['buy_product_name'] . '%');
444
+                ->setParameter('buy_product_name', '%'.$searchData['buy_product_name'].'%');
445 445
         }
446 446
 
447 447
         // Order By
Please login to merge, or discard this patch.
src/Eccube/Security/Core/Encoder/PasswordEncoder.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
         if ($this->config['auth_type'] == 'PLAIN') {
54 54
             $res = $raw;
55 55
         } else {
56
-            $res = hash_hmac($this->config['password_hash_algos'], $raw . ':' . $this->config['auth_magic'], $salt);
56
+            $res = hash_hmac($this->config['password_hash_algos'], $raw.':'.$this->config['auth_magic'], $salt);
57 57
         }
58 58
 
59 59
         return $res;
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
         } else {
82 82
             // 旧バージョン(2.11未満)からの移行を考慮
83 83
             if (empty($salt)) {
84
-                $hash = sha1($raw . ':' . $this->config['auth_magic']);
84
+                $hash = sha1($raw.':'.$this->config['auth_magic']);
85 85
             } else {
86 86
                 $hash = $this->encodePassword($raw, $salt);
87 87
             }
Please login to merge, or discard this patch.
src/Eccube/Util/Str.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/Admin/AuthorityRoleType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@
 block discarded – undo
59 59
                 'label' => '拒否URL',
60 60
                 'required' => false,
61 61
             ))
62
-            ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
62
+            ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
63 63
                 $form = $event->getForm();
64 64
 
65 65
                 $Authority = $form['Authority']->getData();
Please login to merge, or discard this patch.
src/Eccube/Security/Voter/AuthorityVoter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
 
37 37
     public function __construct(Application $app)
38 38
     {
39
-        $this->app     = $app;
39
+        $this->app = $app;
40 40
     }
41 41
 
42 42
     public function supportsAttribute($attribute)
Please login to merge, or discard this patch.