EC-CUBE / ec-cube

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/LimitSubqueryWalker.php

Spacing +4 added lines, -4 removed lines

@@ -93,7 +93,7 @@ 
         );
 
         $pathExpression = new PathExpression(
-            PathExpression::TYPE_STATE_FIELD | PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION,
+            PathExpression::TYPE_STATE_FIELD|PathExpression::TYPE_SINGLE_VALUED_ASSOCIATION,
             $rootAlias,
             $identifier
         );
@@ -104,13 +104,13 @@ 
 
         if (isset($AST->orderByClause)) {
             foreach ($AST->orderByClause->orderByItems as $item) {
-                if ( ! $item->expression instanceof PathExpression) {
+                if (!$item->expression instanceof PathExpression) {
                     continue;
                 }
                 
                 $AST->selectClause->selectExpressions[] = new SelectExpression(
                     $this->createSelectExpressionItem($item->expression),
-                    '_dctrn_ord' . $this->_aliasCounter++
+                    '_dctrn_ord'.$this->_aliasCounter++
                 );
             }
         }
@@ -145,7 +145,7 @@ 
                     && isset($queryComponents[$expression->identificationVariable])) {
                     $queryComponent = $queryComponents[$expression->identificationVariable];
                     if (isset($queryComponent['parent'])
-                        && $queryComponent['relation']['type'] & ClassMetadataInfo::TO_MANY) {
+                        && $queryComponent['relation']['type']&ClassMetadataInfo::TO_MANY) {
                         throw new \RuntimeException("Cannot select distinct identifiers from query with LIMIT and ORDER BY on a column from a fetch joined to-many association. Use output walkers.");
                     }
                 }

Unused Use Statements -1 removed lines

@@ -20,7 +20,6 @@
 
 use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
-use Doctrine\ORM\ORMException;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\Query\AST\Functions\IdentityFunction;
 use Doctrine\ORM\Query\AST\PathExpression;

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/LimitSubqueryOutputWalker.php

Spacing +7 added lines, -7 removed lines

@@ -209,8 +209,8 @@ 
         $sqlIdentifier = $this->getSQLIdentifier($AST);
 
         if ($hasOrderBy) {
-            $orderGroupBy = ' GROUP BY ' . implode(', ', $sqlIdentifier);
-            $sqlIdentifier[] = 'MIN(' . $this->walkResultVariable('dctrn_rownum') . ') AS dctrn_minrownum';
+            $orderGroupBy = ' GROUP BY '.implode(', ', $sqlIdentifier);
+            $sqlIdentifier[] = 'MIN('.$this->walkResultVariable('dctrn_rownum').') AS dctrn_minrownum';
         }
 
         // Build the counter query
@@ -221,7 +221,7 @@ 
         );
 
         if ($hasOrderBy) {
-            $sql .= $orderGroupBy . $outerOrderBy;
+            $sql .= $orderGroupBy.$outerOrderBy;
         }
 
         // Apply the limit and offset.
@@ -368,7 +368,7 @@ 
     {
         // If the sql statement has an order by clause, we need to wrap it in a new select distinct
         // statement
-        if (! $orderByClause instanceof OrderByClause) {
+        if (!$orderByClause instanceof OrderByClause) {
             return $sql;
         }
 
@@ -404,7 +404,7 @@ 
             = array();
 
         // Generate DQL alias -> SQL table alias mapping
-        foreach(array_keys($this->rsm->aliasMap) as $dqlAlias) {
+        foreach (array_keys($this->rsm->aliasMap) as $dqlAlias) {
             $dqlAliasToClassMap[$dqlAlias] = $class = $this->queryComponents[$dqlAlias]['metadata'];
             $dqlAliasToSqlTableAliasMap[$dqlAlias] = $this->getSQLTableAlias($class->getTableName(), $dqlAlias);
         }
@@ -413,7 +413,7 @@ 
         $fieldSearchPattern = '/(?<![a-z0-9_])%s\.%s(?![a-z0-9_])/i';
 
         // Generate search patterns for each field's path expression in the order by clause
-        foreach($this->rsm->fieldMappings as $fieldAlias => $fieldName) {
+        foreach ($this->rsm->fieldMappings as $fieldAlias => $fieldName) {
             $dqlAliasForFieldAlias = $this->rsm->columnOwnerMap[$fieldAlias];
             $class = $dqlAliasToClassMap[$dqlAliasForFieldAlias];
 
@@ -449,7 +449,7 @@ 
             $replacements[] = $fieldAlias;
         }
 
-        foreach($orderByClause->orderByItems as $orderByItem) {
+        foreach ($orderByClause->orderByItems as $orderByItem) {
             // Walk order by item to get string representation of it
             $orderByItemString = $this->walkOrderByItem($orderByItem);
 

Unused Use Statements -9 removed lines

@@ -18,19 +18,10 @@
 use Doctrine\DBAL\Platforms\PostgreSqlPlatform;
 use Doctrine\DBAL\Platforms\SQLAnywherePlatform;
 use Doctrine\DBAL\Platforms\SQLServerPlatform;
-use Doctrine\ORM\Query\AST\ArithmeticExpression;
-use Doctrine\ORM\Query\AST\ArithmeticFactor;
-use Doctrine\ORM\Query\AST\ArithmeticTerm;
-use Doctrine\ORM\Query\AST\Literal;
 use Doctrine\ORM\Query\AST\OrderByClause;
-use Doctrine\ORM\Query\AST\OrderByItem;
 use Doctrine\ORM\Query\AST\PartialObjectExpression;
-use Doctrine\ORM\Query\AST\PathExpression;
 use Doctrine\ORM\Query\AST\SelectExpression;
 use Doctrine\ORM\Query\AST\SelectStatement;
-use Doctrine\ORM\Query\AST\SimpleArithmeticExpression;
-use Doctrine\ORM\Query\Expr\OrderBy;
-use Doctrine\ORM\Query\Expr\Select;
 use Doctrine\ORM\Query\SqlWalker;
 
 /**

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/Controller/Admin/Customer/CustomerController.php

Spacing +4 added lines, -4 removed lines

@@ -235,7 +235,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_CUSTOMER);
@@ -249,7 +249,7 @@ 
 
             // データ行の出力.
             $app['eccube.service.csv.export']->setExportQueryBuilder($qb);
-            $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) use ($app, $request) {
+            $app['eccube.service.csv.export']->exportData(function($entity, $csvService) use ($app, $request) {
 
                 $Csvs = $csvService->getCsvs();
 
@@ -284,9 +284,9 @@ 
         });
 
         $now = new \DateTime();
-        $filename = 'customer_' . $now->format('YmdHis') . '.csv';
+        $filename = 'customer_'.$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();
 

src/Eccube/Controller/Admin/Order/OrderController.php

Spacing +8 added lines, -8 removed lines

@@ -240,7 +240,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_ORDER);
@@ -254,7 +254,7 @@ 
 
             // データ行の出力.
             $app['eccube.service.csv.export']->setExportQueryBuilder($qb);
-            $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) use ($app, $request) {
+            $app['eccube.service.csv.export']->exportData(function($entity, $csvService) use ($app, $request) {
 
                 $Csvs = $csvService->getCsvs();
 
@@ -295,9 +295,9 @@ 
         });
 
         $now = new \DateTime();
-        $filename = 'order_' . $now->format('YmdHis') . '.csv';
+        $filename = 'order_'.$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));
@@ -322,7 +322,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_SHIPPING);
@@ -336,7 +336,7 @@ 
 
             // データ行の出力.
             $app['eccube.service.csv.export']->setExportQueryBuilder($qb);
-            $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) use ($app, $request) {
+            $app['eccube.service.csv.export']->exportData(function($entity, $csvService) use ($app, $request) {
 
                 $Csvs = $csvService->getCsvs();
 
@@ -386,9 +386,9 @@ 
         });
 
         $now = new \DateTime();
-        $filename = 'shipping_' . $now->format('YmdHis') . '.csv';
+        $filename = 'shipping_'.$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));

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

Spacing +4 added lines, -4 removed lines

@@ -205,7 +205,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_CATEGORY);
@@ -219,7 +219,7 @@ 
 
             // データ行の出力.
             $app['eccube.service.csv.export']->setExportQueryBuilder($qb);
-            $app['eccube.service.csv.export']->exportData(function ($entity, $csvService) use ($app, $request) {
+            $app['eccube.service.csv.export']->exportData(function($entity, $csvService) use ($app, $request) {
 
                 $Csvs = $csvService->getCsvs();
 
@@ -252,9 +252,9 @@ 
         });
 
         $now = new \DateTime();
-        $filename = 'category_' . $now->format('YmdHis') . '.csv';
+        $filename = 'category_'.$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));

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;

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(