Completed
Pull Request — 3.0.9-dev (#1486)
by chihiro
205:27 queued 169:12
created
src/Eccube/Controller/Admin/Setting/Shop/PaymentController.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -70,10 +70,10 @@  discard block
 block discarded – undo
70 70
                 // ファイルアップロード
71 71
                 $file = $form['payment_image']->getData();
72 72
                 $fs = new Filesystem();
73
-                if ($file && $fs->exists($app['config']['image_temp_realdir'] . '/' . $file)) {
73
+                if ($file && $fs->exists($app['config']['image_temp_realdir'].'/'.$file)) {
74 74
                     $fs->rename(
75
-                        $app['config']['image_temp_realdir'] . '/' . $file,
76
-                        $app['config']['image_save_realdir'] . '/' . $file
75
+                        $app['config']['image_temp_realdir'].'/'.$file,
76
+                        $app['config']['image_save_realdir'].'/'.$file
77 77
                     );
78 78
                 }
79 79
 
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
         if (isset($images['payment_image_file'])) {
101 101
             $image = $images['payment_image_file'];
102 102
             $extension = $image->guessExtension();
103
-            $filename = date('mdHis') . uniqid('_') . '.' . $extension;
103
+            $filename = date('mdHis').uniqid('_').'.'.$extension;
104 104
             $image->move($app['config']['image_temp_realdir'], $filename);
105 105
         }
106 106
 
@@ -127,12 +127,12 @@  discard block
 block discarded – undo
127 127
         foreach ($Payments as $Payment) {
128 128
             if ($Payment->getId() != $id) {
129 129
                 $Payment->setRank($rank);
130
-                $rank ++;
130
+                $rank++;
131 131
             }
132 132
         }
133 133
         $app['orm.em']->flush();
134 134
 
135
-        $app->addSuccess('admin.delete.complete', 'admin') ;
135
+        $app->addSuccess('admin.delete.complete', 'admin');
136 136
 
137 137
         return $app->redirect($app->url('admin_setting_shop_payment'));
138 138
     }
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Setting/System/LogController.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
         $log = array();
63 63
         $message = array();
64 64
 
65
-        foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)) as $line) {
65
+        foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES)) as $line) {
66 66
             // 上限に達した場合、処理を抜ける
67 67
             if (count($log) >= $formData['line_max']) {
68 68
                 break;
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Setting/System/SecurityController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
                 // 現在のセキュリティ情報を更新
53 53
                 $adminRoot = $app['config']['admin_route'];
54 54
 
55
-                $configFile = $app['config']['root_dir'] . '/app/config/eccube/config.yml';
55
+                $configFile = $app['config']['root_dir'].'/app/config/eccube/config.yml';
56 56
                 $config = Yaml::parse(file_get_contents($configFile));
57 57
                 // trim処理
58 58
                 $allowHost = Str::convertLineFeed($data['admin_allow_host']);
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 
83 83
                 if ($adminRoot != $data['admin_route_dir']) {
84 84
                     // admin_routeが変更されればpath.ymlを更新
85
-                    $pathFile = $app['config']['root_dir'] . '/app/config/eccube/path.yml';
85
+                    $pathFile = $app['config']['root_dir'].'/app/config/eccube/path.yml';
86 86
                     $config = Yaml::parse(file_get_contents($pathFile));
87 87
                     $config['admin_route'] = $data['admin_route_dir'];
88 88
 
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
                     $this->getSecurity($app)->setToken(null);
95 95
 
96 96
                     // 管理者画面へ再ログイン
97
-                    return $app->redirect($request->getBaseUrl() . '/' . $config['admin_route']);
97
+                    return $app->redirect($request->getBaseUrl().'/'.$config['admin_route']);
98 98
                 }
99 99
 
100 100
                 $app->addSuccess('admin.sysmte.security.save.complete', 'admin');
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
             if (count($allowHost) > 0) {
108 108
                 $form->get('admin_allow_host')->setData(Str::convertLineFeed(implode("\n", $allowHost)));
109 109
             }
110
-            $form->get('force_ssl')->setData((bool)$app['config']['force_ssl']);
110
+            $form->get('force_ssl')->setData((bool) $app['config']['force_ssl']);
111 111
         }
112 112
 
113 113
         return $app->render('Setting/System/security.twig', array(
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Setting/System/SystemController.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 
50 50
                 return $phpinfo;
51 51
 
52
-               break;
52
+                break;
53 53
             default:
54 54
                 break;
55 55
         }
@@ -61,8 +61,8 @@  discard block
 block discarded – undo
61 61
         ));
62 62
     }
63 63
 
64
-     public function getSystemInfo(Application $app)
65
-     {
64
+        public function getSystemInfo(Application $app)
65
+        {
66 66
         $system = $app['eccube.service.system'];
67 67
         $server = $app['request'];
68 68
 
@@ -78,5 +78,5 @@  discard block
 block discarded – undo
78 78
         $arrSystemInfo[] = array('title' => 'HTTPユーザーエージェント', 'value' => $server->headers->get('User-Agent'));
79 79
 
80 80
         return $arrSystemInfo;
81
-     }
81
+        }
82 82
 }
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -67,13 +67,13 @@
 block discarded – undo
67 67
         $server = $app['request'];
68 68
 
69 69
         $arrSystemInfo = array(
70
-            array('title' => 'EC-CUBE',     'value' => Constant::VERSION),
71
-            array('title' => 'サーバーOS',    'value' => php_uname()),
72
-            array('title' => 'DBサーバー',    'value' => $system->getDbversion()),
73
-            array('title' => 'WEBサーバー',   'value' => $server->server->get("SERVER_SOFTWARE")),
70
+            array('title' => 'EC-CUBE', 'value' => Constant::VERSION),
71
+            array('title' => 'サーバーOS', 'value' => php_uname()),
72
+            array('title' => 'DBサーバー', 'value' => $system->getDbversion()),
73
+            array('title' => 'WEBサーバー', 'value' => $server->server->get("SERVER_SOFTWARE")),
74 74
         );
75 75
 
76
-        $value = phpversion() . ' (' . implode(', ', get_loaded_extensions()) . ')';
76
+        $value = phpversion().' ('.implode(', ', get_loaded_extensions()).')';
77 77
         $arrSystemInfo[] = array('title' => 'PHP', 'value' => $value);
78 78
         $arrSystemInfo[] = array('title' => 'HTTPユーザーエージェント', 'value' => $server->headers->get('User-Agent'));
79 79
 
Please login to merge, or discard this patch.
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/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/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.