Failed Conditions
Pull Request — master (#1429)
by Kentaro
43:16
created
src/Eccube/Controller/BlockController.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
         if ($app['eccube.layout']) {
40 40
             foreach ($app['eccube.layout']->getBlocPositions() as $blocPositions) {
41
-                if ($blocPositions->getTargetId() == constant("Eccube\Entity\BlocPosition::" . $position)) {
41
+                if ($blocPositions->getTargetId() == constant("Eccube\Entity\BlocPosition::".$position)) {
42 42
                     $blocks[] = $blocPositions->getBloc();
43 43
                 }
44 44
             }
Please login to merge, or discard this patch.
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/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.
src/Eccube/Form/Type/AddCartType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -113,7 +113,7 @@
 block discarded – undo
113 113
                 }
114 114
             }
115 115
 
116
-            $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($Product) {
116
+            $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($Product) {
117 117
                 $data = $event->getData();
118 118
                 $form = $event->getForm();
119 119
                 if ($Product->getClassName2()) {
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/CsvImportType.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -53,8 +53,8 @@
 block discarded – undo
53 53
                 'constraints' => array(
54 54
                     new Assert\NotBlank(array('message' => 'ファイルを選択してください。')),
55 55
                     new Assert\File(array(
56
-                        'maxSize' => $app['config']['csv_size'] . 'M',
57
-                        'maxSizeMessage' => 'CSVファイルは' . $app['config']['csv_size'] . 'M以下でアップロードしてください。',
56
+                        'maxSize' => $app['config']['csv_size'].'M',
57
+                        'maxSizeMessage' => 'CSVファイルは'.$app['config']['csv_size'].'M以下でアップロードしてください。',
58 58
                     )),
59 59
                 ),
60 60
             ))
Please login to merge, or discard this patch.