EC-CUBE / ec-cube

src/Eccube/Command/ConfigCommand.php

Spacing +1 added lines, -1 removed lines

@@ -91,7 +91,7 @@
             }
         }
 
-        $recursive = function ($config, $space = '    ') use (&$recursive, $output) {
+        $recursive = function($config, $space = '    ') use (&$recursive, $output) {
             foreach ($config as $key => $item) {
                 if (is_array($item)) {
                     $space = '    ';

src/Eccube/Command/PluginCommand.php

Spacing +3 added lines, -3 removed lines

@@ -137,8 +137,8 @@ 
             if ($code) {
                 $pluginDir = $service->calcPluginDir($code);
                 $service->checkPluginArchiveContent($pluginDir);
-                $config = $service->readYml($pluginDir . '/config.yml');
-                $event = $service->readYml($pluginDir . '/event.yml');
+                $config = $service->readYml($pluginDir.'/config.yml');
+                $event = $service->readYml($pluginDir.'/event.yml');
                 $service->checkSamePlugin($config['code']);
                 $service->registerPlugin($config, $event);
 
@@ -187,7 +187,7 @@ 
 
             // ディレクトリは残し, プラグインを削除.
             $pluginDir = $service->calcPluginDir($code);
-            $config = $service->readYml($pluginDir . '/config.yml');
+            $config = $service->readYml($pluginDir.'/config.yml');
             $service->callPluginManagerMethod($config, 'disable');
             $service->callPluginManagerMethod($config, 'uninstall');
             $service->unregisterPlugin($plugin);

src/Eccube/Command/PluginCommand/Resource/ServiceProvider.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
         $app->match('/plugin/[lower_code]/hello', 'Plugin\[code]\Controller\[code]Controller::index')->bind('plugin_[code]_hello');
 
         // Form
-        $app['form.types'] = $app->share($app->extend('form.types', function ($types) use ($app) {
+        $app['form.types'] = $app->share($app->extend('form.types', function($types) use ($app) {
             $types[] = new [code]ConfigType();
 
             return $types;
@@ -57,7 +57,7 @@ 
         // }
 
         // ログファイル設定
-        $app['monolog.logger.[lower_code]'] = $app->share(function ($app) {
+        $app['monolog.logger.[lower_code]'] = $app->share(function($app) {
 
             $logger = new $app['monolog.logger.class']('[lower_code]');
 

src/Eccube/Command/PluginCommand/EntityFromYamlGenerator.php

Spacing +26 added lines, -26 removed lines

@@ -47,7 +47,7 @@ 
         $this->output->writeln('------------------------------------------------------');
         $this->output->writeln('---Plugin Generator for Entity');
         $this->output->writeln('---[*] You need to create yaml file first.');
-        $this->output->writeln('---[*]You can exit from Console Application, by typing ' . self::STOP_PROCESS . ' instead of typing another word.');
+        $this->output->writeln('---[*]You can exit from Console Application, by typing '.self::STOP_PROCESS.' instead of typing another word.');
         $this->output->writeln('------------------------------------------------------');
         $this->output->writeln('');
     }
@@ -62,11 +62,11 @@ 
         $pluginCode = $this->paramList['pluginCode']['value'];
         $yamlList = $this->paramList['entityList']['value'];
 
-        $codePath = $this->app['config']['root_dir'] . '/app/Plugin/' . $pluginCode;
+        $codePath = $this->app['config']['root_dir'].'/app/Plugin/'.$pluginCode;
 
         $dirList = array('Entity', 'Repository', '/Resource/doctrine/migration');
         foreach ($dirList as $dirName) {
-            $dirPath = $codePath . '/' . $dirName;
+            $dirPath = $codePath.'/'.$dirName;
             if (!is_dir($dirPath)) {
                 mkdir($dirPath);
             }
@@ -79,7 +79,7 @@ 
         $metadetas = array();
 
 
-        $YamlDriver = new YamlDriver(array($codePath . '/Resource/doctrine'));
+        $YamlDriver = new YamlDriver(array($codePath.'/Resource/doctrine'));
         foreach ($yamlList as $pathYaml => $fullClassName) {
 
             $MetadataInfo = new ClassMetadataInfo($fullClassName);
@@ -95,9 +95,9 @@ 
             $EntityGenerator->setGenerateStubMethods(true);
             $EntityGenerator->setUpdateEntityIfExists(false);
 
-            $pathClass = $this->app['config']['root_dir'] . '/app/';
+            $pathClass = $this->app['config']['root_dir'].'/app/';
             $EntityGenerator->generate(array($MetadataInfo), $pathClass);
-            $pathClass .= str_replace('\\', DIRECTORY_SEPARATOR, $MetadataInfo->name) . '.php';
+            $pathClass .= str_replace('\\', DIRECTORY_SEPARATOR, $MetadataInfo->name).'.php';
             if (is_file($pathClass)) {
                 $fsList['file'][$pathClass] = true;
             } else {
@@ -118,7 +118,7 @@ 
             $migrationContent = $this->makeMigration($pluginCode, $metadetas);
             $timeSt = date('YmdHis');
             $migrationContent = str_replace('[datetime]', $timeSt, $migrationContent);
-            $migPath = $codePath . '/Resource/doctrine/migration/Version' . $timeSt . '.php';
+            $migPath = $codePath.'/Resource/doctrine/migration/Version'.$timeSt.'.php';
 
             file_put_contents($migPath, $migrationContent);
             if (is_file($migPath)) {
@@ -150,7 +150,7 @@ 
             $this->output->writeln('');
             $this->output->writeln(' this files and folders were created.');
             foreach ($dirFileOk as $path) {
-                $this->output->writeln('<info> - ' . $path . '</info>');
+                $this->output->writeln('<info> - '.$path.'</info>');
             }
         }
     }
@@ -201,7 +201,7 @@ 
 
         if ($this->entityList === null) {
             $this->entityList = array();
-            $directory = $this->app['config']['root_dir'] . '/app/Plugin/' . $this->paramList['pluginCode']['value'] . '/Resource/doctrine/';
+            $directory = $this->app['config']['root_dir'].'/app/Plugin/'.$this->paramList['pluginCode']['value'].'/Resource/doctrine/';
             if (!is_dir($directory)) {
                 return $this->entityList;
             }
@@ -222,7 +222,7 @@ 
     private function getPluginList()
     {
         $ret = array();
-        $pluginDir = $this->app['config']['root_dir'] . '/app/Plugin';
+        $pluginDir = $this->app['config']['root_dir'].'/app/Plugin';
         $iterator = new \DirectoryIterator($pluginDir);
         foreach ($iterator as $fileInfo) {
             if ($fileInfo->isDot()) {
@@ -237,7 +237,7 @@ 
 
     private function toCamelCase($name)
     {
-        return lcfirst(implode('', array_map(function ($name) {
+        return lcfirst(implode('', array_map(function($name) {
                     return ucfirst($name);
                 }, explode('_', $name))));
     }
@@ -249,31 +249,31 @@ 
         $line = array();
         $line[] = '<?php';
         $line[] = '/*';
-        $line[] = ' * This file is part of ' . $pluginCode;
+        $line[] = ' * This file is part of '.$pluginCode;
         $line[] = ' *';
         $line[] = ' *';
         $line[] = ' * For the full copyright and license information, please view the LICENSE';
         $line[] = ' * file that was distributed with this source code.';
         $line[] = ' */';
         $line[] = '';
-        $line[] = 'namespace Plugin\\' . $pluginCode . '\Repository;';
+        $line[] = 'namespace Plugin\\'.$pluginCode.'\Repository;';
         $line[] = '';
         $line[] = 'use Doctrine\ORM\EntityRepository;';
         $line[] = '';
         $line[] = '/**';
-        $line[] = ' * ' . $nameFormated;
+        $line[] = ' * '.$nameFormated;
         $line[] = ' *';
         $line[] = ' * This class was generated by the Doctrine ORM. Add your own custom';
         $line[] = ' * repository methods below.';
         $line[] = ' */';
-        $line[] = 'class ' . $nameFormated . 'Repository extends EntityRepository';
+        $line[] = 'class '.$nameFormated.'Repository extends EntityRepository';
         $line[] = '{';
         $line[] = '';
         $line[] = '}';
         $line[] = '';
 
         $cont = join(PHP_EOL, $line);
-        $filename = $this->app['config']['root_dir'] . '/app/Plugin/' . $pluginCode . '/Repository/' . $nameFormated . 'Repository.php';
+        $filename = $this->app['config']['root_dir'].'/app/Plugin/'.$pluginCode.'/Repository/'.$nameFormated.'Repository.php';
         file_put_contents($filename, $cont);
         return $filename;
     }
@@ -281,20 +281,20 @@ 
     private function makeMigration($pluginCode, $metadetas)
     {
         if ($this->paramList['supportFlag']['value']) {
-            $migrationFileCont = file_get_contents($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/MigrationVersionSupport.php');
+            $migrationFileCont = file_get_contents($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/MigrationVersionSupport.php');
         } else {
-            $migrationFileCont = file_get_contents($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/MigrationVersion.php');
+            $migrationFileCont = file_get_contents($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/MigrationVersion.php');
         }
 
         $entityList = $this->createEntityList($pluginCode, $metadetas);
 
-        $entityListStr = join(',' . PHP_EOL, $entityList);
+        $entityListStr = join(','.PHP_EOL, $entityList);
         $migrationFileCont = str_replace('[entityList]', $entityListStr, $migrationFileCont);
         if ($this->paramList['supportFlag']['value']) {
             $createParts = $this->makeCreateParts($metadetas);
             $tableNameArr = array();
             foreach ($createParts as $tableName => $tableArr) {
-                $tableNameArr[] = '            $this->createTable' . $tableName . '($schema);';
+                $tableNameArr[] = '            $this->createTable'.$tableName.'($schema);';
             }
             $tableNameStr = join(PHP_EOL, $tableNameArr);
             $migrationFileCont = str_replace('[createTable]', $tableNameStr, $migrationFileCont);
@@ -317,7 +317,7 @@ 
     {
         $ret = array();
         foreach ($migrations as $metadata) {
-            $ret[] = "        '" . 'Plugin\\' . $pluginCode . '\Entity\\' . ucfirst($this->getShortClassName($metadata->table['name'])) . "'";
+            $ret[] = "        '".'Plugin\\'.$pluginCode.'\Entity\\'.ucfirst($this->getShortClassName($metadata->table['name']))."'";
         }
         return $ret;
     }
@@ -335,14 +335,14 @@ 
             $nameFormated = $this->getShortClassName($metadata->table['name']);
             $tmp = array();
             $tmp[] = '';
-            $tmp[] = '    public function createTable' . ucfirst($nameFormated) . '(Schema $schema)';
+            $tmp[] = '    public function createTable'.ucfirst($nameFormated).'(Schema $schema)';
             $tmp[] = '    {';
-            $tmp[] = '        $table = $schema->createTable(\'' . $metadata->table['name'] . '\');';
+            $tmp[] = '        $table = $schema->createTable(\''.$metadata->table['name'].'\');';
             $columns = $metadata->fieldMappings;
             foreach ($columns as $column) {
 
                 $typeName = $column['type'];
-                $tmp[] = '        $table->addColumn(\'' . $column['columnName'] . '\', \'' . $typeName . '\', array(';
+                $tmp[] = '        $table->addColumn(\''.$column['columnName'].'\', \''.$typeName.'\', array(';
                 $param = array();
                 if (isset($column['nullable']) && $column['nullable']) {
                     $param['notnull'] = 'true';
@@ -351,7 +351,7 @@ 
                 }
 
                 foreach ($param as $parKey => $parVal) {
-                    $tmp[] = '            \'' . $parKey . '\' => ' . $parVal . ',';
+                    $tmp[] = '            \''.$parKey.'\' => '.$parVal.',';
                 }
                 $tmp[] = '        ));';
             }
@@ -369,7 +369,7 @@ 
     {
         $ret = array();
         foreach ($metadetas as $metadata) {
-            $ret[] = '            $schema->dropTable(\'' . $metadata->table['name'] . '\');';
+            $ret[] = '            $schema->dropTable(\''.$metadata->table['name'].'\');';
         }
 
         return $ret;

src/Eccube/Command/PluginCommand/EntityFromDbGenerator.php

Spacing +69 added lines, -69 removed lines

@@ -43,7 +43,7 @@ 
         $this->output->writeln('------------------------------------------------------');
         $this->output->writeln('---Plugin Generator for Entity');
         $this->output->writeln('---[*] You need to create table schema first.');
-        $this->output->writeln('---[*]You can exit from Console Application, by typing ' . self::STOP_PROCESS . ' instead of typing another word.');
+        $this->output->writeln('---[*]You can exit from Console Application, by typing '.self::STOP_PROCESS.' instead of typing another word.');
         $this->output->writeln('------------------------------------------------------');
         $this->output->writeln('');
     }
@@ -57,11 +57,11 @@ 
 
         $pluginCode = $this->paramList['pluginCode']['value'];
         $tableList = $this->paramList['tableList']['value'];
-        $codePath = $this->app['config']['root_dir'] . '/app/Plugin/' . $pluginCode;
+        $codePath = $this->app['config']['root_dir'].'/app/Plugin/'.$pluginCode;
 
         $dirList = array('Entity', 'Repository', 'Resource', 'Resource/doctrine', '/Resource/doctrine/migration');
         foreach ($dirList as $dirName) {
-            $dirPath = $codePath . '/' . $dirName;
+            $dirPath = $codePath.'/'.$dirName;
             if (!is_dir($dirPath)) {
                 mkdir($dirPath);
             }
@@ -86,13 +86,13 @@ 
             $migrationContent = $this->makeMigration($pluginCode, $migration);
             $timeSt = date('YmdHis');
             $migrationContent = str_replace('[datetime]', $timeSt, $migrationContent);
-            $path = '/Resource/doctrine/migration/Version' . $timeSt . '.php';
+            $path = '/Resource/doctrine/migration/Version'.$timeSt.'.php';
             $entityInfoList[] = array($path => $migrationContent);
         }
 
         foreach ($entityInfoList as $entityInfo) {
             foreach ($entityInfo as $path => $body) {
-                $fullPath = $this->app['config']['root_dir'] . '/app/Plugin/' . $pluginCode . $path;
+                $fullPath = $this->app['config']['root_dir'].'/app/Plugin/'.$pluginCode.$path;
                 file_put_contents($fullPath, $body);
                 if (is_file($fullPath)) {
                     $fsList['file'][$fullPath] = true;
@@ -123,7 +123,7 @@ 
             $this->output->writeln('');
             $this->output->writeln(' this files and folders were created.');
             foreach ($dirFileOk as $path) {
-                $this->output->writeln('<info> - ' . $path . '</info>');
+                $this->output->writeln('<info> - '.$path.'</info>');
             }
         }
     }
@@ -134,11 +134,11 @@ 
         $nameFormated = ucfirst($this->toCamelCase($tableName));
 
         $ret = array();
-        $ret['/Entity/' . $nameFormated . '.php'] = $this->getSrc($pluginCode, $TableInfo);
+        $ret['/Entity/'.$nameFormated.'.php'] = $this->getSrc($pluginCode, $TableInfo);
 
-        $ret['/Resource/doctrine/Plugin.' . $pluginCode . '.Entity.' . $nameFormated . '.dcm.yml'] = $this->getConfig($pluginCode, $TableInfo);
+        $ret['/Resource/doctrine/Plugin.'.$pluginCode.'.Entity.'.$nameFormated.'.dcm.yml'] = $this->getConfig($pluginCode, $TableInfo);
 
-        $ret['/Repository/' . $nameFormated . 'Repository.php'] = $this->getRepo($pluginCode, $TableInfo);
+        $ret['/Repository/'.$nameFormated.'Repository.php'] = $this->getRepo($pluginCode, $TableInfo);
 
         return $ret;
     }
@@ -201,7 +201,7 @@ 
     private function getPluginList()
     {
         $ret = array();
-        $pluginDir = $this->app['config']['root_dir'] . '/app/Plugin';
+        $pluginDir = $this->app['config']['root_dir'].'/app/Plugin';
         $iterator = new \DirectoryIterator($pluginDir);
         foreach ($iterator as $fileInfo) {
             if ($fileInfo->isDot()) {
@@ -216,7 +216,7 @@ 
 
     private function toCamelCase($name)
     {
-        return lcfirst(implode('', array_map(function ($name) {
+        return lcfirst(implode('', array_map(function($name) {
                     return ucfirst($name);
                 }, explode('_', $name))));
     }
@@ -259,43 +259,43 @@ 
                 $varName = 'string';
             }
 
-            $tmpProp = '' . PHP_EOL;
-            $tmpProp .= '    /**' . PHP_EOL;
-            $tmpProp .= '     * @var ' . $varName . PHP_EOL;
-            $tmpProp .= '     */' . PHP_EOL;
-            $tmpProp .= '    private $' . $columnName . ';' . PHP_EOL;
+            $tmpProp = ''.PHP_EOL;
+            $tmpProp .= '    /**'.PHP_EOL;
+            $tmpProp .= '     * @var '.$varName.PHP_EOL;
+            $tmpProp .= '     */'.PHP_EOL;
+            $tmpProp .= '    private $'.$columnName.';'.PHP_EOL;
 
             $prop[] = $tmpProp;
 
-            $tmpGetMethName = $this->toCamelCase('get_' . $columnName);
+            $tmpGetMethName = $this->toCamelCase('get_'.$columnName);
 
-            $tmpGet = '' . PHP_EOL;
-            $tmpGet .= '    /**' . PHP_EOL;
-            $tmpGet .= '     * Get ' . $columnName . PHP_EOL;
-            $tmpGet .= '     *' . PHP_EOL;
-            $tmpGet .= '     * @return ' . $varName . PHP_EOL;
-            $tmpGet .= '     */' . PHP_EOL;
-            $tmpGet .= '    public function ' . $tmpGetMethName . '()' . PHP_EOL;
-            $tmpGet .= '    {' . PHP_EOL;
-            $tmpGet .= '        return $this->' . $columnName . ';' . PHP_EOL;
-            $tmpGet .= '    }' . PHP_EOL;
+            $tmpGet = ''.PHP_EOL;
+            $tmpGet .= '    /**'.PHP_EOL;
+            $tmpGet .= '     * Get '.$columnName.PHP_EOL;
+            $tmpGet .= '     *'.PHP_EOL;
+            $tmpGet .= '     * @return '.$varName.PHP_EOL;
+            $tmpGet .= '     */'.PHP_EOL;
+            $tmpGet .= '    public function '.$tmpGetMethName.'()'.PHP_EOL;
+            $tmpGet .= '    {'.PHP_EOL;
+            $tmpGet .= '        return $this->'.$columnName.';'.PHP_EOL;
+            $tmpGet .= '    }'.PHP_EOL;
 
             $getMethods[] = $tmpGet;
 
-            $tmpSetMethName = $this->toCamelCase('set_' . $columnName);
-
-            $tmpSet = '' . PHP_EOL;
-            $tmpSet .= '    /**' . PHP_EOL;
-            $tmpSet .= '     * Set ' . $columnName . PHP_EOL;
-            $tmpSet .= '     *' . PHP_EOL;
-            $tmpSet .= '     * @param  ' . $varName . ' $' . $columnName . PHP_EOL;
-            $tmpSet .= '     * @return ' . $nameFormated . PHP_EOL;
-            $tmpSet .= '     */' . PHP_EOL;
-            $tmpSet .= '    public function ' . $tmpSetMethName . '( $' . $columnName . ')' . PHP_EOL;
-            $tmpSet .= '    {' . PHP_EOL;
-            $tmpSet .= '        $this->' . $columnName . ' = $' . $columnName . ';' . PHP_EOL;
-            $tmpSet .= '        return $this;' . PHP_EOL;
-            $tmpSet .= '    }' . PHP_EOL;
+            $tmpSetMethName = $this->toCamelCase('set_'.$columnName);
+
+            $tmpSet = ''.PHP_EOL;
+            $tmpSet .= '    /**'.PHP_EOL;
+            $tmpSet .= '     * Set '.$columnName.PHP_EOL;
+            $tmpSet .= '     *'.PHP_EOL;
+            $tmpSet .= '     * @param  '.$varName.' $'.$columnName.PHP_EOL;
+            $tmpSet .= '     * @return '.$nameFormated.PHP_EOL;
+            $tmpSet .= '     */'.PHP_EOL;
+            $tmpSet .= '    public function '.$tmpSetMethName.'( $'.$columnName.')'.PHP_EOL;
+            $tmpSet .= '    {'.PHP_EOL;
+            $tmpSet .= '        $this->'.$columnName.' = $'.$columnName.';'.PHP_EOL;
+            $tmpSet .= '        return $this;'.PHP_EOL;
+            $tmpSet .= '    }'.PHP_EOL;
             $setMethods[] = $tmpSet;
         }
         $ret .= PHP_EOL;
@@ -305,7 +305,7 @@ 
         $ret .= PHP_EOL;
         $ret .= join(PHP_EOL, $setMethods);
         $ret .= PHP_EOL;
-        $ret .= '}' . PHP_EOL;
+        $ret .= '}'.PHP_EOL;
 
 
         return $ret;
@@ -316,16 +316,16 @@ 
         $line = array();
         $line[] = '<?php';
         $line[] = '/*';
-        $line[] = ' * This file is part of ' . $pluginCode;
+        $line[] = ' * This file is part of '.$pluginCode;
         $line[] = ' *';
         $line[] = ' *';
         $line[] = ' * For the full copyright and license information, please view the LICENSE';
         $line[] = ' * file that was distributed with this source code.';
         $line[] = ' */';
         $line[] = '';
-        $line[] = 'namespace Plugin\\' . $pluginCode . '\Entity;';
+        $line[] = 'namespace Plugin\\'.$pluginCode.'\Entity;';
         $line[] = '';
-        $line[] = 'class ' . ucfirst($nameFormated) . ' extends \Eccube\Entity\AbstractEntity';
+        $line[] = 'class '.ucfirst($nameFormated).' extends \Eccube\Entity\AbstractEntity';
         $line[] = '{';
         $line[] = '    /**';
         $line[] = '     * @return string';
@@ -409,10 +409,10 @@ 
         }
 
         $yml = array(
-            'Plugin\\' . $pluginCode . '\Entity\\' . ucfirst($nameFormated) => array(
+            'Plugin\\'.$pluginCode.'\Entity\\'.ucfirst($nameFormated) => array(
                 'type' => 'entity',
                 'table' => $TableInfo->getName(),
-                'repositoryClass' => 'Plugin\\' . $pluginCode . '\Repository\\' . ucfirst($nameFormated) . 'Repository',
+                'repositoryClass' => 'Plugin\\'.$pluginCode.'\Repository\\'.ucfirst($nameFormated).'Repository',
                 'id' => array(
                     'id' => $id
                 ),
@@ -430,24 +430,24 @@ 
         $line = array();
         $line[] = '<?php';
         $line[] = '/*';
-        $line[] = ' * This file is part of ' . $pluginCode;
+        $line[] = ' * This file is part of '.$pluginCode;
         $line[] = ' *';
         $line[] = ' *';
         $line[] = ' * For the full copyright and license information, please view the LICENSE';
         $line[] = ' * file that was distributed with this source code.';
         $line[] = ' */';
         $line[] = '';
-        $line[] = 'namespace Plugin\\' . $pluginCode . '\Repository;';
+        $line[] = 'namespace Plugin\\'.$pluginCode.'\Repository;';
         $line[] = '';
         $line[] = 'use Doctrine\ORM\EntityRepository;';
         $line[] = '';
         $line[] = '/**';
-        $line[] = ' * ' . ucfirst($nameFormated);
+        $line[] = ' * '.ucfirst($nameFormated);
         $line[] = ' *';
         $line[] = ' * This class was generated by the Doctrine ORM. Add your own custom';
         $line[] = ' * repository methods below.';
         $line[] = ' */';
-        $line[] = 'class ' . ucfirst($nameFormated) . 'Repository extends EntityRepository';
+        $line[] = 'class '.ucfirst($nameFormated).'Repository extends EntityRepository';
         $line[] = '{';
         $line[] = '';
         $line[] = '}';
@@ -458,21 +458,21 @@ 
     private function makeMigration($pluginCode, $migration)
     {
         if ($this->paramList['supportFlag']['value']) {
-            $migrationFileCont = file_get_contents($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/MigrationVersionSupport.php');
+            $migrationFileCont = file_get_contents($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/MigrationVersionSupport.php');
         } else {
-            $migrationFileCont = file_get_contents($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/MigrationVersion.php');
+            $migrationFileCont = file_get_contents($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/MigrationVersion.php');
         }
 
         $entityList = $this->createEntityList($pluginCode, $migration);
 
-        $entityListStr = join(',' . PHP_EOL, $entityList);
+        $entityListStr = join(','.PHP_EOL, $entityList);
         $migrationFileCont = str_replace('[entityList]', $entityListStr, $migrationFileCont);
 
         if ($this->paramList['supportFlag']['value']) {
             $createParts = $this->makeCreateParts($migration);
             $tableNameArr = array();
             foreach ($createParts as $tableName => $tableArr) {
-                $tableNameArr[] = '            $this->createTable' . $tableName . '($schema);';
+                $tableNameArr[] = '            $this->createTable'.$tableName.'($schema);';
             }
             $tableNameStr = join(PHP_EOL, $tableNameArr);
             $migrationFileCont = str_replace('[createTable]', $tableNameStr, $migrationFileCont);
@@ -495,7 +495,7 @@ 
     {
         $ret = array();
         foreach ($migration as $TableInfo) {
-            $ret[] = "        '" . 'Plugin\\' . $pluginCode . '\Entity\\' . ucfirst($this->getShortClassName($TableInfo->getName())) . "'";
+            $ret[] = "        '".'Plugin\\'.$pluginCode.'\Entity\\'.ucfirst($this->getShortClassName($TableInfo->getName()))."'";
         }
         return $ret;
     }
@@ -512,14 +512,14 @@ 
             $nameFormated = $this->getShortClassName($TableInfo->getName());
             $tmp = array();
             $tmp[] = PHP_EOL;
-            $tmp[] = '    public function createTable' . ucfirst($nameFormated) . '(Schema $schema)';
+            $tmp[] = '    public function createTable'.ucfirst($nameFormated).'(Schema $schema)';
             $tmp[] = '    {';
-            $tmp[] = '        $table = $schema->createTable(\'' . $TableInfo->getName() . '\');';
+            $tmp[] = '        $table = $schema->createTable(\''.$TableInfo->getName().'\');';
             $columns = $TableInfo->getColumns();
             foreach ($columns as $column) {
 
                 $typeName = $column->getType()->getName();
-                $tmp[] = '        $table->addColumn(\'' . $column->getName() . '\', \'' . $typeName . '\', array(';
+                $tmp[] = '        $table->addColumn(\''.$column->getName().'\', \''.$typeName.'\', array(';
                 $param = array();
                 if ($column->getNotNull()) {
                     $param['notnull'] = 'true';
@@ -530,16 +530,16 @@ 
                     $param['unsigned'] = 'true';
                 }
                 if ($column->getDefault()) {
-                    $param['default'] = '\'' . $column->getDefault() . '\'';
+                    $param['default'] = '\''.$column->getDefault().'\'';
                 }
                 if ($column->getAutoincrement()) {
                     $param['autoincrement'] = 'true';
                 }
                 if ($column->getComment()) {
-                    $param['comment'] = '\'' . str_replace('\'', '\\\'', $column->getComment()) . '\'';
+                    $param['comment'] = '\''.str_replace('\'', '\\\'', $column->getComment()).'\'';
                 }
                 if ($column->getLength()) {
-                    $param['length'] = '\'' . $column->getLength() . '\'';
+                    $param['length'] = '\''.$column->getLength().'\'';
                 }
 
                 if ($typeName == 'decimal') {
@@ -547,7 +547,7 @@ 
                     $param['scale'] = $column->getScale();
                 }
                 foreach ($param as $parKey => $parVal) {
-                    $tmp[] = '            \'' . $parKey . '\' => ' . $parVal . ',';
+                    $tmp[] = '            \''.$parKey.'\' => '.$parVal.',';
                 }
                 $tmp[] = '        ));';
             }
@@ -557,20 +557,20 @@ 
                 if ($index->isPrimary()) {
                     $tmpCol = $index->getColumns();
                     foreach ($tmpCol as $colName) {
-                        $tmp[] = '        $table->setPrimaryKey(array(\'' . $colName . '\'));';
+                        $tmp[] = '        $table->setPrimaryKey(array(\''.$colName.'\'));';
                         break;
                     }
                 } else {
                     $tmp[] = '        $columnNames = array();';
                     foreach ($index->getColumns() as $IdentName) {
-                        $tmp[] = '        $columnNames[] = \'' . $IdentName . '\';';
+                        $tmp[] = '        $columnNames[] = \''.$IdentName.'\';';
                     }
-                    $tmp[] = '        $indexName = \'' . $index->getName() . '\';';
-                    $tmp[] = '        $options = ' . var_export($index->getOptions(), true) . ';';
+                    $tmp[] = '        $indexName = \''.$index->getName().'\';';
+                    $tmp[] = '        $options = '.var_export($index->getOptions(), true).';';
                     if ($index->isUnique()) {
                         $tmp[] = '        $table->addUniqueIndex($columnNames, $indexName, $options);';
                     } else {
-                        $tmp[] = '        $flags = ' . var_export($index->getFlags(), true) . ';';
+                        $tmp[] = '        $flags = '.var_export($index->getFlags(), true).';';
                         $tmp[] = '        $table->addIndex($columnNames, $indexName,$flags, $options);';
                     }
                 }
@@ -587,7 +587,7 @@ 
     {
         $ret = array();
         foreach ($migration as $TableInfo) {
-            $ret[] = '            $schema->dropTable(\'' . $TableInfo->getName() . '\');';
+            $ret[] = '            $schema->dropTable(\''.$TableInfo->getName().'\');';
         }
 
         return $ret;

src/Eccube/Command/PluginCommand/PluginGenerator.php

Spacing +62 added lines, -62 removed lines

@@ -50,7 +50,7 @@ 
     {
         $this->output->writeln('------------------------------------------------------');
         $this->output->writeln('---Plugin Generator');
-        $this->output->writeln('---[*]You can exit from Console Application, by typing ' . self::STOP_PROCESS . ' instead of typing another word.');
+        $this->output->writeln('---[*]You can exit from Console Application, by typing '.self::STOP_PROCESS.' instead of typing another word.');
         $this->output->writeln('------------------------------------------------------');
         $this->output->writeln('');
     }
@@ -101,7 +101,7 @@ 
                 'label' => '[+]Old version support: ',
                 'value' => null,
                 'name' => '[+]Do you want to support old versions too? [y/n]',
-                'show' => array(1 => 'Yes' ,0 => 'No'),
+                'show' => array(1 => 'Yes', 0 => 'No'),
                 'validation' => array(
                     'isRequired' => true,
                     'choice' => array('y' => 1, 'n' => 0)
@@ -148,13 +148,13 @@ 
             $this->events = array();
             $routeEvents = array();
             if ($this->paramList['supportFlag']['value']) {
-                $this->events = include $this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/eventsList.php';
+                $this->events = include $this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/eventsList.php';
                 $routeEvents['eccube.event.controller.__route__.before'] = 'Controller__route__Before';
                 $routeEvents['eccube.event.controller.__route__.after'] = 'Controller__route__After';
                 $routeEvents['eccube.event.controller.__route__.finish'] = 'Controller__route__Finish';
                 $routeEvents['eccube.event.render.__route__.before'] = 'Render__route__Before';
             }
-            $this->events += include $this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/eventsListNew.php';
+            $this->events += include $this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/eventsListNew.php';
 
             $routeEvents['eccube.event.route.__route__.request'] = 'Route__route__Request';
             $routeEvents['eccube.event.route.__route__.controller'] = 'Route__route__Controller';
@@ -214,11 +214,11 @@ 
         $config['code'] = $code;
         $config['version'] = $paramList['version']['value'];
         if (!empty($paramList['hookPoints']['value'])) {
-            $config['event'] = $code . 'Event';
+            $config['event'] = $code.'Event';
         }
-        $config['service'] = array($code . 'ServiceProvider');
+        $config['service'] = array($code.'ServiceProvider');
 
-        $codePath = $this->app['config']['root_dir'] . '/app/Plugin/' . $code;
+        $codePath = $this->app['config']['root_dir'].'/app/Plugin/'.$code;
 
         $file = new Filesystem();
         $file->mkdir($codePath);
@@ -228,7 +228,7 @@ 
             $fsList['dir'][$codePath] = false;
         }
 
-        $srcPath = $codePath . '/config.yml';
+        $srcPath = $codePath.'/config.yml';
         file_put_contents($srcPath, Yaml::dump($config));
         if (is_file($srcPath)) {
             $fsList['file'][$srcPath] = true;
@@ -240,7 +240,7 @@ 
         $year = date('Y');
 
         // PluginManager
-        $pluginFileBefore = file_get_contents($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/PluginManager.php');
+        $pluginFileBefore = file_get_contents($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/PluginManager.php');
         $from = '/\[code\]/';
         $pluginFileAfter = preg_replace($from, $code, $pluginFileBefore);
         $from = '/\[author\]/';
@@ -248,7 +248,7 @@ 
         $from = '/\[year\]/';
         $pluginFileAfter = preg_replace($from, $year, $pluginFileAfter);
 
-        $srcPath = $codePath . '/PluginManager.php';
+        $srcPath = $codePath.'/PluginManager.php';
         file_put_contents($srcPath, $pluginFileAfter);
         if (is_file($srcPath)) {
             $fsList['file'][$srcPath] = true;
@@ -257,7 +257,7 @@ 
         }
 
         // ServiceProvider
-        $pluginFileBefore = file_get_contents($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/ServiceProvider.php');
+        $pluginFileBefore = file_get_contents($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/ServiceProvider.php');
         $from = '/\[code\]/';
         $pluginFileAfter = preg_replace($from, $code, $pluginFileBefore);
         $from = '/\[author\]/';
@@ -265,14 +265,14 @@ 
         $from = '/\[year\]/';
         $pluginFileAfter = preg_replace($from, $year, $pluginFileAfter);
 
-        $file->mkdir($codePath . '/ServiceProvider');
-        if (is_dir($codePath . '/ServiceProvider')) {
-            $fsList['dir'][$codePath . '/ServiceProvider'] = true;
+        $file->mkdir($codePath.'/ServiceProvider');
+        if (is_dir($codePath.'/ServiceProvider')) {
+            $fsList['dir'][$codePath.'/ServiceProvider'] = true;
         } else {
-            $fsList['dir'][$codePath . '/ServiceProvider'] = false;
+            $fsList['dir'][$codePath.'/ServiceProvider'] = false;
         }
 
-        $srcPath = $codePath . '/ServiceProvider/' . $code . 'ServiceProvider.php';
+        $srcPath = $codePath.'/ServiceProvider/'.$code.'ServiceProvider.php';
         file_put_contents($srcPath, $pluginFileAfter);
         if (is_file($srcPath)) {
             $fsList['file'][$srcPath] = true;
@@ -281,7 +281,7 @@ 
         }
 
         // ConfigController
-        $pluginFileBefore = file_get_contents($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/ConfigController.php');
+        $pluginFileBefore = file_get_contents($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/ConfigController.php');
         $from = '/\[code\]/';
         $pluginFileAfter = preg_replace($from, $code, $pluginFileBefore);
         $from = '/\[author\]/';
@@ -291,14 +291,14 @@ 
         $from = '/\[code_name\]/';
         $pluginFileAfter = preg_replace($from, mb_strtolower($code), $pluginFileAfter);
 
-        $file->mkdir($codePath . '/Controller');
-        if (is_dir($codePath . '/Controller')) {
-            $fsList['dir'][$codePath . '/Controller'] = true;
+        $file->mkdir($codePath.'/Controller');
+        if (is_dir($codePath.'/Controller')) {
+            $fsList['dir'][$codePath.'/Controller'] = true;
         } else {
-            $fsList['dir'][$codePath . '/Controller'] = false;
+            $fsList['dir'][$codePath.'/Controller'] = false;
         }
 
-        $srcPath = $codePath . '/Controller/ConfigController.php';
+        $srcPath = $codePath.'/Controller/ConfigController.php';
         file_put_contents($srcPath, $pluginFileAfter);
         if (is_file($srcPath)) {
             $fsList['file'][$srcPath] = true;
@@ -307,7 +307,7 @@ 
         }
 
         // Controller
-        $pluginFileBefore = file_get_contents($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/Controller.php');
+        $pluginFileBefore = file_get_contents($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/Controller.php');
         $from = '/\[code\]/';
         $pluginFileAfter = preg_replace($from, $code, $pluginFileBefore);
         $from = '/\[author\]/';
@@ -317,7 +317,7 @@ 
         $from = '/\[code_name\]/';
         $pluginFileAfter = preg_replace($from, mb_strtolower($code), $pluginFileAfter);
 
-        $srcPath = $codePath . '/Controller/' . $code . 'Controller.php';
+        $srcPath = $codePath.'/Controller/'.$code.'Controller.php';
         file_put_contents($srcPath, $pluginFileAfter);
         if (is_file($srcPath)) {
             $fsList['file'][$srcPath] = true;
@@ -326,7 +326,7 @@ 
         }
 
         // Form
-        $pluginFileBefore = file_get_contents($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/ConfigType.php');
+        $pluginFileBefore = file_get_contents($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/ConfigType.php');
         $from = '/\[code\]/';
         $pluginFileAfter = preg_replace($from, $code, $pluginFileBefore);
         $from = '/\[author\]/';
@@ -336,15 +336,15 @@ 
         $from = '/\[code_name\]/';
         $pluginFileAfter = preg_replace($from, mb_strtolower($code), $pluginFileAfter);
 
-        $file->mkdir($codePath . '/Form/Type');
-        if (is_dir($codePath . '/Form/Type')) {
-            $fsList['dir'][$codePath . '/Form/Type'] = true;
+        $file->mkdir($codePath.'/Form/Type');
+        if (is_dir($codePath.'/Form/Type')) {
+            $fsList['dir'][$codePath.'/Form/Type'] = true;
         } else {
-            $fsList['dir'][$codePath . '/Form/Type'] = false;
+            $fsList['dir'][$codePath.'/Form/Type'] = false;
         }
 
-        $srcPath = $codePath . '/Form/Type/' . $code . 'ConfigType.php';
-        file_put_contents($codePath . '/Form/Type/' . $code . 'ConfigType.php', $pluginFileAfter);
+        $srcPath = $codePath.'/Form/Type/'.$code.'ConfigType.php';
+        file_put_contents($codePath.'/Form/Type/'.$code.'ConfigType.php', $pluginFileAfter);
         if (is_file($srcPath)) {
             $fsList['file'][$srcPath] = true;
         } else {
@@ -352,18 +352,18 @@ 
         }
 
         // Twig
-        $pluginFileBefore = file_get_contents($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/config.twig');
+        $pluginFileBefore = file_get_contents($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/config.twig');
         $from = '/\[code\]/';
         $pluginFileAfter = preg_replace($from, $code, $pluginFileBefore);
 
-        $file->mkdir($codePath . '/Resource/template/admin');
-        if (is_dir($codePath . '/Resource/template/admin')) {
-            $fsList['dir'][$codePath . '/Resource/template/admin'] = true;
+        $file->mkdir($codePath.'/Resource/template/admin');
+        if (is_dir($codePath.'/Resource/template/admin')) {
+            $fsList['dir'][$codePath.'/Resource/template/admin'] = true;
         } else {
-            $fsList['dir'][$codePath . '/Resource/template/admin'] = false;
+            $fsList['dir'][$codePath.'/Resource/template/admin'] = false;
         }
 
-        $srcPath = $codePath . '/Resource/template/admin/config.twig';
+        $srcPath = $codePath.'/Resource/template/admin/config.twig';
         file_put_contents($srcPath, $pluginFileAfter);
         if (is_file($srcPath)) {
             $fsList['file'][$srcPath] = true;
@@ -372,18 +372,18 @@ 
         }
 
         // index.twig
-        $pluginFileBefore = file_get_contents($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/index.twig');
+        $pluginFileBefore = file_get_contents($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/index.twig');
         $from = '/\[code\]/';
         $pluginFileAfter = preg_replace($from, $code, $pluginFileBefore);
 
-        $file->mkdir($codePath . '/Resource/template/admin');
-        if (is_dir($codePath . '/Resource/template/admin')) {
-            $fsList['dir'][$codePath . '/Resource/template/admin'] = true;
+        $file->mkdir($codePath.'/Resource/template/admin');
+        if (is_dir($codePath.'/Resource/template/admin')) {
+            $fsList['dir'][$codePath.'/Resource/template/admin'] = true;
         } else {
-            $fsList['dir'][$codePath . '/Resource/template/admin'] = false;
+            $fsList['dir'][$codePath.'/Resource/template/admin'] = false;
         }
 
-        $srcPath = $codePath . '/Resource/template/index.twig';
+        $srcPath = $codePath.'/Resource/template/index.twig';
         file_put_contents($srcPath, $pluginFileAfter);
         if (is_file($srcPath)) {
             $fsList['file'][$srcPath] = true;
@@ -398,8 +398,8 @@ 
         $events = $paramList['events']['value'];
         if (count($events) > 0) {
             foreach ($events as $eventKey => $eventConst) {
-                $onEvents[$eventKey] = array(array('on' . $eventConst . ', NORMAL'));
-                $onFunctions[] = 'on' . $eventConst;
+                $onEvents[$eventKey] = array(array('on'.$eventConst.', NORMAL'));
+                $onFunctions[] = 'on'.$eventConst;
             }
         }
 
@@ -407,14 +407,14 @@ 
         $hookPoints = $paramList['hookPoints']['value'];
         if (count($hookPoints)) {
             foreach ($hookPoints as $hookKey => $hookConst) {
-                $onName = 'on' . join(array_map('ucfirst', explode('_', strtolower($hookConst))));
-                $onEvents[$hookKey] = array(array($onName . ', NORMAL'));
+                $onName = 'on'.join(array_map('ucfirst', explode('_', strtolower($hookConst))));
+                $onEvents[$hookKey] = array(array($onName.', NORMAL'));
                 $onFunctions[] = $onName;
             }
         }
 
         if (count($onEvents)) {
-            $srcPath = $codePath . '/event.yml';
+            $srcPath = $codePath.'/event.yml';
             file_put_contents($srcPath, str_replace('\'', '', Yaml::dump($onEvents)));
             if (is_file($srcPath)) {
                 $fsList['file'][$srcPath] = true;
@@ -422,7 +422,7 @@ 
                 $fsList['file'][$srcPath] = false;
             }
 
-            $pluginFileBefore = file_get_contents($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/EventHookpoint2.php');
+            $pluginFileBefore = file_get_contents($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/EventHookpoint2.php');
 
             // Event
             $from = '/\[code\]/';
@@ -434,11 +434,11 @@ 
 
             $functions = '';
             foreach ($onFunctions as $functionName) {
-                $functions .= "    public function " . $functionName . "(EventArgs \$event)\n    {\n    }\n\n";
+                $functions .= "    public function ".$functionName."(EventArgs \$event)\n    {\n    }\n\n";
             }
             $from = '/\[hookpoint_function\]/';
             $pluginFileAfter = preg_replace($from, $functions, $pluginFileAfter);
-            $srcPath = $codePath . '/' . $code . 'Event.php';
+            $srcPath = $codePath.'/'.$code.'Event.php';
             file_put_contents($srcPath, $pluginFileAfter);
             if (is_file($srcPath)) {
                 $fsList['file'][$srcPath] = true;
@@ -452,9 +452,9 @@ 
         $config['name'] = $paramList['pluginName']['value'];
         $config['code'] = $code;
         $config['version'] = $paramList['version']['value'];
-        $config['event'] = $code . 'Event';
-        $config['service'] = array($code . 'ServiceProvider');
-        $srcPath = $codePath . '/config.yml';
+        $config['event'] = $code.'Event';
+        $config['service'] = array($code.'ServiceProvider');
+        $srcPath = $codePath.'/config.yml';
         file_put_contents($srcPath, Yaml::dump($config));
         if (is_file($srcPath)) {
             $fsList['file'][$srcPath] = true;
@@ -463,8 +463,8 @@ 
         }
 
         // LICENSE
-        $srcPath = $codePath . '/LICENSE';
-        $file->copy($this->app['config']['root_dir'] . '/src/Eccube/Command/PluginCommand/Resource/LICENSE', $srcPath);
+        $srcPath = $codePath.'/LICENSE';
+        $file->copy($this->app['config']['root_dir'].'/src/Eccube/Command/PluginCommand/Resource/LICENSE', $srcPath);
         if (is_file($srcPath)) {
             $fsList['file'][$srcPath] = true;
         } else {
@@ -493,7 +493,7 @@ 
             $this->output->writeln('');
             $this->output->writeln(' this files and folders were created.');
             foreach ($dirFileOk as $path) {
-                $this->output->writeln('<info> - ' . $path . '</info>');
+                $this->output->writeln('<info> - '.$path.'</info>');
             }
         }
 
@@ -501,7 +501,7 @@ 
             $this->output->writeln('');
             $this->output->writeln(' this files and folders was not created.');
             foreach ($dirFileOk as $path) {
-                $this->output->writeln('<error> - ' . $path . '</error>');
+                $this->output->writeln('<error> - '.$path.'</error>');
             }
         }
     }
@@ -524,9 +524,9 @@ 
         $this->output->writeln('');
         $this->output->writeln('[+]Database');
         if ($Plugin->getId()) {
-            $this->output->writeln('<info> Plugin information was added to table [DB.Plugin] (id=' . $Plugin->getId() . ')</info>');
+            $this->output->writeln('<info> Plugin information was added to table [DB.Plugin] (id='.$Plugin->getId().')</info>');
         } else {
-            $this->output->writeln('<error> there was a problem inserting plugin information to table [DB.Plugin] (id=' . $Plugin->getId() . ')</error>');
+            $this->output->writeln('<error> there was a problem inserting plugin information to table [DB.Plugin] (id='.$Plugin->getId().')</error>');
         }
 
         $hookPoints = $paramList['hookPoints']['value'];
@@ -537,7 +537,7 @@ 
         $eventCount = 0;
         foreach ($hookPoints as $hookKey => $hookConst) {
             $PluginEventHandler = new PluginEventHandler();
-            $functionName = 'on' . join(array_map('ucfirst', explode('_', strtolower($hookConst))));
+            $functionName = 'on'.join(array_map('ucfirst', explode('_', strtolower($hookConst))));
             $PluginEventHandler->setPlugin($Plugin)
                 ->setEvent($hookKey)
                 ->setPriority($this->app['eccube.repository.plugin_event_handler']->calcNewPriority($hookKey, $functionName))
@@ -550,7 +550,7 @@ 
         $this->app['orm.em']->flush();
         if ($eventCount) {
             $this->output->writeln('');
-            $this->output->writeln('<info> Plugin information was added to table [DB.PluginEventHandler] (inserts number=' . $eventCount . ') </info>');
+            $this->output->writeln('<info> Plugin information was added to table [DB.PluginEventHandler] (inserts number='.$eventCount.') </info>');
         }
     }
 }

src/Eccube/Command/PluginCommand/AbstractPluginGenerator.php

Spacing +6 added lines, -6 removed lines

@@ -127,7 +127,7 @@ 
             if (is_array($params['value'])) {
                 $this->output->writeln($params['label']);
                 foreach ($params['value'] as $keys => $val) {
-                    $this->output->writeln('<info>  ' . $keys . '</info>');
+                    $this->output->writeln('<info>  '.$keys.'</info>');
                 }
             } else {
                 if (isset($params['show'])) {
@@ -135,7 +135,7 @@ 
                 } else {
                     $disp = $params['value'];
                 }
-                $this->output->writeln($params['label'] . ' <info>' . $disp . '</info>');
+                $this->output->writeln($params['label'].' <info>'.$disp.'</info>');
             }
         }
         $this->output->writeln('');
@@ -165,7 +165,7 @@ 
         $this->nestingLevel--;
         
         $this->output->writeln($params['name']);
-        $Question = new Question('<comment>Input' . self::INPUT_OPEN . $params['no'] . self::INPUT_CLOSE . ' : </comment>', '');
+        $Question = new Question('<comment>Input'.self::INPUT_OPEN.$params['no'].self::INPUT_CLOSE.' : </comment>', '');
         $value = $this->dialog->ask($this->input, $this->output, $Question);
         $value = trim($value);
         if ($value === self::STOP_PROCESS) {
@@ -198,7 +198,7 @@ 
                     $params['value'][$value] = $row[$value];
                     $this->output->writeln('<info>--- your entry list</info>');
                     foreach ($params['value'] as $subKey => $node) {
-                        $this->output->writeln('<info> - ' . $subKey . '</info>');
+                        $this->output->writeln('<info> - '.$subKey.'</info>');
                     }
                     $this->output->writeln('');
                     $this->output->writeln('--- Press Enter to move to the next step ---');
@@ -210,7 +210,7 @@ 
                     foreach ($row as $eventKey => $eventConst) {
                         if (strpos($eventKey, $value) !== false || strpos($eventConst, $value) !== false) {
                             if (count($searchList) >= $max) {
-                                $searchList['-- there are more then ' . $max . ''] = '';
+                                $searchList['-- there are more then '.$max.''] = '';
                                 break;
                             }
                             $searchList[$eventKey] = $eventConst;
@@ -221,7 +221,7 @@ 
                         $this->output->writeln('--- there are more then one search result');
                     }
                     foreach ($searchList as $subKey => $node) {
-                        $this->output->writeln(' - ' . $subKey);
+                        $this->output->writeln(' - '.$subKey);
                     }
 
                     if (!empty($searchList)) {

src/Eccube/Controller/Install/InstallController.php

Spacing +51 added lines, -51 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) {
@@ -348,7 +348,7 @@ 
                     //http://php.net/manual/en/migration71.deprecated.php
                     continue;
                 }
-                $app->addWarning('[推奨] ' . $module . ' 拡張モジュールが有効になっていません。', 'install');
+                $app->addWarning('[推奨] '.$module.' 拡張モジュールが有効になっていません。', 'install');
             }
         }
 
@@ -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.'/',
         ));
     }
 }

src/Eccube/Controller/Admin/Product/ProductController.php

Spacing +14 added lines, -14 removed lines

@@ -202,7 +202,7 @@ 
                     }
 
                     $extension = $image->getClientOriginalExtension();
-                    $filename = date('mdHis') . uniqid('_') . '.' . $extension;
+                    $filename = date('mdHis').uniqid('_').'.'.$extension;
                     $image->move($app['config']['image_temp_realdir'], $filename);
                     $files[] = $filename;
                 }
@@ -278,7 +278,7 @@ 
         $form = $builder->getForm();
 
         if (!$has_class) {
-            $ProductClass->setStockUnlimited((boolean)$ProductClass->getStockUnlimited());
+            $ProductClass->setStockUnlimited((boolean) $ProductClass->getStockUnlimited());
             $form['class']->setData($ProductClass);
         }
 
@@ -364,8 +364,8 @@ 
                 $Categories = $form->get('Category')->getData();
                 $categoriesIdList = array();
                 foreach ($Categories as $Category) {
-                    foreach($Category->getPath() as $ParentCategory){
-                        if (!isset($categoriesIdList[$ParentCategory->getId()])){
+                    foreach ($Category->getPath() as $ParentCategory) {
+                        if (!isset($categoriesIdList[$ParentCategory->getId()])) {
                             $ProductCategory = $this->createProductCategory($Product, $ParentCategory, $count);
                             $app['orm.em']->persist($ProductCategory);
                             $count++;
@@ -374,7 +374,7 @@ 
                             $categoriesIdList[$ParentCategory->getId()] = true;
                         }
                     }
-                    if (!isset($categoriesIdList[$Category->getId()])){
+                    if (!isset($categoriesIdList[$Category->getId()])) {
                         $ProductCategory = $this->createProductCategory($Product, $Category, $count);
                         $app['orm.em']->persist($ProductCategory);
                         $count++;
@@ -396,7 +396,7 @@ 
                     $app['orm.em']->persist($ProductImage);
 
                     // 移動
-                    $file = new File($app['config']['image_temp_realdir'] . '/' . $add_image);
+                    $file = new File($app['config']['image_temp_realdir'].'/'.$add_image);
                     $file->move($app['config']['image_save_realdir']);
                 }
 
@@ -416,7 +416,7 @@ 
 
                     // 削除
                     $fs = new Filesystem();
-                    $fs->remove($app['config']['image_save_realdir'] . '/' . $delete_image);
+                    $fs->remove($app['config']['image_save_realdir'].'/'.$delete_image);
                 }
                 $app['orm.em']->persist($Product);
                 $app['orm.em']->flush();
@@ -574,7 +574,7 @@ 
                 foreach ($deleteImages as $deleteImage) {
                     try {
                         $fs = new Filesystem();
-                        $fs->remove($app['config']['image_save_realdir'] . '/' . $deleteImage);
+                        $fs->remove($app['config']['image_save_realdir'].'/'.$deleteImage);
                     } catch (\Exception $e) {
                         // エラーが発生しても無視する
                     }
@@ -644,10 +644,10 @@ 
 
                     // 画像ファイルを新規作成
                     $extension = pathinfo($Image->getFileName(), PATHINFO_EXTENSION);
-                    $filename = date('mdHis') . uniqid('_') . '.' . $extension;
+                    $filename = date('mdHis').uniqid('_').'.'.$extension;
                     try {
                         $fs = new Filesystem();
-                        $fs->copy($app['config']['image_save_realdir'] . '/' . $Image->getFileName(), $app['config']['image_save_realdir'] . '/' . $filename);
+                        $fs->copy($app['config']['image_save_realdir'].'/'.$Image->getFileName(), $app['config']['image_save_realdir'].'/'.$filename);
                     } catch (\Exception $e) {
                         // エラーが発生しても無視する
                     }
@@ -722,7 +722,7 @@ 
         $em->getConfiguration()->setSQLLogger(null);
 
         $response = new StreamedResponse();
-        $response->setCallback(function () use ($app, $request) {
+        $response->setCallback(function() use ($app, $request) {
 
             // CSV種別を元に初期化.
             $app['eccube.service.csv.export']->initCsvType(CsvType::CSV_TYPE_PRODUCT);
@@ -746,7 +746,7 @@ 
 
             // データ行の出力.
             $app['eccube.service.csv.export']->setExportQueryBuilder($qb);
-            $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) {
+            $app['eccube.service.csv.export']->exportData(function($entity, $csvService) {
 
                 $Csvs = $csvService->getCsvs();
 
@@ -778,9 +778,9 @@ 
         });
 
         $now = new \DateTime();
-        $filename = 'product_' . $now->format('YmdHis') . '.csv';
+        $filename = 'product_'.$now->format('YmdHis').'.csv';
         $response->headers->set('Content-Type', 'application/octet-stream');
-        $response->headers->set('Content-Disposition', 'attachment; filename=' . $filename);
+        $response->headers->set('Content-Disposition', 'attachment; filename='.$filename);
         $response->send();
 
         log_info('商品CSV出力ファイル名', array($filename));