Failed Conditions
Pull Request — master (#1389)
by chihiro
15:55
created
src/Eccube/Controller/EntryController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -88,7 +88,7 @@
 block discarded – undo
88 88
                             ->setCompanyName($Customer->getCompanyName())
89 89
                             ->setZip01($Customer->getZip01())
90 90
                             ->setZip02($Customer->getZip02())
91
-                            ->setZipcode($Customer->getZip01() . $Customer->getZip02())
91
+                            ->setZipcode($Customer->getZip01().$Customer->getZip02())
92 92
                             ->setPref($Customer->getPref())
93 93
                             ->setAddr01($Customer->getAddr01())
94 94
                             ->setAddr02($Customer->getAddr02())
Please login to merge, or discard this patch.
src/Eccube/Controller/ForgotController.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
                     // リセットキーの発行・有効期限の設定
53 53
                     $Customer
54 54
                         ->setResetKey($app['eccube.repository.customer']->getUniqueResetKey($app))
55
-                        ->setResetExpire(new \DateTime('+' . $app['config']['customer_reset_expire'] .' min'));
55
+                        ->setResetExpire(new \DateTime('+'.$app['config']['customer_reset_expire'].' min'));
56 56
 
57 57
                     // リセットキーを更新
58 58
                     $app['orm.em']->persist($Customer);
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 
67 67
                     // ログ出力
68 68
                     $app['monolog']->addInfo(
69
-                            'send reset password mail to:'  . "{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
69
+                            'send reset password mail to:'."{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
70 70
                         );
71 71
                 }
72 72
 
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 
123 123
             // ログ出力
124 124
             $app['monolog']->addInfo(
125
-                    'reset password complete:' . "{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
125
+                    'reset password complete:'."{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
126 126
                 );
127 127
 
128 128
         } else {
Please login to merge, or discard this patch.
src/Eccube/Controller/Mypage/DeliveryController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@
 block discarded – undo
79 79
 
80 80
         // 遷移が正しくない場合、デフォルトであるマイページの配送先追加の画面を設定する
81 81
         if (!in_array($parentPage, $allowdParents)) {
82
-            $parentPage  = $app->url('mypage_delivery');
82
+            $parentPage = $app->url('mypage_delivery');
83 83
         }
84 84
 
85 85
         /* @var $form \Symfony\Component\Form\FormInterface */
Please login to merge, or discard this patch.
src/Eccube/Controller/Mypage/WithdrawController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@
 block discarded – undo
62 62
                         // 会員削除
63 63
                         $email = $Customer->getEmail();
64 64
                         // メールアドレスにダミーをセット
65
-                        $Customer->setEmail(Str::random(60) . '@dummy.dummy');
65
+                        $Customer->setEmail(Str::random(60).'@dummy.dummy');
66 66
                         $Customer->setDelFlg(Constant::ENABLED);
67 67
 
68 68
                         $app['orm.em']->flush();
Please login to merge, or discard this patch.
src/Eccube/Controller/ShoppingController.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
 
222 222
                 $MailHistory = new MailHistory();
223 223
                 $MailHistory
224
-                    ->setSubject('[' . $app['eccube.repository.base_info']->get()->getShopName() . '] ' . $MailTemplate->getSubject())
224
+                    ->setSubject('['.$app['eccube.repository.base_info']->get()->getShopName().'] '.$MailTemplate->getSubject())
225 225
                     ->setMailBody($body)
226 226
                     ->setMailTemplate($MailTemplate)
227 227
                     ->setSendDate(new \DateTime())
@@ -493,7 +493,7 @@  discard block
 block discarded – undo
493 493
                 ->setFax03($CustomerAddress->getFax03())
494 494
                 ->setZip01($CustomerAddress->getZip01())
495 495
                 ->setZip02($CustomerAddress->getZip02())
496
-                ->setZipCode($CustomerAddress->getZip01() . $CustomerAddress->getZip02())
496
+                ->setZipCode($CustomerAddress->getZip01().$CustomerAddress->getZip02())
497 497
                 ->setPref($CustomerAddress->getPref())
498 498
                 ->setAddr01($CustomerAddress->getAddr01())
499 499
                 ->setAddr02($CustomerAddress->getAddr02());
@@ -619,7 +619,7 @@  discard block
 block discarded – undo
619 619
                         ->setTel03($data['tel03'])
620 620
                         ->setZip01($data['zip01'])
621 621
                         ->setZip02($data['zip02'])
622
-                        ->setZipCode($data['zip01'] . $data['zip02'])
622
+                        ->setZipCode($data['zip01'].$data['zip02'])
623 623
                         ->setPref($data['pref'])
624 624
                         ->setAddr01($data['addr01'])
625 625
                         ->setAddr02($data['addr02'])
@@ -640,7 +640,7 @@  discard block
 block discarded – undo
640 640
                     ->setTel03($data['tel03'])
641 641
                     ->setZip01($data['zip01'])
642 642
                     ->setZip02($data['zip02'])
643
-                    ->setZipCode($data['zip01'] . $data['zip02'])
643
+                    ->setZipCode($data['zip01'].$data['zip02'])
644 644
                     ->setPref($data['pref'])
645 645
                     ->setAddr01($data['addr01'])
646 646
                     ->setAddr02($data['addr02']);
@@ -706,7 +706,7 @@  discard block
 block discarded – undo
706 706
                     ->setTel03($data['customer_tel03'])
707 707
                     ->setZip01($data['customer_zip01'])
708 708
                     ->setZip02($data['customer_zip02'])
709
-                    ->setZipCode($data['customer_zip01'] . $data['customer_zip02'])
709
+                    ->setZipCode($data['customer_zip01'].$data['customer_zip02'])
710 710
                     ->setPref($pref)
711 711
                     ->setAddr01($data['customer_addr01'])
712 712
                     ->setAddr02($data['customer_addr02'])
@@ -812,7 +812,7 @@  discard block
 block discarded – undo
812 812
                     ->setTel03($data['tel03'])
813 813
                     ->setZip01($data['zip01'])
814 814
                     ->setZip02($data['zip02'])
815
-                    ->setZipCode($data['zip01'] . $data['zip02'])
815
+                    ->setZipCode($data['zip01'].$data['zip02'])
816 816
                     ->setPref($data['pref'])
817 817
                     ->setAddr01($data['addr01'])
818 818
                     ->setAddr02($data['addr02']);
@@ -831,7 +831,7 @@  discard block
 block discarded – undo
831 831
                     ->setTel03($data['tel03'])
832 832
                     ->setZip01($data['zip01'])
833 833
                     ->setZip02($data['zip02'])
834
-                    ->setZipCode($data['zip01'] . $data['zip02'])
834
+                    ->setZipCode($data['zip01'].$data['zip02'])
835 835
                     ->setPref($data['pref'])
836 836
                     ->setAddr01($data['addr01'])
837 837
                     ->setAddr02($data['addr02'])
@@ -1055,7 +1055,7 @@  discard block
 block discarded – undo
1055 1055
                                 ->setFax03($CustomerAddress->getFax03())
1056 1056
                                 ->setZip01($CustomerAddress->getZip01())
1057 1057
                                 ->setZip02($CustomerAddress->getZip02())
1058
-                                ->setZipCode($CustomerAddress->getZip01() . $CustomerAddress->getZip02())
1058
+                                ->setZipCode($CustomerAddress->getZip01().$CustomerAddress->getZip02())
1059 1059
                                 ->setPref($CustomerAddress->getPref())
1060 1060
                                 ->setAddr01($CustomerAddress->getAddr01())
1061 1061
                                 ->setAddr02($CustomerAddress->getAddr02())
@@ -1153,7 +1153,7 @@  discard block
 block discarded – undo
1153 1153
                     ->setTel03($data['tel03'])
1154 1154
                     ->setZip01($data['zip01'])
1155 1155
                     ->setZip02($data['zip02'])
1156
-                    ->setZipCode($data['zip01'] . $data['zip02'])
1156
+                    ->setZipCode($data['zip01'].$data['zip02'])
1157 1157
                     ->setPref($data['pref'])
1158 1158
                     ->setAddr01($data['addr01'])
1159 1159
                     ->setAddr02($data['addr02'])
@@ -1202,7 +1202,7 @@  discard block
 block discarded – undo
1202 1202
 
1203 1203
         $errors[] = $app['validator']->validateValue($data['customer_name02'], array(
1204 1204
             new Assert\NotBlank(),
1205
-            new Assert\Length(array('max' => $app['config']['name_len'], )),
1205
+            new Assert\Length(array('max' => $app['config']['name_len'],)),
1206 1206
             new Assert\Regex(array('pattern' => '/^[^\s ]+$/u', 'message' => 'form.type.name.firstname.nothasspace'))
1207 1207
         ));
1208 1208
 
Please login to merge, or discard this patch.
src/Eccube/Controller/UserDataController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@
 block discarded – undo
52 52
         $paths[] = $app['config']['user_data_realdir'];
53 53
         $app['twig.loader']->addLoader(new \Twig_Loader_Filesystem($paths));
54 54
 
55
-        $file = $PageLayout->getFileName() . '.twig';
55
+        $file = $PageLayout->getFileName().'.twig';
56 56
 
57 57
         return $app['twig']->render($file);
58 58
     }
Please login to merge, or discard this patch.
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/Doctrine/Filter/SoftDeleteFilter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
     public function addFilterConstraint(ClassMetadata $targetEntity, $targetTableAlias)
47 47
     {
48 48
         if ($targetEntity->hasField('del_flg') && !in_array($targetEntity->getName(), $this->getExcludes())) {
49
-            return $targetTableAlias . '.del_flg = 0';
49
+            return $targetTableAlias.'.del_flg = 0';
50 50
         } else {
51 51
             return "";
52 52
         }
Please login to merge, or discard this patch.