EC-CUBE / ec-cube

src/Eccube/Controller/Install/InstallController.php

Spacing +50 added lines, -50 removed lines

@@ -56,9 +56,9 @@ 
 
     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)
@@ -108,7 +108,7 @@ 
 
         return $app['twig']->render('step1.twig', array(
                 'form' => $form->createView(),
-                'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+                'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
         ));
     }
 
@@ -131,7 +131,7 @@ 
 
         return $app['twig']->render('step2.twig', array(
                 'protectedDirs' => $protectedDirs,
-                'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+                'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
         ));
     }
 
@@ -145,7 +145,7 @@ 
 
         if (empty($sessionData['shop_name'])) {
 
-            $config_file = $this->config_path . '/config.yml';
+            $config_file = $this->config_path.'/config.yml';
             $fs = new Filesystem();
 
             if ($fs->exists($config_file)) {
@@ -159,11 +159,11 @@ 
                 }
 
                 // セキュリティの設定
-                $config_file = $this->config_path . '/path.yml';
+                $config_file = $this->config_path.'/path.yml';
                 $config = Yaml::parse(file_get_contents($config_file));
                 $sessionData['admin_dir'] = $config['admin_route'];
 
-                $config_file = $this->config_path . '/config.yml';
+                $config_file = $this->config_path.'/config.yml';
                 $config = Yaml::parse(file_get_contents($config_file));
 
                 $allowHost = $config['admin_allow_host'];
@@ -173,7 +173,7 @@ 
                 $sessionData['admin_force_ssl'] = (bool) $config['force_ssl'];
 
                 // メール設定
-                $config_file = $this->config_path . '/mail.yml';
+                $config_file = $this->config_path.'/mail.yml';
                 $config = Yaml::parse(file_get_contents($config_file));
                 $mail = $config['mail'];
                 $sessionData['mail_backend'] = $mail['transport'];
@@ -196,7 +196,7 @@ 
 
         return $app['twig']->render('step3.twig', array(
                 'form' => $form->createView(),
-                'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+                'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
         ));
     }
 
@@ -211,7 +211,7 @@ 
 
         if (empty($sessionData['database'])) {
 
-            $config_file = $this->config_path . '/database.yml';
+            $config_file = $this->config_path.'/database.yml';
             $fs = new Filesystem();
 
             if ($fs->exists($config_file)) {
@@ -239,7 +239,7 @@ 
 
         return $app['twig']->render('step4.twig', array(
                 'form' => $form->createView(),
-                'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+                'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
         ));
     }
 
@@ -285,7 +285,7 @@ 
                 $host = $request->getSchemeAndHttpHost();
                 $basePath = $request->getBasePath();
                 $params = array(
-                    'http_url' => $host . $basePath,
+                    'http_url' => $host.$basePath,
                     'shop_name' => $sessionData['shop_name'],
                 );
 
@@ -300,24 +300,24 @@ 
 
         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_file = $this->config_path . '/path.yml';
+        $config_file = $this->config_path.'/path.yml';
         $config = Yaml::parse(file_get_contents($config_file));
 
         $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.'/',
         ));
     }
 
@@ -333,12 +333,12 @@ 
     {
         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) {
@@ -366,7 +366,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
@@ -377,7 +377,7 @@ 
 
     private function setPDO()
     {
-        $config_file = $this->config_path . '/database.yml';
+        $config_file = $this->config_path.'/database.yml';
         $config = Yaml::parse(file_get_contents($config_file));
 
         try {
@@ -411,7 +411,7 @@ 
      */
     private function getEntityManager()
     {
-        $config_file = $this->config_path . '/database.yml';
+        $config_file = $this->config_path.'/database.yml';
         $database = Yaml::parse(file_get_contents($config_file));
 
         $this->app->register(new \Silex\Provider\DoctrineServiceProvider(), array(
@@ -419,15 +419,15 @@ 
         ));
 
         $this->app->register(new \Dflydev\Silex\Provider\DoctrineOrm\DoctrineOrmServiceProvider(), array(
-            'orm.proxies_dir' => __DIR__ . '/../../app/cache/doctrine',
+            'orm.proxies_dir' => __DIR__.'/../../app/cache/doctrine',
             'orm.em.options' => array(
                 'mappings' => array(
                     array(
                         'type' => 'yml',
                         'namespace' => 'Eccube\Entity',
                         'path' => array(
-                            __DIR__ . '/../../Resource/doctrine',
-                            __DIR__ . '/../../Resource/doctrine/master',
+                            __DIR__.'/../../Resource/doctrine',
+                            __DIR__.'/../../Resource/doctrine/master',
                         ),
                     ),
                 ),
@@ -454,11 +454,11 @@ 
     {
         $this->resetNatTimer();
 
-        $config_file = $this->config_path . '/database.yml';
+        $config_file = $this->config_path.'/database.yml';
         $database = Yaml::parse(file_get_contents($config_file));
         $config['database'] = $database['database'];
 
-        $config_file = $this->config_path . '/config.yml';
+        $config_file = $this->config_path.'/config.yml';
         $baseConfig = Yaml::parse(file_get_contents($config_file));
         $config['config'] = $baseConfig;
 
@@ -514,11 +514,11 @@ 
     {
         $this->resetNatTimer();
 
-        $config_file = $this->config_path . '/database.yml';
+        $config_file = $this->config_path.'/database.yml';
         $database = Yaml::parse(file_get_contents($config_file));
         $config['database'] = $database['database'];
 
-        $config_file = $this->config_path . '/config.yml';
+        $config_file = $this->config_path.'/config.yml';
         $baseConfig = Yaml::parse(file_get_contents($config_file));
         $config['config'] = $baseConfig;
 
@@ -581,7 +581,7 @@ 
         $config = new Configuration($app['db']);
         $config->setMigrationsNamespace('DoctrineMigrations');
 
-        $migrationDir = __DIR__ . '/../../Resource/doctrine/migration';
+        $migrationDir = __DIR__.'/../../Resource/doctrine/migration';
         $config->setMigrationsDirectory($migrationDir);
         $config->registerMigrationsFromDirectory($migrationDir);
 
@@ -613,7 +613,7 @@ 
     private function getProtectedDirs()
     {
         $protectedDirs = array();
-        $base = __DIR__ . '/../../../..';
+        $base = __DIR__.'/../../../..';
         $dirs = array(
             '/html',
             '/app',
@@ -626,7 +626,7 @@ 
         );
 
         foreach ($dirs as $dir) {
-            if (!is_writable($base . $dir)) {
+            if (!is_writable($base.$dir)) {
                 $protectedDirs[] = $dir;
             }
         }
@@ -637,7 +637,7 @@ 
     private function createConfigYamlFile($data, $auth = true)
     {
         $fs = new Filesystem();
-        $config_file = $this->config_path . '/config.yml';
+        $config_file = $this->config_path.'/config.yml';
 
         if ($fs->exists($config_file)) {
             $config = Yaml::parse(file_get_contents($config_file));
@@ -666,7 +666,7 @@ 
 
         $fs = new Filesystem();
         $content = str_replace(
-            $target, $replace, file_get_contents($this->dist_path . '/config.yml.dist')
+            $target, $replace, file_get_contents($this->dist_path.'/config.yml.dist')
         );
         $fs->dumpFile($config_file, $content);
 
@@ -680,7 +680,7 @@ 
 
     private function addInstallStatus()
     {
-        $config_file = $this->config_path . '/config.yml';
+        $config_file = $this->config_path.'/config.yml';
         $config = Yaml::parse(file_get_contents($config_file));
         $config['eccube_install'] = 1;
         $yml = Yaml::dump($config);
@@ -692,7 +692,7 @@ 
     private function createDatabaseYamlFile($data)
     {
         $fs = new Filesystem();
-        $config_file = $this->config_path . '/database.yml';
+        $config_file = $this->config_path.'/database.yml';
         if ($fs->exists($config_file)) {
             $fs->remove($config_file);
         }
@@ -725,14 +725,14 @@ 
 
             $fs = new Filesystem();
             $content = str_replace(
-                $target, $replace, file_get_contents($this->dist_path . '/database.yml.dist')
+                $target, $replace, file_get_contents($this->dist_path.'/database.yml.dist')
             );
         } else {
             $content = Yaml::dump(
                     array(
                         'database' => array(
                             'driver' => 'pdo_sqlite',
-                            'path' => realpath($this->config_path . '/eccube.db')
+                            'path' => realpath($this->config_path.'/eccube.db')
                         )
                     )
             );
@@ -745,7 +745,7 @@ 
     private function createMailYamlFile($data)
     {
         $fs = new Filesystem();
-        $config_file = $this->config_path . '/mail.yml';
+        $config_file = $this->config_path.'/mail.yml';
         if ($fs->exists($config_file)) {
             $fs->remove($config_file);
         }
@@ -760,7 +760,7 @@ 
 
         $fs = new Filesystem();
         $content = str_replace(
-            $target, $replace, file_get_contents($this->dist_path . '/mail.yml.dist')
+            $target, $replace, file_get_contents($this->dist_path.'/mail.yml.dist')
         );
         $fs->dumpFile($config_file, $content);
 
@@ -770,7 +770,7 @@ 
     private function createPathYamlFile($data, Request $request)
     {
         $fs = new Filesystem();
-        $config_file = $this->config_path . '/path.yml';
+        $config_file = $this->config_path.'/path.yml';
         if ($fs->exists($config_file)) {
             $fs->remove($config_file);
         }
@@ -778,16 +778,16 @@ 
         $ADMIN_ROUTE = $data['admin_dir'];
         $TEMPLATE_CODE = 'default';
         $USER_DATA_ROUTE = 'user_data';
-        $ROOT_DIR = realpath(__DIR__ . '/../../../../');
+        $ROOT_DIR = realpath(__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);
 
         $fs = new Filesystem();
         $content = str_replace(
-            $target, $replace, file_get_contents($this->dist_path . '/path.yml.dist')
+            $target, $replace, file_get_contents($this->dist_path.'/path.yml.dist')
         );
         $fs->dumpFile($config_file, $content);
 
@@ -796,7 +796,7 @@ 
 
     private function sendAppData($params)
     {
-        $config_file = $this->config_path . '/database.yml';
+        $config_file = $this->config_path.'/database.yml';
         $db_config = Yaml::parse(file_get_contents($config_file));
 
         $this->setPDO();
@@ -808,7 +808,7 @@ 
         }
 
         if ($db_config['database']['driver'] === 'pdo_mysql') {
-            $db_ver = 'MySQL:' . $version;
+            $db_ver = 'MySQL:'.$version;
         } else {
             $db_ver = $version;
         }
@@ -826,7 +826,7 @@ 
 
         $header = array(
             'Content-Type: application/x-www-form-urlencoded',
-            'Content-Length: ' . strlen($data),
+            'Content-Length: '.strlen($data),
         );
         $context = stream_context_create(
             array(
@@ -853,7 +853,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.'/',
         ));
     }
 
@@ -882,7 +882,7 @@ 
             return $app['twig']->render('migration_plugin.twig', array(
                     'Plugins' => $Plugins,
                     'version' => Constant::VERSION,
-                    'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+                    'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
             ));
         }
     }
@@ -905,7 +905,7 @@ 
         \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.'/',
         ));
     }
 }

Doc Comments +3 added lines

@@ -329,6 +329,9 @@
         flush();
     }
 
+    /**
+     * @param InstallApplication $app
+     */
     private function checkModules($app)
     {
         foreach ($this->required_modules as $module) {