chihiro-adachi / 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/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()) {
@@ -217,7 +217,7 @@ 
 
     private function toCamelCase($name)
     {
-        return lcfirst(implode('', array_map(function ($name) {
+        return lcfirst(implode('', array_map(function($name) {
                     return ucfirst($name);
                 }, explode('_', $name))));
     }
@@ -260,43 +260,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;
@@ -306,7 +306,7 @@ 
         $ret .= PHP_EOL;
         $ret .= join(PHP_EOL, $setMethods);
         $ret .= PHP_EOL;
-        $ret .= '}' . PHP_EOL;
+        $ret .= '}'.PHP_EOL;
 
 
         return $ret;
@@ -317,16 +317,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';
@@ -410,10 +410,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
                 ),
@@ -431,24 +431,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[] = '}';
@@ -459,21 +459,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);
@@ -496,7 +496,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;
     }
@@ -513,14 +513,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';
@@ -531,16 +531,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') {
@@ -548,7 +548,7 @@ 
                     $param['scale'] = $column->getScale();
                 }
                 foreach ($param as $parKey => $parVal) {
-                    $tmp[] = '            \'' . $parKey . '\' => ' . $parVal . ',';
+                    $tmp[] = '            \''.$parKey.'\' => '.$parVal.',';
                 }
                 $tmp[] = '        ));';
             }
@@ -558,20 +558,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);';
                     }
                 }
@@ -588,7 +588,7 @@ 
     {
         $ret = array();
         foreach ($migration as $TableInfo) {
-            $ret[] = '            $schema->dropTable(\'' . $TableInfo->getName() . '\');';
+            $ret[] = '            $schema->dropTable(\''.$TableInfo->getName().'\');';
         }
 
         return $ret;

src/Eccube/Command/PluginCommand/EntityFromYamlGenerator.php

Indentation +1 added lines, -1 removed lines

@@ -160,7 +160,7 @@
         $this->paramList = array(
             'pluginCode' => array(
                 'no' => 1,
-                 'label' => '[+]Plugin Code: ',
+                    'label' => '[+]Plugin Code: ',
                 'value' => null,
                 'name' => '[+]Please enter Plugin Name (only pascal case letters numbers are allowed)',
                 'validation' => array(

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/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/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/ServiceProvider/LogServiceProvider.php

Spacing +7 added lines, -7 removed lines

@@ -20,17 +20,17 @@ 
         $app->register(new \Silex\Provider\MonologServiceProvider());
 
         // Log
-        $app['eccube.logger'] = $app->share(function ($app) {
+        $app['eccube.logger'] = $app->share(function($app) {
             return new Logger($app);
         });
 
         // ヘルパー作成
-        $app['eccube.monolog.helper'] = $app->share(function ($app) {
+        $app['eccube.monolog.helper'] = $app->share(function($app) {
             return new LogHelper($app);
         });
 
         // ログクラス作成ファクトリー
-        $app['eccube.monolog.factory'] = $app->protect(function (array $channelValues) use ($app) {
+        $app['eccube.monolog.factory'] = $app->protect(function(array $channelValues) use ($app) {
 
             $log = new $app['monolog.logger.class']($channelValues['name']);
 
@@ -45,7 +45,7 @@ 
         // monologの設定は除外
         unset($channels['monolog']);
         foreach ($channels as $channel => $channelValues) {
-            $app['monolog.logger.'.$channel] = $app->share(function ($app) use ($channelValues) {
+            $app['monolog.logger.'.$channel] = $app->share(function($app) use ($channelValues) {
                 return $app['eccube.monolog.factory']($channelValues);
             });
         }
@@ -53,15 +53,15 @@ 
         // MonologServiceProviderで定義されているmonolog.handlerの置換
         $channelValues = $app['config']['log']['channel']['monolog'];
         $app['monolog.name'] = $channelValues['name'];
-        $app['monolog.handler'] = $app->share(function ($app) use ($channelValues) {
+        $app['monolog.handler'] = $app->share(function($app) use ($channelValues) {
             return $app['eccube.monolog.helper']->getHandler($channelValues);
         });
 
-        $app['eccube.monolog.listener'] = $app->share(function () use ($app) {
+        $app['eccube.monolog.listener'] = $app->share(function() use ($app) {
             return new LogListener($app['eccube.logger']);
         });
 
-        $app['listener.requestdump'] = $app->share(function ($app) {
+        $app['listener.requestdump'] = $app->share(function($app) {
             return new \Eccube\EventListener\RequestDumpListener($app);
         });
     }

src/Eccube/Doctrine/ORM/Tools/Pagination/RowNumberOverFunction.php

Spacing +2 added lines, -2 removed lines

@@ -44,9 +44,9 @@
      */
     public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
     {
-        return 'ROW_NUMBER() OVER(' . trim($sqlWalker->walkOrderByClause(
+        return 'ROW_NUMBER() OVER('.trim($sqlWalker->walkOrderByClause(
             $this->orderByClause
-        )) . ')';
+        )).')';
     }
 
     /**

src/Eccube/Doctrine/ORM/Tools/Pagination/CountWalker.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
         }
 
         $pathExpression = new PathExpression(
-            PathExpression::TYPE_STATE_FIELD | PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION, $rootAlias,
+            PathExpression::TYPE_STATE_FIELD|PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION, $rootAlias,
             $identifierFieldName
         );
         $pathExpression->type = $pathType;

src/Eccube/Doctrine/ORM/Tools/Pagination/WhereInWalker.php

Spacing +2 added lines, -2 removed lines

@@ -89,7 +89,7 @@ 
             $pathType = PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION;
         }
 
-        $pathExpression       = new PathExpression(PathExpression::TYPE_STATE_FIELD | PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION, $rootAlias, $identifierFieldName);
+        $pathExpression       = new PathExpression(PathExpression::TYPE_STATE_FIELD|PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION, $rootAlias, $identifierFieldName);
         $pathExpression->type = $pathType;
 
         $count = $this->_getQuery()->getHint(self::HINT_PAGINATOR_ID_COUNT);
@@ -100,7 +100,7 @@ 
                 array($pathExpression)
             );
             $expression = new InExpression($arithmeticExpression);
-            $expression->literals[] = new InputParameter(":" . self::PAGINATOR_ID_ALIAS);
+            $expression->literals[] = new InputParameter(":".self::PAGINATOR_ID_ALIAS);
 
         } else {
             $expression = new NullComparisonExpression($pathExpression);