Completed
Pull Request — master (#1504)
by Kentaro
60:07 queued 04:12
created
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/Admin/Store/TemplateController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -138,7 +138,7 @@
 block discarded – undo
138 138
 
139 139
         // ダウンロード完了後にファイルを削除する.
140 140
         // http://stackoverflow.com/questions/15238897/removing-file-after-delivering-response-with-silex-symfony
141
-        $app->finish(function (Request $request, Response $response, \Silex\Application $app) use (
141
+        $app->finish(function(Request $request, Response $response, \Silex\Application $app) use (
142 142
             $tmpDir,
143 143
             $tarFile,
144 144
             $tarGzFile
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/Form/Type/Admin/SecurityType.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@
 block discarded – undo
70 70
                 'label' => 'SSLを強制',
71 71
                 'required' => false,
72 72
             ))
73
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) use ($app) {
73
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) use ($app) {
74 74
                 $form = $event->getForm();
75 75
                 $data = $form->getData();
76 76
 
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Install/Step3Type.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -141,7 +141,7 @@
 block discarded – undo
141 141
                 'help' => 'メーラーバックエンドがSMTPかつSMTP-AUTH使用時のみ指定',
142 142
                 'required' => false,
143 143
             ))
144
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) use ($app) {
144
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) use ($app) {
145 145
                 $form = $event->getForm();
146 146
                 $data = $form->getData();
147 147
 
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Install/Step4Type.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -148,7 +148,7 @@
 block discarded – undo
148 148
                 'required' => false,
149 149
                 'value' => 1,
150 150
             ))
151
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) {
151
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) {
152 152
                 $form = $event->getForm();
153 153
                 $data = $form->getData();
154 154
 
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.