Completed
Pull Request — experimental/3.1 (#2483)
by Kentaro
44:50
created
src/Eccube/Controller/AbstractController.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -59,11 +59,17 @@
 block discarded – undo
59 59
      */
60 60
     protected $formFactory;
61 61
 
62
+    /**
63
+     * @param \Eccube\Application $app
64
+     */
62 65
     protected function getSecurity($app)
63 66
     {
64 67
         return $this->tokenStorage;
65 68
     }
66 69
 
70
+    /**
71
+     * @param \Eccube\Application $app
72
+     */
67 73
     protected function isTokenValid($app)
68 74
     {
69 75
         $csrf = $this->csrfTokenManager;
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Content/BlockController.php 2 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,6 @@
 block discarded – undo
41 41
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
42 42
 use Symfony\Component\EventDispatcher\EventDispatcher;
43 43
 use Symfony\Component\Filesystem\Filesystem;
44
-use Symfony\Component\Finder\Finder;
45 44
 use Symfony\Component\Form\FormFactory;
46 45
 use Symfony\Component\HttpFoundation\Request;
47 46
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
                 // ファイル生成・更新
175 175
                 $tplDir = $this->appConfig['block_realdir'];
176 176
 
177
-                $filePath = $tplDir . '/' . $Block->getFileName() . '.twig';
177
+                $filePath = $tplDir.'/'.$Block->getFileName().'.twig';
178 178
 
179 179
                 $fs = new Filesystem();
180 180
                 $blockData = $form->get('block_html')->getData();
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
                 $fs->dumpFile($filePath, $blockData);
183 183
                 // 更新でファイル名を変更した場合、以前のファイルを削除
184 184
                 if ($Block->getFileName() != $previous_filename && !is_null($previous_filename)) {
185
-                    $oldFilePath = $tplDir . '/' . $previous_filename . '.twig';
185
+                    $oldFilePath = $tplDir.'/'.$previous_filename.'.twig';
186 186
                     if ($fs->exists($oldFilePath)) {
187 187
                         $fs->remove($oldFilePath);
188 188
                     }
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
         // テンプレートが変更されていた場合、DBからはブロック削除されるがtwigファイルは残る
240 240
         if ($Block->getDeletableFlg() > 0) {
241 241
             $tplDir = $this->appConfig['block_realdir'];
242
-            $file = $tplDir . '/' . $Block->getFileName() . '.twig';
242
+            $file = $tplDir.'/'.$Block->getFileName().'.twig';
243 243
             $fs = new Filesystem();
244 244
             if ($fs->exists($file)) {
245 245
                 $fs->remove($file);
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Content/FileController.php 2 patches
Doc Comments   +11 added lines patch added patch discarded remove patch
@@ -270,6 +270,10 @@  discard block
 block discarded – undo
270 270
         return $str;
271 271
     }
272 272
 
273
+    /**
274
+     * @param string $topDir
275
+     * @param Request $request
276
+     */
273 277
     private function getTree($topDir, $request)
274 278
     {
275 279
         $finder = Finder::create()->in($topDir)
@@ -307,6 +311,10 @@  discard block
 block discarded – undo
307 311
         return $tree;
308 312
     }
309 313
 
314
+    /**
315
+     * @param Application $app
316
+     * @param string $nowDir
317
+     */
310 318
     private function getFileList($app, $nowDir)
311 319
     {
312 320
         $topDir = $this->appConfig['user_data_realdir'];
@@ -366,6 +374,9 @@  discard block
 block discarded – undo
366 374
         return (strpos($targetDir, $topDir) === 0);
367 375
     }
368 376
 
377
+    /**
378
+     * @return string
379
+     */
369 380
     private function convertStrFromServer($target)
370 381
     {
371 382
         if ($this->encode == self::SJIS) {
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
     private $error = null;
65 65
     private $encode = '';
66 66
 
67
-    public function __construct(){
67
+    public function __construct() {
68 68
         $this->encode = self::UTF;
69 69
         if ('\\' === DIRECTORY_SEPARATOR) {
70 70
             $this->encode = self::SJIS;
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
         $arrFileList = $this->getFileList($app, $nowDir);
114 114
 
115 115
         $javascript = $this->getJsArrayList($tree);
116
-        $onload = "eccube.fileManager.viewFileTree('tree', arrTree, '" . $nowDir . "', 'tree_select_file', 'tree_status', 'move');";
116
+        $onload = "eccube.fileManager.viewFileTree('tree', arrTree, '".$nowDir."', 'tree_select_file', 'tree_status', 'move');";
117 117
 
118 118
         return [
119 119
             'form' => $form->createView(),
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
                 $nowDir = $this->checkDir($request->get('now_dir'), $topDir)
175 175
                     ? $this->normalizePath($request->get('now_dir'))
176 176
                     : $topDir;
177
-                $fs->mkdir($nowDir . '/' . $filename);
177
+                $fs->mkdir($nowDir.'/'.$filename);
178 178
             }
179 179
         }
180 180
     }
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
     {
260 260
         $str = "arrTree = new Array();\n";
261 261
         foreach ($tree as $key => $val) {
262
-            $str .= 'arrTree[' . $key . "] = new Array(" . $key . ", '" . $val['type'] . "', '" . $val['path'] . "', " . $val['rank'] . ',';
262
+            $str .= 'arrTree['.$key."] = new Array(".$key.", '".$val['type']."', '".$val['path']."', ".$val['rank'].',';
263 263
             if ($val['open']) {
264 264
                 $str .= "true);\n";
265 265
             } else {
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
     private function getFileList($app, $nowDir)
311 311
     {
312 312
         $topDir = $this->appConfig['user_data_realdir'];
313
-        $filter = function (\SplFileInfo $file) use ($topDir) {
313
+        $filter = function(\SplFileInfo $file) use ($topDir) {
314 314
             $acceptPath = realpath($topDir);
315 315
             $targetPath = $file->getRealPath();
316 316
             return (strpos($targetPath, $acceptPath) === 0);
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Setting/System/MemberController.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -34,7 +34,6 @@
 block discarded – undo
34 34
 use Eccube\Form\Type\Admin\MemberType;
35 35
 use Eccube\Repository\MemberRepository;
36 36
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
37
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
38 37
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
39 38
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
40 39
 use Symfony\Component\EventDispatcher\EventDispatcher;
Please login to merge, or discard this patch.
src/Eccube/Controller/Admin/Store/PluginController.php 2 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,6 @@
 block discarded – undo
50 50
 use Symfony\Component\Form\Extension\Core\Type\TextType;
51 51
 use Symfony\Component\Form\FormFactory;
52 52
 use Symfony\Component\HttpFoundation\Request;
53
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
54 53
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
55 54
 use Symfony\Component\Validator\Constraints as Assert;
56 55
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -690,7 +690,7 @@
 block discarded – undo
690 690
             [
691 691
                 'label' => '認証キー',
692 692
                 'constraints' => [
693
-                    new Assert\Regex(['pattern' => "/^[0-9a-zA-Z]+$/",]),
693
+                    new Assert\Regex(['pattern' => "/^[0-9a-zA-Z]+$/", ]),
694 694
                 ],
695 695
             ]
696 696
         );
Please login to merge, or discard this patch.
src/Eccube/Controller/Install/InstallController.php 2 patches
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -292,6 +292,10 @@
 block discarded – undo
292 292
         ob_flush();
293 293
         flush();
294 294
     }
295
+
296
+    /**
297
+     * @param InstallApplication $app
298
+     */
295 299
     private function checkModules($app)
296 300
     {
297 301
         foreach ($this->required_modules as $module) {
Please login to merge, or discard this patch.
Spacing   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -53,9 +53,9 @@  discard block
 block discarded – undo
53 53
     const SESSION_KEY = 'eccube.session.install';
54 54
     public function __construct()
55 55
     {
56
-        $this->config_path = __DIR__ . '/../../../../app/config/eccube';
57
-        $this->dist_path = __DIR__ . '/../../Resource/config';
58
-        $this->cache_path = __DIR__ . '/../../../../app/cache';
56
+        $this->config_path = __DIR__.'/../../../../app/config/eccube';
57
+        $this->dist_path = __DIR__.'/../../Resource/config';
58
+        $this->cache_path = __DIR__.'/../../../../app/cache';
59 59
     }
60 60
     private function isValid(Request $request, Form $form)
61 61
     {
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
         $this->checkModules($app);
96 96
         return $app['twig']->render('step1.twig', array(
97 97
             'form' => $form->createView(),
98
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
98
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
99 99
         ));
100 100
     }
101 101
     // 権限チェック
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
         }
115 115
         return $app['twig']->render('step2.twig', array(
116 116
             'protectedDirs' => $protectedDirs,
117
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
117
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
118 118
         ));
119 119
     }
120 120
     //    サイトの設定
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
             ->getForm();
126 126
         $sessionData = $this->getSessionData($request);
127 127
         if (empty($sessionData['shop_name'])) {
128
-            $config_file = $this->config_path . '/config.yml';
128
+            $config_file = $this->config_path.'/config.yml';
129 129
             $fs = new Filesystem();
130 130
             if ($fs->exists($config_file)) {
131 131
                 // すでに登録されていた場合、登録データを表示
@@ -136,10 +136,10 @@  discard block
 block discarded – undo
136 136
                     $sessionData['email'] = $row['email01'];
137 137
                 }
138 138
                 // セキュリティの設定
139
-                $config_file = $this->config_path . '/path.yml';
139
+                $config_file = $this->config_path.'/path.yml';
140 140
                 $config = Yaml::parse(file_get_contents($config_file));
141 141
                 $sessionData['admin_dir'] = $config['admin_route'];
142
-                $config_file = $this->config_path . '/config.yml';
142
+                $config_file = $this->config_path.'/config.yml';
143 143
                 $config = Yaml::parse(file_get_contents($config_file));
144 144
                 $allowHost = $config['admin_allow_host'];
145 145
                 if (count($allowHost) > 0) {
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
                 $sessionData['admin_force_ssl'] = (bool) $config['force_ssl'];
149 149
                 // ロードバランサー、プロキシサーバ設定
150 150
                 if (isset($config['trusted_proxies_connection_only'])) {
151
-                    $sessionData['trusted_proxies_connection_only'] = (bool)$config['trusted_proxies_connection_only'];
151
+                    $sessionData['trusted_proxies_connection_only'] = (bool) $config['trusted_proxies_connection_only'];
152 152
                 }
153 153
                 if (isset($config['trusted_proxies'])) {
154 154
                     $trustedProxies = $config['trusted_proxies'];
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
                     }
158 158
                 }
159 159
                 // メール設定
160
-                $config_file = $this->config_path . '/mail.yml';
160
+                $config_file = $this->config_path.'/mail.yml';
161 161
                 $config = Yaml::parse(file_get_contents($config_file));
162 162
                 $mail = $config['mail'];
163 163
                 $sessionData['mail_backend'] = $mail['transport'];
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
         }
178 178
         return $app['twig']->render('step3.twig', array(
179 179
             'form' => $form->createView(),
180
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
180
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
181 181
         ));
182 182
     }
183 183
     //    データベースの設定
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
             ->getForm();
189 189
         $sessionData = $this->getSessionData($request);
190 190
         if (empty($sessionData['database'])) {
191
-            $config_file = $this->config_path . '/database.yml';
191
+            $config_file = $this->config_path.'/database.yml';
192 192
             $fs = new Filesystem();
193 193
             if ($fs->exists($config_file)) {
194 194
                 // すでに登録されていた場合、登録データを表示
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
         }
212 212
         return $app['twig']->render('step4.twig', array(
213 213
             'form' => $form->createView(),
214
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
214
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
215 215
         ));
216 216
     }
217 217
     //    データベースの初期化
@@ -250,7 +250,7 @@  discard block
 block discarded – undo
250 250
                 $host = $request->getSchemeAndHttpHost();
251 251
                 $basePath = $request->getBasePath();
252 252
                 $params = array(
253
-                    'http_url' => $host . $basePath,
253
+                    'http_url' => $host.$basePath,
254 254
                     'shop_name' => $sessionData['shop_name'],
255 255
                 );
256 256
                 $this->sendAppData($params);
@@ -261,15 +261,15 @@  discard block
 block discarded – undo
261 261
         }
262 262
         return $app['twig']->render('step5.twig', array(
263 263
             'form' => $form->createView(),
264
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
264
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
265 265
         ));
266 266
     }
267 267
     //    インストール完了
268 268
     public function complete(InstallApplication $app, Request $request)
269 269
     {
270
-        $config_yml = $this->config_path . '/config.yml';
270
+        $config_yml = $this->config_path.'/config.yml';
271 271
         $config = Yaml::parse(file_get_contents($config_yml));
272
-        $config_path = $this->config_path . '/path.yml';
272
+        $config_path = $this->config_path.'/path.yml';
273 273
         $path_yml = Yaml::parse(file_get_contents($config_path));
274 274
         $config = array_replace_recursive($path_yml, $config);
275 275
         if (isset($config['trusted_proxies_connection_only']) && !empty($config['trusted_proxies_connection_only'])) {
@@ -279,10 +279,10 @@  discard block
 block discarded – undo
279 279
         }
280 280
         $host = $request->getSchemeAndHttpHost();
281 281
         $basePath = $request->getBasePath();
282
-        $adminUrl = $host . $basePath . '/' . $config['admin_dir'];
282
+        $adminUrl = $host.$basePath.'/'.$config['admin_dir'];
283 283
         return $app['twig']->render('complete.twig', array(
284 284
             'admin_url' => $adminUrl,
285
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
285
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
286 286
         ));
287 287
     }
288 288
     private function resetNatTimer()
@@ -296,11 +296,11 @@  discard block
 block discarded – undo
296 296
     {
297 297
         foreach ($this->required_modules as $module) {
298 298
             if (!extension_loaded($module)) {
299
-                $app->addDanger('[必須] ' . $module . ' 拡張モジュールが有効になっていません。', 'install');
299
+                $app->addDanger('[必須] '.$module.' 拡張モジュールが有効になっていません。', 'install');
300 300
             }
301 301
         }
302 302
         if (!extension_loaded('pdo_mysql') && !extension_loaded('pdo_pgsql')) {
303
-            $app->addDanger('[必須] ' . 'pdo_pgsql又はpdo_mysql 拡張モジュールを有効にしてください。', 'install');
303
+            $app->addDanger('[必須] '.'pdo_pgsql又はpdo_mysql 拡張モジュールを有効にしてください。', 'install');
304 304
         }
305 305
         foreach ($this->recommended_module as $module) {
306 306
             if (!extension_loaded($module)) {
@@ -325,7 +325,7 @@  discard block
 block discarded – undo
325 325
             if (!function_exists('apache_get_modules')) {
326 326
                 $app->addWarning('mod_rewrite が有効になっているか不明です。', 'install');
327 327
             } elseif (!in_array('mod_rewrite', apache_get_modules())) {
328
-                $app->addDanger('[必須] ' . 'mod_rewriteを有効にしてください。', 'install');
328
+                $app->addDanger('[必須] '.'mod_rewriteを有効にしてください。', 'install');
329 329
             }
330 330
         } elseif (isset($_SERVER['SERVER_SOFTWARE']) && strpos('Microsoft-IIS', $_SERVER['SERVER_SOFTWARE']) !== false) {
331 331
             // iis
@@ -335,7 +335,7 @@  discard block
 block discarded – undo
335 335
     }
336 336
     private function setPDO()
337 337
     {
338
-        $config_file = $this->config_path . '/database.yml';
338
+        $config_file = $this->config_path.'/database.yml';
339 339
         $config = Yaml::parse(file_get_contents($config_file));
340 340
         try {
341 341
             $this->PDO = \Doctrine\DBAL\DriverManager::getConnection($config['database'], new \Doctrine\DBAL\Configuration());
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
362 362
     private function getEntityManager()
363 363
     {
364 364
         if (!isset($this->app['orm.em'])) {
365
-            $config_file = $this->config_path . '/database.yml';
365
+            $config_file = $this->config_path.'/database.yml';
366 366
             $database = Yaml::parse(file_get_contents($config_file));
367 367
             $this->app->register(new \Silex\Provider\DoctrineServiceProvider(), array(
368 368
                 'db.options' => $database['database']
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
372 372
                     'type' => 'annotation',
373 373
                     'namespace' => 'Eccube\Entity',
374 374
                     'path' => array(
375
-                        __DIR__ . '/../../Entity',
375
+                        __DIR__.'/../../Entity',
376 376
                     ),
377 377
                     'use_simple_annotation_reader' => false,
378 378
                 ),
@@ -404,7 +404,7 @@  discard block
 block discarded – undo
404 404
                 }
405 405
             }
406 406
             $this->app->register(new \Dflydev\Provider\DoctrineOrm\DoctrineOrmServiceProvider(), array(
407
-                'orm.proxies_dir' => __DIR__ . '/../../app/cache/doctrine',
407
+                'orm.proxies_dir' => __DIR__.'/../../app/cache/doctrine',
408 408
                 'orm.em.options' => array(
409 409
                     'mappings' => $ormMappings
410 410
                 )
@@ -433,10 +433,10 @@  discard block
 block discarded – undo
433 433
     private function insert()
434 434
     {
435 435
         $this->resetNatTimer();
436
-        $config_file = $this->config_path . '/database.yml';
436
+        $config_file = $this->config_path.'/database.yml';
437 437
         $database = Yaml::parse(file_get_contents($config_file));
438 438
         $config['database'] = $database['database'];
439
-        $config_file = $this->config_path . '/config.yml';
439
+        $config_file = $this->config_path.'/config.yml';
440 440
         $baseConfig = Yaml::parse(file_get_contents($config_file));
441 441
         $config['config'] = $baseConfig;
442 442
         $this->PDO->beginTransaction();
@@ -485,10 +485,10 @@  discard block
 block discarded – undo
485 485
     private function update()
486 486
     {
487 487
         $this->resetNatTimer();
488
-        $config_file = $this->config_path . '/database.yml';
488
+        $config_file = $this->config_path.'/database.yml';
489 489
         $database = Yaml::parse(file_get_contents($config_file));
490 490
         $config['database'] = $database['database'];
491
-        $config_file = $this->config_path . '/config.yml';
491
+        $config_file = $this->config_path.'/config.yml';
492 492
         $baseConfig = Yaml::parse(file_get_contents($config_file));
493 493
         $config['config'] = $baseConfig;
494 494
         $this->PDO->beginTransaction();
@@ -539,7 +539,7 @@  discard block
 block discarded – undo
539 539
         $app->boot();
540 540
         $config = new Configuration($app['db']);
541 541
         $config->setMigrationsNamespace('DoctrineMigrations');
542
-        $migrationDir = __DIR__ . '/../../Resource/doctrine/migration';
542
+        $migrationDir = __DIR__.'/../../Resource/doctrine/migration';
543 543
         $config->setMigrationsDirectory($migrationDir);
544 544
         $config->registerMigrationsFromDirectory($migrationDir);
545 545
         $migration = new Migration($config);
@@ -565,7 +565,7 @@  discard block
 block discarded – undo
565 565
     private function getProtectedDirs()
566 566
     {
567 567
         $protectedDirs = array();
568
-        $base = __DIR__ . '/../../../..';
568
+        $base = __DIR__.'/../../../..';
569 569
         $dirs = array(
570 570
             '/html',
571 571
             '/app',
@@ -577,7 +577,7 @@  discard block
 block discarded – undo
577 577
             '/app/Plugin',
578 578
         );
579 579
         foreach ($dirs as $dir) {
580
-            if (!is_writable($base . $dir)) {
580
+            if (!is_writable($base.$dir)) {
581 581
                 $protectedDirs[] = $dir;
582 582
             }
583 583
         }
@@ -586,7 +586,7 @@  discard block
 block discarded – undo
586 586
     private function createConfigYamlFile($data, $auth = true)
587 587
     {
588 588
         $fs = new Filesystem();
589
-        $config_file = $this->config_path . '/config.yml';
589
+        $config_file = $this->config_path.'/config.yml';
590 590
         if ($fs->exists($config_file)) {
591 591
             $config = Yaml::parse(file_get_contents($config_file));
592 592
             $fs->remove($config_file);
@@ -622,7 +622,7 @@  discard block
 block discarded – undo
622 622
         $replace = array($auth_magic, $data['shop_name'], '0', $data['admin_force_ssl']);
623 623
         $fs = new Filesystem();
624 624
         $content = str_replace(
625
-            $target, $replace, file_get_contents($this->dist_path . '/config.yml.dist')
625
+            $target, $replace, file_get_contents($this->dist_path.'/config.yml.dist')
626 626
         );
627 627
         $fs->dumpFile($config_file, $content);
628 628
         $config = Yaml::parse(file_get_contents($config_file));
@@ -635,7 +635,7 @@  discard block
 block discarded – undo
635 635
     }
636 636
     private function addInstallStatus()
637 637
     {
638
-        $config_file = $this->config_path . '/config.yml';
638
+        $config_file = $this->config_path.'/config.yml';
639 639
         $config = Yaml::parse(file_get_contents($config_file));
640 640
         $config['eccube_install'] = 1;
641 641
         $yml = Yaml::dump($config);
@@ -645,7 +645,7 @@  discard block
 block discarded – undo
645 645
     private function createDatabaseYamlFile($data)
646 646
     {
647 647
         $fs = new Filesystem();
648
-        $config_file = $this->config_path . '/database.yml';
648
+        $config_file = $this->config_path.'/database.yml';
649 649
         if ($fs->exists($config_file)) {
650 650
             $fs->remove($config_file);
651 651
         }
@@ -676,14 +676,14 @@  discard block
 block discarded – undo
676 676
             );
677 677
             $fs = new Filesystem();
678 678
             $content = str_replace(
679
-                $target, $replace, file_get_contents($this->dist_path . '/database.yml.dist')
679
+                $target, $replace, file_get_contents($this->dist_path.'/database.yml.dist')
680 680
             );
681 681
         } else {
682 682
             $content = Yaml::dump(
683 683
                 array(
684 684
                     'database' => array(
685 685
                         'driver' => 'pdo_sqlite',
686
-                        'path' => realpath($this->config_path . '/eccube.db')
686
+                        'path' => realpath($this->config_path.'/eccube.db')
687 687
                     )
688 688
                 )
689 689
             );
@@ -694,7 +694,7 @@  discard block
 block discarded – undo
694 694
     private function createMailYamlFile($data)
695 695
     {
696 696
         $fs = new Filesystem();
697
-        $config_file = $this->config_path . '/mail.yml';
697
+        $config_file = $this->config_path.'/mail.yml';
698 698
         if ($fs->exists($config_file)) {
699 699
             $fs->remove($config_file);
700 700
         }
@@ -708,7 +708,7 @@  discard block
 block discarded – undo
708 708
         );
709 709
         $fs = new Filesystem();
710 710
         $content = str_replace(
711
-            $target, $replace, file_get_contents($this->dist_path . '/mail.yml.dist')
711
+            $target, $replace, file_get_contents($this->dist_path.'/mail.yml.dist')
712 712
         );
713 713
         $fs->dumpFile($config_file, $content);
714 714
         return $this;
@@ -716,7 +716,7 @@  discard block
 block discarded – undo
716 716
     private function createPathYamlFile($data, Request $request)
717 717
     {
718 718
         $fs = new Filesystem();
719
-        $config_file = $this->config_path . '/path.yml';
719
+        $config_file = $this->config_path.'/path.yml';
720 720
         if ($fs->exists($config_file)) {
721 721
             $fs->remove($config_file);
722 722
         }
@@ -725,19 +725,19 @@  discard block
 block discarded – undo
725 725
         $USER_DATA_ROUTE = 'user_data';
726 726
         $ROOT_DIR = '%ROOT_DIR%';
727 727
         $ROOT_URLPATH = $request->getBasePath();
728
-        $ROOT_PUBLIC_URLPATH = $ROOT_URLPATH . RELATIVE_PUBLIC_DIR_PATH;
728
+        $ROOT_PUBLIC_URLPATH = $ROOT_URLPATH.RELATIVE_PUBLIC_DIR_PATH;
729 729
         $target = array('${ADMIN_ROUTE}', '${TEMPLATE_CODE}', '${USER_DATA_ROUTE}', '${ROOT_DIR}', '${ROOT_URLPATH}', '${ROOT_PUBLIC_URLPATH}');
730 730
         $replace = array($ADMIN_ROUTE, $TEMPLATE_CODE, $USER_DATA_ROUTE, $ROOT_DIR, $ROOT_URLPATH, $ROOT_PUBLIC_URLPATH);
731 731
         $fs = new Filesystem();
732 732
         $content = str_replace(
733
-            $target, $replace, file_get_contents($this->dist_path . '/path.yml.dist')
733
+            $target, $replace, file_get_contents($this->dist_path.'/path.yml.dist')
734 734
         );
735 735
         $fs->dumpFile($config_file, $content);
736 736
         return $this;
737 737
     }
738 738
     private function sendAppData($params)
739 739
     {
740
-        $config_file = $this->config_path . '/database.yml';
740
+        $config_file = $this->config_path.'/database.yml';
741 741
         $db_config = Yaml::parse(file_get_contents($config_file));
742 742
         $this->setPDO();
743 743
         $stmt = $this->PDO->query('select version() as v');
@@ -746,7 +746,7 @@  discard block
 block discarded – undo
746 746
             $version = $row['v'];
747 747
         }
748 748
         if ($db_config['database']['driver'] === 'pdo_mysql') {
749
-            $db_ver = 'MySQL:' . $version;
749
+            $db_ver = 'MySQL:'.$version;
750 750
         } else {
751 751
             $db_ver = $version;
752 752
         }
@@ -762,7 +762,7 @@  discard block
 block discarded – undo
762 762
         );
763 763
         $header = array(
764 764
             'Content-Type: application/x-www-form-urlencoded',
765
-            'Content-Length: ' . strlen($data),
765
+            'Content-Length: '.strlen($data),
766 766
         );
767 767
         $context = stream_context_create(
768 768
             array(
@@ -787,7 +787,7 @@  discard block
 block discarded – undo
787 787
     public function migration(InstallApplication $app, Request $request)
788 788
     {
789 789
         return $app['twig']->render('migration.twig', array(
790
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
790
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
791 791
         ));
792 792
     }
793 793
     /**
@@ -813,7 +813,7 @@  discard block
 block discarded – undo
813 813
             return $app['twig']->render('migration_plugin.twig', array(
814 814
                 'Plugins' => $Plugins,
815 815
                 'version' => Constant::VERSION,
816
-                'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
816
+                'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
817 817
             ));
818 818
         }
819 819
     }
@@ -833,7 +833,7 @@  discard block
 block discarded – undo
833 833
         $config_app->boot();
834 834
         \Eccube\Util\Cache::clear($config_app, true);
835 835
         return $app['twig']->render('migration_end.twig', array(
836
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
836
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
837 837
         ));
838 838
     }
839 839
 }
840 840
\ No newline at end of file
Please login to merge, or discard this patch.
src/Eccube/Controller/NonMemberShoppingController.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -474,7 +474,7 @@
 block discarded – undo
474 474
      *
475 475
      * @param Application $app
476 476
      * @param array $data リクエストパラメータ
477
-     * @return array
477
+     * @return \Symfony\Component\Validator\ConstraintViolationListInterface[]
478 478
      */
479 479
     protected function customerValidation(Application $app, array $data)
480 480
     {
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Admin/SearchProductType.php 2 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,6 @@
 block discarded – undo
35 35
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
36 36
 use Symfony\Component\Form\Extension\Core\Type\TextType;
37 37
 use Symfony\Component\Form\FormBuilderInterface;
38
-use Symfony\Component\Validator\Constraints as Assert;
39 38
 
40 39
 /**
41 40
  * @FormType
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
 use Eccube\Annotation\FormType;
28 28
 use Eccube\Annotation\Inject;
29 29
 use Eccube\Application;
30
-use Eccube\Form\Type\Master\CategoryType as MasterCategoryType;;
30
+use Eccube\Form\Type\Master\CategoryType as MasterCategoryType; ;
31 31
 use Eccube\Form\Type\Master\DispType;
32 32
 use Symfony\Component\Form\AbstractType;
33 33
 use Symfony\Component\Form\Extension\Core\Type;
Please login to merge, or discard this patch.
src/Eccube/Form/Type/Front/CustomerAddressType.php 1 patch
Doc Comments   -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,6 @@
 block discarded – undo
59 59
     protected $app;
60 60
 
61 61
     /**
62
-     * @param array $config
63 62
      */
64 63
     public function __construct()
65 64
     {
Please login to merge, or discard this patch.