EC-CUBE / ec-cube

src/Eccube/Controller/Install/InstallController.php

Spacing +50 added lines, -50 removed lines

@@ -53,9 +53,9 @@ 
     const SESSION_KEY = 'eccube.session.install';
     public function __construct()
     {
-        $this->config_path = __DIR__ . '/../../../../app/config/eccube';
-        $this->dist_path = __DIR__ . '/../../Resource/config';
-        $this->cache_path = __DIR__ . '/../../../../app/cache';
+        $this->config_path = __DIR__.'/../../../../app/config/eccube';
+        $this->dist_path = __DIR__.'/../../Resource/config';
+        $this->cache_path = __DIR__.'/../../../../app/cache';
     }
     private function isValid(Request $request, Form $form)
     {
@@ -95,7 +95,7 @@ 
         $this->checkModules($app);
         return $app['twig']->render('step1.twig', array(
             'form' => $form->createView(),
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
         ));
     }
     // 権限チェック
@@ -114,7 +114,7 @@ 
         }
         return $app['twig']->render('step2.twig', array(
             'protectedDirs' => $protectedDirs,
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
         ));
     }
     //    サイトの設定
@@ -125,7 +125,7 @@ 
             ->getForm();
         $sessionData = $this->getSessionData($request);
         if (empty($sessionData['shop_name'])) {
-            $config_file = $this->config_path . '/config.php';
+            $config_file = $this->config_path.'/config.php';
             $fs = new Filesystem();
             if ($fs->exists($config_file)) {
                 // すでに登録されていた場合、登録データを表示
@@ -136,10 +136,10 @@ 
                     $sessionData['email'] = $row['email01'];
                 }
                 // セキュリティの設定
-                $config_file = $this->config_path . '/path.php';
+                $config_file = $this->config_path.'/path.php';
                 $config = require $config_file;
                 $sessionData['admin_dir'] = $config['admin_route'];
-                $config_file = $this->config_path . '/config.php';
+                $config_file = $this->config_path.'/config.php';
                 $config = require $config_file;
                 $allowHost = $config['admin_allow_host'];
                 if (count($allowHost) > 0) {
@@ -148,7 +148,7 @@ 
                 $sessionData['admin_force_ssl'] = (bool) $config['force_ssl'];
                 // ロードバランサー、プロキシサーバ設定
                 if (isset($config['trusted_proxies_connection_only'])) {
-                    $sessionData['trusted_proxies_connection_only'] = (bool)$config['trusted_proxies_connection_only'];
+                    $sessionData['trusted_proxies_connection_only'] = (bool) $config['trusted_proxies_connection_only'];
                 }
                 if (isset($config['trusted_proxies'])) {
                     $trustedProxies = $config['trusted_proxies'];
@@ -157,7 +157,7 @@ 
                     }
                 }
                 // メール設定
-                $config_file = $this->config_path . '/mail.php';
+                $config_file = $this->config_path.'/mail.php';
                 $config = require $config_file;
                 $mail = $config['mail'];
                 $sessionData['mail_backend'] = $mail['transport'];
@@ -177,7 +177,7 @@ 
         }
         return $app['twig']->render('step3.twig', array(
             'form' => $form->createView(),
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
         ));
     }
     //    データベースの設定
@@ -188,7 +188,7 @@ 
             ->getForm();
         $sessionData = $this->getSessionData($request);
         if (empty($sessionData['database'])) {
-            $config_file = $this->config_path . '/database.php';
+            $config_file = $this->config_path.'/database.php';
             $fs = new Filesystem();
             if ($fs->exists($config_file)) {
                 // すでに登録されていた場合、登録データを表示
@@ -211,7 +211,7 @@ 
         }
         return $app['twig']->render('step4.twig', array(
             'form' => $form->createView(),
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
         ));
     }
     //    データベースの初期化
@@ -250,7 +250,7 @@ 
                 $host = $request->getSchemeAndHttpHost();
                 $basePath = $request->getBasePath();
                 $params = array(
-                    'http_url' => $host . $basePath,
+                    'http_url' => $host.$basePath,
                     'shop_name' => $sessionData['shop_name'],
                 );
                 $this->sendAppData($params);
@@ -261,15 +261,15 @@ 
         }
         return $app['twig']->render('step5.twig', array(
             'form' => $form->createView(),
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
         ));
     }
     //    インストール完了
     public function complete(InstallApplication $app, Request $request)
     {
-        $config_yml = $this->config_path . '/config.php';
+        $config_yml = $this->config_path.'/config.php';
         $config = require $config_yml;
-        $config_path = $this->config_path . '/path.php';
+        $config_path = $this->config_path.'/path.php';
         $path_yml = require $config_path;
         $config = array_replace_recursive($path_yml, $config);
         if (isset($config['trusted_proxies_connection_only']) && !empty($config['trusted_proxies_connection_only'])) {
@@ -279,10 +279,10 @@ 
         }
         $host = $request->getSchemeAndHttpHost();
         $basePath = $request->getBasePath();
-        $adminUrl = $host . $basePath . '/' . $config['admin_dir'];
+        $adminUrl = $host.$basePath.'/'.$config['admin_dir'];
         return $app['twig']->render('complete.twig', array(
             'admin_url' => $adminUrl,
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
         ));
     }
     private function resetNatTimer()
@@ -296,11 +296,11 @@ 
     {
         foreach ($this->required_modules as $module) {
             if (!extension_loaded($module)) {
-                $app->addDanger('[必須] ' . $module . ' 拡張モジュールが有効になっていません。', 'install');
+                $app->addDanger('[必須] '.$module.' 拡張モジュールが有効になっていません。', 'install');
             }
         }
         if (!extension_loaded('pdo_mysql') && !extension_loaded('pdo_pgsql')) {
-            $app->addDanger('[必須] ' . 'pdo_pgsql又はpdo_mysql 拡張モジュールを有効にしてください。', 'install');
+            $app->addDanger('[必須] '.'pdo_pgsql又はpdo_mysql 拡張モジュールを有効にしてください。', 'install');
         }
         foreach ($this->recommended_module as $module) {
             if (!extension_loaded($module)) {
@@ -325,7 +325,7 @@ 
             if (!function_exists('apache_get_modules')) {
                 $app->addWarning('mod_rewrite が有効になっているか不明です。', 'install');
             } elseif (!in_array('mod_rewrite', apache_get_modules())) {
-                $app->addDanger('[必須] ' . 'mod_rewriteを有効にしてください。', 'install');
+                $app->addDanger('[必須] '.'mod_rewriteを有効にしてください。', 'install');
             }
         } elseif (isset($_SERVER['SERVER_SOFTWARE']) && strpos('Microsoft-IIS', $_SERVER['SERVER_SOFTWARE']) !== false) {
             // iis
@@ -335,7 +335,7 @@ 
     }
     private function setPDO()
     {
-        $config_file = $this->config_path . '/database.php';
+        $config_file = $this->config_path.'/database.php';
         $config = require $config_file;
         try {
             $this->PDO = \Doctrine\DBAL\DriverManager::getConnection($config['database'], new \Doctrine\DBAL\Configuration());
@@ -362,7 +362,7 @@ 
     private function getEntityManager()
     {
         if (!isset($this->app['orm.em'])) {
-            $config_file = $this->config_path . '/database.php';
+            $config_file = $this->config_path.'/database.php';
             $database = require $config_file;
             $this->app->register(new \Silex\Provider\DoctrineServiceProvider(), array(
                 'db.options' => $database['database']
@@ -372,7 +372,7 @@ 
                     'type' => 'annotation',
                     'namespace' => 'Eccube\Entity',
                     'path' => array(
-                        __DIR__ . '/../../Entity',
+                        __DIR__.'/../../Entity',
                     ),
                     'use_simple_annotation_reader' => false,
                 ),
@@ -404,7 +404,7 @@ 
                 }
             }
             $this->app->register(new \Dflydev\Provider\DoctrineOrm\DoctrineOrmServiceProvider(), array(
-                'orm.proxies_dir' => __DIR__ . '/../../app/cache/doctrine',
+                'orm.proxies_dir' => __DIR__.'/../../app/cache/doctrine',
                 'orm.em.options' => array(
                     'mappings' => $ormMappings
                 )
@@ -433,10 +433,10 @@ 
     private function insert()
     {
         $this->resetNatTimer();
-        $config_file = $this->config_path . '/database.php';
+        $config_file = $this->config_path.'/database.php';
         $database = require $config_file;
         $config['database'] = $database['database'];
-        $config_file = $this->config_path . '/config.php';
+        $config_file = $this->config_path.'/config.php';
         $baseConfig = require $config_file;
         $config['config'] = $baseConfig;
         $this->PDO->beginTransaction();
@@ -485,10 +485,10 @@ 
     private function update()
     {
         $this->resetNatTimer();
-        $config_file = $this->config_path . '/database.php';
+        $config_file = $this->config_path.'/database.php';
         $database = require $config_file;
         $config['database'] = $database['database'];
-        $config_file = $this->config_path . '/config.php';
+        $config_file = $this->config_path.'/config.php';
         $baseConfig = require $config_file;
         $config['config'] = $baseConfig;
         $this->PDO->beginTransaction();
@@ -539,7 +539,7 @@ 
         $app->boot();
         $config = new Configuration($app['db']);
         $config->setMigrationsNamespace('DoctrineMigrations');
-        $migrationDir = __DIR__ . '/../../Resource/doctrine/migration';
+        $migrationDir = __DIR__.'/../../Resource/doctrine/migration';
         $config->setMigrationsDirectory($migrationDir);
         $config->registerMigrationsFromDirectory($migrationDir);
         $migration = new Migration($config);
@@ -565,7 +565,7 @@ 
     private function getProtectedDirs()
     {
         $protectedDirs = array();
-        $base = __DIR__ . '/../../../..';
+        $base = __DIR__.'/../../../..';
         $dirs = array(
             '/html',
             '/app',
@@ -577,7 +577,7 @@ 
             '/app/Plugin',
         );
         foreach ($dirs as $dir) {
-            if (!is_writable($base . $dir)) {
+            if (!is_writable($base.$dir)) {
                 $protectedDirs[] = $dir;
             }
         }
@@ -586,7 +586,7 @@ 
     private function createConfigYamlFile($data, $auth = true)
     {
         $fs = new Filesystem();
-        $config_file = $this->config_path . '/config.php';
+        $config_file = $this->config_path.'/config.php';
         if ($fs->exists($config_file)) {
             $config = require $config_file;
             $fs->remove($config_file);
@@ -619,7 +619,7 @@ 
             $adminTrustedProxies = array('127.0.0.1/8', '::1');
         }
 
-        $config = require $this->dist_path . '/config.php';
+        $config = require $this->dist_path.'/config.php';
         $config['eccube_install'] = 0;
         $config['auth_magic'] = $auth_magic;
         $config['shop_name'] = $data['shop_name'];
@@ -643,7 +643,7 @@ 
 
     private function addInstallStatus()
     {
-        $config_file = $this->config_path . '/config.php';
+        $config_file = $this->config_path.'/config.php';
         $config = require $config_file;
         $config['eccube_install'] = 1;
 
@@ -654,7 +654,7 @@ 
     private function createDatabaseYamlFile($data)
     {
         $fs = new Filesystem();
-        $config_file = $this->config_path . '/database.php';
+        $config_file = $this->config_path.'/database.php';
         if ($fs->exists($config_file)) {
             $fs->remove($config_file);
         }
@@ -675,7 +675,7 @@ 
                     break;
             }
 
-            $config = $this->dist_path . '/database.php';
+            $config = $this->dist_path.'/database.php';
             $config['database']['driver'] = $data['db_driver'];
             $config['database']['host'] = $data['database_host'];
             $config['database']['dbname'] = $data['database_name'];
@@ -684,9 +684,9 @@ 
             $config['database']['password'] = $data['database_password'];
 
         } else {
-            $config = $this->dist_path . '/database_sqlite3.php';
+            $config = $this->dist_path.'/database_sqlite3.php';
             $config['database']['driver'] = 'pdo_sqlite';
-            $config['database']['path'] = realpath($this->config_path . '/eccube.db');
+            $config['database']['path'] = realpath($this->config_path.'/eccube.db');
         }
 
         $this->createPhp($config_file, $config);
@@ -696,7 +696,7 @@ 
     private function createMailYamlFile($data)
     {
         $fs = new Filesystem();
-        $config_file = $this->config_path . '/mail.php';
+        $config_file = $this->config_path.'/mail.php';
         if ($fs->exists($config_file)) {
             $fs->remove($config_file);
         }
@@ -715,7 +715,7 @@ 
     private function createPathYamlFile($data, Request $request)
     {
         $fs = new Filesystem();
-        $config_file = $this->config_path . '/path.php';
+        $config_file = $this->config_path.'/path.php';
         if ($fs->exists($config_file)) {
             $fs->remove($config_file);
         }
@@ -724,11 +724,11 @@ 
         $USER_DATA_ROUTE = 'user_data';
         $ROOT_DIR = '%ROOT_DIR%';
         $ROOT_URLPATH = $request->getBasePath();
-        $ROOT_PUBLIC_URLPATH = $ROOT_URLPATH . RELATIVE_PUBLIC_DIR_PATH;
+        $ROOT_PUBLIC_URLPATH = $ROOT_URLPATH.RELATIVE_PUBLIC_DIR_PATH;
         $target = array('${ADMIN_ROUTE}', '${TEMPLATE_CODE}', '${USER_DATA_ROUTE}', '${ROOT_DIR}', '${ROOT_URLPATH}', '${ROOT_PUBLIC_URLPATH}');
         $replace = array($ADMIN_ROUTE, $TEMPLATE_CODE, $USER_DATA_ROUTE, $ROOT_DIR, $ROOT_URLPATH, $ROOT_PUBLIC_URLPATH);
 
-        $config = require $this->dist_path . '/path.php';
+        $config = require $this->dist_path.'/path.php';
 
         $this->createPhp($config_file, $config);
 
@@ -736,7 +736,7 @@ 
     }
     private function sendAppData($params)
     {
-        $config_file = $this->config_path . '/database.php';
+        $config_file = $this->config_path.'/database.php';
         $db_config = require $config_file;
         $this->setPDO();
         $stmt = $this->PDO->query('select version() as v');
@@ -745,7 +745,7 @@ 
             $version = $row['v'];
         }
         if ($db_config['database']['driver'] === 'pdo_mysql') {
-            $db_ver = 'MySQL:' . $version;
+            $db_ver = 'MySQL:'.$version;
         } else {
             $db_ver = $version;
         }
@@ -761,7 +761,7 @@ 
         );
         $header = array(
             'Content-Type: application/x-www-form-urlencoded',
-            'Content-Length: ' . strlen($data),
+            'Content-Length: '.strlen($data),
         );
         $context = stream_context_create(
             array(
@@ -786,7 +786,7 @@ 
     public function migration(InstallApplication $app, Request $request)
     {
         return $app['twig']->render('migration.twig', array(
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
         ));
     }
     /**
@@ -812,7 +812,7 @@ 
             return $app['twig']->render('migration_plugin.twig', array(
                 'Plugins' => $Plugins,
                 'version' => Constant::VERSION,
-                'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+                'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
             ));
         }
     }
@@ -832,7 +832,7 @@ 
         $config_app->boot();
         \Eccube\Util\Cache::clear($config_app, true);
         return $app['twig']->render('migration_end.twig', array(
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
         ));
     }
 }
\ No newline at end of file