Completed
Pull Request — master (#1504)
by Kentaro
41:35
created
src/Eccube/Controller/Admin/Setting/Shop/PaymentController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
         foreach ($Payments as $Payment) {
168 168
             if ($Payment->getId() != $id) {
169 169
                 $Payment->setRank($rank);
170
-                $rank ++;
170
+                $rank++;
171 171
             }
172 172
         }
173 173
 
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
         );
182 182
         $app['eccube.event.dispatcher']->dispatch(EccubeEvents::ADMIN_SETTING_SHOP_PAYMENT_DELETE_COMPLETE, $event);
183 183
 
184
-        $app->addSuccess('admin.delete.complete', 'admin') ;
184
+        $app->addSuccess('admin.delete.complete', 'admin');
185 185
 
186 186
         return $app->redirect($app->url('admin_setting_shop_payment'));
187 187
     }
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Setting/System/SecurityController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@
 block discarded – undo
102 102
             if (count($allowHost) > 0) {
103 103
                 $form->get('admin_allow_host')->setData(Str::convertLineFeed(implode("\n", $allowHost)));
104 104
             }
105
-            $form->get('force_ssl')->setData((bool)$app['config']['force_ssl']);
105
+            $form->get('force_ssl')->setData((bool) $app['config']['force_ssl']);
106 106
         }
107 107
 
108 108
         return $app->render('Setting/System/security.twig', array(
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Setting/System/SystemController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -66,10 +66,10 @@
 block discarded – undo
66 66
         $server = $app['request'];
67 67
 
68 68
         $arrSystemInfo = array(
69
-            array('title' => 'EC-CUBE',     'value' => Constant::VERSION),
70
-            array('title' => 'サーバーOS',    'value' => php_uname()),
71
-            array('title' => 'DBサーバー',    'value' => $system->getDbversion()),
72
-            array('title' => 'WEBサーバー',   'value' => $server->server->get("SERVER_SOFTWARE")),
69
+            array('title' => 'EC-CUBE', 'value' => Constant::VERSION),
70
+            array('title' => 'サーバーOS', 'value' => php_uname()),
71
+            array('title' => 'DBサーバー', 'value' => $system->getDbversion()),
72
+            array('title' => 'WEBサーバー', 'value' => $server->server->get("SERVER_SOFTWARE")),
73 73
         );
74 74
 
75 75
         $value = phpversion().' ('.implode(', ', get_loaded_extensions()).')';
Please login to merge, or discard this patch.
src/Eccube/Controller/Install/InstallController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -171,7 +171,7 @@
 block discarded – undo
171 171
                 if (count($allowHost) > 0) {
172 172
                     $sessionData['admin_allow_hosts'] = Str::convertLineFeed(implode("\n", $allowHost));
173 173
                 }
174
-                $sessionData['admin_force_ssl'] = (bool)$config['force_ssl'];
174
+                $sessionData['admin_force_ssl'] = (bool) $config['force_ssl'];
175 175
 
176 176
                 // メール設定
177 177
                 $config_file = $this->config_path.'/mail.yml';
Please login to merge, or discard this patch.
src/Eccube/Controller/ShoppingController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1333,7 +1333,7 @@
 block discarded – undo
1333 1333
 
1334 1334
         $errors[] = $app['validator']->validateValue($data['customer_name02'], array(
1335 1335
             new Assert\NotBlank(),
1336
-            new Assert\Length(array('max' => $app['config']['name_len'], )),
1336
+            new Assert\Length(array('max' => $app['config']['name_len'],)),
1337 1337
             new Assert\Regex(array('pattern' => '/^[^\s ]+$/u', 'message' => 'form.type.name.firstname.nothasspace'))
1338 1338
         ));
1339 1339
 
Please login to merge, or discard this patch.
src/Eccube/Plugin/AbstractPluginManager.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,12 +9,12 @@
 block discarded – undo
9 9
 {
10 10
     CONST MIGRATION_TABLE_PREFIX = 'migration_';
11 11
 
12
-    public function migrationSchema($app,$migrationFilePath,$pluginCode,$version = null)
12
+    public function migrationSchema($app, $migrationFilePath, $pluginCode, $version = null)
13 13
     {
14 14
         $config = new Configuration($app['db']);
15 15
         $config->setMigrationsNamespace('DoctrineMigrations');
16 16
         $config->setMigrationsDirectory($migrationFilePath);
17
-        $config->registerMigrationsFromDirectory($migrationFilePath );
17
+        $config->registerMigrationsFromDirectory($migrationFilePath);
18 18
         $config->setMigrationsTableName(self::MIGRATION_TABLE_PREFIX.$pluginCode);
19 19
         $migration = new Migration($config);
20 20
                                   // null 又は 'last' を渡すと最新バージョンまでマイグレートする
Please login to merge, or discard this patch.
src/Eccube/Repository/CustomerRepository.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -147,7 +147,7 @@
 block discarded – undo
147 147
 
148 148
         if (isset($searchData['multi']) && Str::isNotBlank($searchData['multi'])) {
149 149
             //スペース除去
150
-            $clean_key_multi = preg_replace('/\s+|[ ]+/u', '',$searchData['multi']);
150
+            $clean_key_multi = preg_replace('/\s+|[ ]+/u', '', $searchData['multi']);
151 151
             if (preg_match('/^\d+$/', $clean_key_multi)) {
152 152
                 $qb
153 153
                     ->andWhere('c.id = :customer_id')
Please login to merge, or discard this patch.
src/Eccube/Repository/OrderRepository.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -270,7 +270,7 @@
 block discarded – undo
270 270
                 ->setParameter('order_id_start', $searchData['order_id_start']);
271 271
         }
272 272
         // multi
273
-        if (isset( $searchData['multi']) && Str::isNotBlank($searchData['multi'])) {
273
+        if (isset($searchData['multi']) && Str::isNotBlank($searchData['multi'])) {
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 '.
Please login to merge, or discard this patch.
src/Eccube/Service/CsvImportService.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -116,9 +116,9 @@
 block discarded – undo
116 116
 
117 117
         $this->file = $file;
118 118
         $this->file->setFlags(
119
-            \SplFileObject::READ_CSV |
120
-            \SplFileObject::SKIP_EMPTY |
121
-            \SplFileObject::READ_AHEAD |
119
+            \SplFileObject::READ_CSV|
120
+            \SplFileObject::SKIP_EMPTY|
121
+            \SplFileObject::READ_AHEAD|
122 122
             \SplFileObject::DROP_NEW_LINE
123 123
         );
124 124
         $this->file->setCsvControl(
Please login to merge, or discard this patch.