Failed Conditions
Pull Request — master (#1340)
by Tsuyoshi
15:55
created
src/Eccube/Controller/AbstractController.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -52,11 +52,17 @@
 block discarded – undo
52 52
         return $form;
53 53
     }
54 54
 
55
+    /**
56
+     * @param Application $app
57
+     */
55 58
     protected function getSecurity($app)
56 59
     {
57 60
         return $app['security.token_storage'];
58 61
     }
59 62
 
63
+    /**
64
+     * @param Application $app
65
+     */
60 66
     protected function isTokenValid($app)
61 67
     {
62 68
         $csrf = $app['form.csrf_provider'];
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
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
                 // リセットキーの発行・有効期限の設定
48 48
                 $Customer
49 49
                     ->setResetKey($app['eccube.repository.customer']->getUniqueResetKey($app))
50
-                    ->setResetExpire(new \DateTime('+' . $app['config']['customer_reset_expire'] .' min'));
50
+                    ->setResetExpire(new \DateTime('+'.$app['config']['customer_reset_expire'].' min'));
51 51
 
52 52
                 // リセットキーを更新
53 53
                 $app['orm.em']->persist($Customer);
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 
62 62
                 // ログ出力
63 63
                 $app['monolog']->addInfo(
64
-                    'send reset password mail to:'  . "{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
64
+                    'send reset password mail to:'."{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
65 65
                 );
66 66
             }
67 67
 
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 
116 116
             // ログ出力
117 117
             $app['monolog']->addInfo(
118
-                'reset password complete:' . "{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
118
+                'reset password complete:'."{$Customer->getId()} {$Customer->getEmail()} {$request->getClientIp()}"
119 119
             );
120 120
         } else {
121 121
             throw new HttpException\AccessDeniedHttpException('不正なアクセスです。');
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
@@ -60,7 +60,7 @@
 block discarded – undo
60 60
                     // 会員削除
61 61
                     $email = $Customer->getEmail();
62 62
                     // メールアドレスにダミーをセット
63
-                    $Customer->setEmail(Str::random(60) . '@dummy.dummy');
63
+                    $Customer->setEmail(Str::random(60).'@dummy.dummy');
64 64
                     $Customer->setDelFlg(Constant::ENABLED);
65 65
 
66 66
                     $app['orm.em']->flush();
Please login to merge, or discard this patch.
src/Eccube/Controller/ShoppingController.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -578,7 +578,7 @@
 block discarded – undo
578 578
             $app['eccube.service.shopping']->setShippingDeliveryFee($Shipping);
579 579
 
580 580
             // 配送先を更新 
581
-           $app['orm.em']->flush();
581
+            $app['orm.em']->flush();
582 582
 
583 583
             return $app->redirect($app->url('shopping'));
584 584
         }
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
 
223 223
             $MailHistory = new MailHistory();
224 224
             $MailHistory
225
-                ->setSubject('[' . $app['eccube.repository.base_info']->get()->getShopName() . '] ' . $MailTemplate->getSubject())
225
+                ->setSubject('['.$app['eccube.repository.base_info']->get()->getShopName().'] '.$MailTemplate->getSubject())
226 226
                 ->setMailBody($body)
227 227
                 ->setMailTemplate($MailTemplate)
228 228
                 ->setSendDate(new \DateTime())
@@ -630,7 +630,7 @@  discard block
 block discarded – undo
630 630
                     ->setTel03($data['customer_tel03'])
631 631
                     ->setZip01($data['customer_zip01'])
632 632
                     ->setZip02($data['customer_zip02'])
633
-                    ->setZipCode($data['customer_zip01'] . $data['customer_zip02'])
633
+                    ->setZipCode($data['customer_zip01'].$data['customer_zip02'])
634 634
                     ->setPref($pref)
635 635
                     ->setAddr01($data['customer_addr01'])
636 636
                     ->setAddr02($data['customer_addr02'])
@@ -1030,7 +1030,7 @@  discard block
 block discarded – undo
1030 1030
 
1031 1031
         $errors[] = $app['validator']->validateValue($data['customer_name02'], array(
1032 1032
             new Assert\NotBlank(),
1033
-            new Assert\Length(array('max' => $app['config']['name_len'], )),
1033
+            new Assert\Length(array('max' => $app['config']['name_len'],)),
1034 1034
             new Assert\Regex(array('pattern' => '/^[^\s ]+$/u', 'message' => 'form.type.name.firstname.nothasspace'))
1035 1035
         ));
1036 1036
 
Please login to merge, or discard this patch.