EC-CUBE / ec-cube

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

Unused Use Statements -9 removed lines

@@ -18,18 +18,9 @@
 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\SimpleArithmeticExpression;
-use Doctrine\ORM\Query\Expr\OrderBy;
-use Doctrine\ORM\Query\Expr\Select;
 use Doctrine\ORM\Query\SqlWalker;
 use Doctrine\ORM\Query\AST\SelectStatement;
 

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);
 

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

Unused Use Statements -1 removed lines

@@ -24,7 +24,6 @@
 
 namespace Eccube\Command\PluginCommand;
 
-use Eccube\Common\Constant;
 use Symfony\Component\Console\Question\Question;
 
 abstract class AbstractPluginGenerator

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/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);

Unused Use Statements -1 removed lines

@@ -28,7 +28,6 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Validator\Constraints as Assert;
 use Eccube\Command\PluginCommand\PluginGenerator;
 use Eccube\Command\PluginCommand\EntityFromDbGenerator;
 use Eccube\Command\PluginCommand\EntityFromYamlGenerator;

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/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));