EC-CUBE / ec-cube

src/Eccube/Repository/ProductRepository.php

Spacing +2 added lines, -2 removed lines

@@ -113,7 +113,7 @@ 
                 $key = sprintf('keyword%s', $index);
                 $qb
                     ->andWhere(sprintf('NORMALIZE(p.name) LIKE NORMALIZE(:%s) OR NORMALIZE(p.search_word) LIKE NORMALIZE(:%s)', $key, $key))
-                    ->setParameter($key, '%' . $keyword . '%');
+                    ->setParameter($key, '%'.$keyword.'%');
             }
         }
 
@@ -176,7 +176,7 @@ 
             $qb
                 ->andWhere('p.id = :id OR p.name LIKE :likeid OR pc.code LIKE :likeid')
                 ->setParameter('id', $id)
-                ->setParameter('likeid', '%' . $searchData['id'] . '%');
+                ->setParameter('likeid', '%'.$searchData['id'].'%');
         }
 
         // code

src/Eccube/Command/GeneratorCommand/AbstractPluginGenerator.php

Doc Comments +2 added lines, -2 removed lines

@@ -348,7 +348,7 @@ 
      * @param array $metadatas
      * @param array $fsList
      * @param $pluginCode
-     * @param $codePath
+     * @param string $codePath
      */
     protected function generateMigration(array $metadatas, array &$fsList = array(), $pluginCode, $codePath)
     {
@@ -373,7 +373,7 @@ 
      *
      * @param $pluginCode
      * @param array $metadatas
-     * @return mixed|string
+     * @return string
      */
     protected function makeMigration($pluginCode, array $metadatas)
     {

src/Eccube/Command/PluginCommand.php

Unused Use Statements -1 removed lines

@@ -33,7 +33,6 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\Question;
-use Symfony\Component\Validator\Constraints as Assert;
 
 class PluginCommand extends \Knp\Command\Command
 {

src/Eccube/Application/ApplicationTrait.php

Unused Use Statements -6 removed lines

@@ -2,15 +2,9 @@
 
 namespace Eccube\Application;
 
-use Eccube\Event\TemplateEvent;
-use Monolog\Logger;
-use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\StreamedResponse;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\Security\Core\User\UserInterface;
 
 trait ApplicationTrait
 {

Spacing +8 added lines, -8 removed lines

@@ -19,32 +19,32 @@ 
      */
     public function addSuccess($message, $namespace = 'front')
     {
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.success', $message);
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.success', $message);
     }
 
     public function addError($message, $namespace = 'front')
     {
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.error', $message);
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.error', $message);
     }
 
     public function addDanger($message, $namespace = 'front')
     {
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.danger', $message);
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.danger', $message);
     }
 
     public function addWarning($message, $namespace = 'front')
     {
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.warning', $message);
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.warning', $message);
     }
 
     public function addInfo($message, $namespace = 'front')
     {
-        $this['session']->getFlashBag()->add('eccube.' . $namespace . '.info', $message);
+        $this['session']->getFlashBag()->add('eccube.'.$namespace.'.info', $message);
     }
 
     public function addRequestError($message, $namespace = 'front')
     {
-        $this['session']->getFlashBag()->set('eccube.' . $namespace . '.request.error', $message);
+        $this['session']->getFlashBag()->set('eccube.'.$namespace.'.request.error', $message);
     }
 
     public function clearMessage()
@@ -63,7 +63,7 @@ 
         if (is_null($namespace)) {
             $this['session']->getFlashBag()->set('eccube.login.target.path', $targetPath);
         } else {
-            $this['session']->getFlashBag()->set('eccube.' . $namespace . '.login.target.path', $targetPath);
+            $this['session']->getFlashBag()->set('eccube.'.$namespace.'.login.target.path', $targetPath);
         }
     }
 
@@ -111,7 +111,7 @@ 
      * @param Response $response
      * @return Application
      */
-    public function forwardChain($path, array $requestParameters = [], Response &$response = null)
+    public function forwardChain($path, array $requestParameters = [], Response&$response = null)
     {
         $response = $this->forward($path, $requestParameters);
         return $this;

Doc Comments +5 added lines, -1 removed lines

@@ -16,6 +16,7 @@ 
 {
     /**
      * Application Shortcut Methods
+     * @param string $message
      */
     public function addSuccess($message, $namespace = 'front')
     {
@@ -58,6 +59,9 @@ 
         $this->addWarning('admin.delete.warning', 'admin');
     }
 
+    /**
+     * @param string $targetPath
+     */
     public function setLoginTargetPath($targetPath, $namespace = null)
     {
         if (is_null($namespace)) {
@@ -109,7 +113,7 @@ 
      * @param string $path フォワード先のパス
      * @param array $requestParameters
      * @param Response $response
-     * @return Application
+     * @return ApplicationTrait
      */
     public function forwardChain($path, array $requestParameters = [], Response &$response = null)
     {

src/Eccube/Form/Type/Admin/ChangePasswordType.php

Unused Use Statements -2 removed lines

@@ -27,8 +27,6 @@
 use Symfony\Component\Form\Extension\Core\Type\PasswordType;
 use Symfony\Component\Form\Extension\Core\Type\RepeatedType;
 use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Form\FormError;
-use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Validator\Constraints\UserPassword;
 use Symfony\Component\Validator\Constraints as Assert;

src/Eccube/ServiceProvider/EccubeServiceProvider.php

Doc Comments +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
      * This method should only be used to configure services and parameters.
      * It should not get services.
      *
-     * @param BaseApplication $app An Application instance
+     * @param Container $app An Application instance
      */
     public function register(Container $app)
     {

Unused Use Statements -1 removed lines

@@ -31,7 +31,6 @@
 use Eccube\Repository\BaseInfoRepository;
 use Eccube\Repository\DeliveryRepository;
 use Eccube\Service\PurchaseFlow\Processor\AdminOrderRegisterPurchaseProcessor;
-use Eccube\Service\PurchaseFlow\Processor\DeletedProductValidator;
 use Eccube\Service\PurchaseFlow\Processor\DeliveryFeeFreeProcessor;
 use Eccube\Service\PurchaseFlow\Processor\DeliveryFeeProcessor;
 use Eccube\Service\PurchaseFlow\Processor\DeliverySettingValidator;

Spacing +28 added lines, -28 removed lines

@@ -63,15 +63,15 @@ 
      */
     public function register(Container $app)
     {
-        $app[BaseInfo::class] = function () use ($app) {
+        $app[BaseInfo::class] = function() use ($app) {
             return $app[BaseInfoRepository::class]->get();
         };
 
-        $app['eccube.calculate.context'] = function () use ($app) {
+        $app['eccube.calculate.context'] = function() use ($app) {
                 return new \Eccube\Service\Calculator\CalculateContext();
         };
 
-        $app['eccube.calculate.strategies'] = function () use ($app) {
+        $app['eccube.calculate.strategies'] = function() use ($app) {
             $Collection = new \Eccube\Service\Calculator\CalculateStrategyCollection();
             $Collection->setApplication($app);
             //$Collection->setOrder($Order);
@@ -84,47 +84,47 @@ 
             $Collection->add($app['eccube.calculate.strategy.calculate_total']);
             return $Collection;
         };
-        $app['eccube.calculate.strategy.shipping'] = function () use ($app) {
+        $app['eccube.calculate.strategy.shipping'] = function() use ($app) {
                 $Strategy = new \Eccube\Service\Calculator\Strategy\ShippingStrategy();
                 $Strategy->setApplication($app);
                 return $Strategy;
         };
-        $app['eccube.calculate.strategy.charge'] = function () use ($app) {
+        $app['eccube.calculate.strategy.charge'] = function() use ($app) {
                 $Strategy = new \Eccube\Service\Calculator\Strategy\ChargeStrategy();
                 $Strategy->setApplication($app);
                 return $Strategy;
         };
 
-        $app['eccube.calculate.strategy.tax'] = function () use ($app) {
+        $app['eccube.calculate.strategy.tax'] = function() use ($app) {
                 $Strategy = new \Eccube\Service\Calculator\Strategy\TaxStrategy();
                 $Strategy->setApplication($app);
                 return $Strategy;
         };
 
-        $app['eccube.calculate.strategy.calculate_delivery_fee'] = function () use ($app) {
+        $app['eccube.calculate.strategy.calculate_delivery_fee'] = function() use ($app) {
             $Strategy = new \Eccube\Service\Calculator\Strategy\CalculateDeliveryFeeStrategy();
             $Strategy->setApplication($app);
             return $Strategy;
         };
-        $app['eccube.calculate.strategy.calculate_charge'] = function () use ($app) {
+        $app['eccube.calculate.strategy.calculate_charge'] = function() use ($app) {
             $Strategy = new \Eccube\Service\Calculator\Strategy\CalculateChargeStrategy();
             $Strategy->setApplication($app);
             return $Strategy;
         };
-        $app['eccube.calculate.strategy.calculate_total'] = function () use ($app) {
+        $app['eccube.calculate.strategy.calculate_total'] = function() use ($app) {
             $Strategy = new \Eccube\Service\Calculator\Strategy\CalculateTotalStrategy();
             $Strategy->setApplication($app);
             return $Strategy;
         };
 
-        $app['payment.method'] = $app->protect(function ($clazz, $form) use ($app) {
+        $app['payment.method'] = $app->protect(function($clazz, $form) use ($app) {
                 $PaymentMethod = new $clazz;
                 $PaymentMethod->setApplication($app);
                 $PaymentMethod->setFormType($form);
                 return $PaymentMethod;
         });
 
-        $app['payment.method.request'] = $app->protect(function ($clazz, $form, $request) use ($app) {
+        $app['payment.method.request'] = $app->protect(function($clazz, $form, $request) use ($app) {
                 $PaymentMethod = new $clazz;
                 $PaymentMethod->setApplication($app);
                 $PaymentMethod->setFormType($form);
@@ -132,7 +132,7 @@ 
                 return $PaymentMethod;
         });
 
-        $app['eccube.service.calculate'] = $app->protect(function ($Order, $Customer) use ($app) {
+        $app['eccube.service.calculate'] = $app->protect(function($Order, $Customer) use ($app) {
             $Service = new \Eccube\Service\CalculateService($Order, $Customer);
             $Context = $app['eccube.calculate.context'];
             $app['eccube.calculate.strategies']->setOrder($Order);
@@ -143,24 +143,24 @@ 
             return $Service;
         });
 
-        $app['eccube.service.payment'] = $app->protect(function ($clazz) use ($app) {
+        $app['eccube.service.payment'] = $app->protect(function($clazz) use ($app) {
             $Service = new $clazz($app['request_stack']);
 
             return $Service;
         });
 
-        $app['paginator'] = $app->protect(function () {
+        $app['paginator'] = $app->protect(function() {
             $paginator = new \Knp\Component\Pager\Paginator();
             $paginator->subscribe(new \Eccube\EventListener\PaginatorListener());
 
             return $paginator;
         });
 
-        $app['request_scope'] = function () {
+        $app['request_scope'] = function() {
             return new ParameterBag();
         };
         // TODO 使用するか検討
-        $app['eccube.twig.node.hello'] = $app->protect(function ($node, $compiler) {
+        $app['eccube.twig.node.hello'] = $app->protect(function($node, $compiler) {
             $compiler
             ->addDebugInfo($node)
             ->write("echo 'Helloooooo ' . ")
@@ -170,7 +170,7 @@ 
 
         });
         // TODO 使用するか検討
-        $app['eccube.twig.node.jiro'] = $app->protect(function ($node, $compiler) {
+        $app['eccube.twig.node.jiro'] = $app->protect(function($node, $compiler) {
             $compiler
             ->addDebugInfo($node)
             ->write("echo 'jirooooooo ' . ")
@@ -181,7 +181,7 @@ 
         });
 
         // TODO 使用するか検討
-        $app['eccube.twig.generic_node_names'] = function () use ($app) {
+        $app['eccube.twig.generic_node_names'] = function() use ($app) {
             return [
                 'hello',
                 'jiro',
@@ -190,7 +190,7 @@ 
         };
 
         // TODO 使用するか検討
-        $app['twig_parsers'] = function () use ($app) {
+        $app['twig_parsers'] = function() use ($app) {
             $GenericTokenParsers = [];
             foreach ($app['eccube.twig.generic_node_names'] as $tagName) {
                 $GenericTokenParsers[] = new \Eccube\Twig\Extension\GenericTokenParser($app, $tagName);
@@ -198,7 +198,7 @@ 
             return $GenericTokenParsers;
         };
 
-        $app['eccube.twig.block.templates'] = function () {
+        $app['eccube.twig.block.templates'] = function() {
             $templates = new ArrayCollection();
             $templates[] = 'render_block.twig';
 
@@ -206,17 +206,17 @@ 
         };
 
         $app['eccube.entity.event.dispatcher']->addEventListener(new \Acme\Entity\SoldOutEventListener());
-        $app['eccube.queries'] = function () {
+        $app['eccube.queries'] = function() {
             return new \Eccube\Doctrine\Query\Queries();
         };
         // TODO QueryCustomizerの追加方法は要検討
         $app['eccube.queries']->addCustomizer(new \Acme\Entity\AdminProductListCustomizer());
 
-        $app['eccube.purchase.context'] = $app->protect(function (ItemHolderInterface $origin = null) {
+        $app['eccube.purchase.context'] = $app->protect(function(ItemHolderInterface $origin = null) {
             return new PurchaseContext($origin);
         });
 
-        $app['eccube.purchase.flow.cart.item_processors'] = function ($app) {
+        $app['eccube.purchase.flow.cart.item_processors'] = function($app) {
             $processors = new ArrayCollection();
             $processors->add(new DisplayStatusValidator());
             $processors->add(new SaleLimitValidator());
@@ -225,7 +225,7 @@ 
             return $processors;
         };
 
-        $app['eccube.purchase.flow.cart.holder_processors'] = function ($app) {
+        $app['eccube.purchase.flow.cart.holder_processors'] = function($app) {
             $processors = new ArrayCollection();
             $processors->add(new PaymentProcessor($app[DeliveryRepository::class]));
             $processors->add(new PaymentTotalLimitValidator($app['config']['max_total_fee']));
@@ -236,14 +236,14 @@ 
         };
 
         // example
-        $app->extend('eccube.purchase.flow.cart.item_processors', function ($processors, $app) {
+        $app->extend('eccube.purchase.flow.cart.item_processors', function($processors, $app) {
 
             $processors->add(new StockValidator());
 
             return $processors;
         });
 
-        $app['eccube.purchase.flow.cart'] = function ($app) {
+        $app['eccube.purchase.flow.cart'] = function($app) {
             $flow = new PurchaseFlow();
             $flow->setItemProcessors($app['eccube.purchase.flow.cart.item_processors']);
             $flow->setItemHolderProcessors($app['eccube.purchase.flow.cart.holder_processors']);
@@ -251,7 +251,7 @@ 
             return $flow;
         };
 
-        $app['eccube.purchase.flow.shopping'] = function () use ($app) {
+        $app['eccube.purchase.flow.shopping'] = function() use ($app) {
             $flow = new PurchaseFlow();
             $flow->addItemProcessor(new StockValidator());
             $flow->addItemProcessor(new DisplayStatusValidator());
@@ -261,7 +261,7 @@ 
             return $flow;
         };
 
-        $app['eccube.purchase.flow.order'] = function () use ($app) {
+        $app['eccube.purchase.flow.order'] = function() use ($app) {
             $flow = new PurchaseFlow();
             $flow->addItemProcessor(new StockValidator());
             $flow->addItemHolderProcessor(new PaymentTotalLimitValidator($app['config']['max_total_fee']));

src/Eccube/Application/TwigTrait.php

Spacing +3 added lines, -3 removed lines

@@ -40,14 +40,14 @@
         $eventName = $view;
         if ($this->isAdminRequest()) {
             // 管理画面の場合、event名に「Admin/」を付ける
-            $eventName = 'Admin/' . $view;
+            $eventName = 'Admin/'.$view;
         }
-        $this['monolog']->debug('Template Event Name : ' . $eventName);
+        $this['monolog']->debug('Template Event Name : '.$eventName);
 
         // $this['eccube.event.dispatcher']->dispatch($eventName, $event);
 
         if ($response instanceof StreamedResponse) {
-            $response->setCallback(function () use ($twig, $view, $parameters) {
+            $response->setCallback(function() use ($twig, $view, $parameters) {
                 $twig->display($view, $parameters);
             });
         } else {

src/Eccube/ServiceProvider/LogServiceProvider.php

Spacing +7 added lines, -7 removed lines

@@ -22,17 +22,17 @@ 
         $app->register(new \Silex\Provider\MonologServiceProvider());
 
         // Log
-        $app['eccube.logger'] = function ($app) {
+        $app['eccube.logger'] = function($app) {
             return new Logger($app);
         };
 
         // ヘルパー作成
-        $app['eccube.monolog.helper'] = function ($app) {
+        $app['eccube.monolog.helper'] = 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']);
 
@@ -47,7 +47,7 @@ 
         // monologの設定は除外
         unset($channels['monolog']);
         foreach ($channels as $channel => $channelValues) {
-            $app['monolog.logger.'.$channel] = function ($app) use ($channelValues) {
+            $app['monolog.logger.'.$channel] = function($app) use ($channelValues) {
                 return $app['eccube.monolog.factory']($channelValues);
             };
         }
@@ -55,15 +55,15 @@ 
         // MonologServiceProviderで定義されているmonolog.handlerの置換
         $channelValues = $app['config']['log']['channel']['monolog'];
         $app['monolog.name'] = $channelValues['name'];
-        $app['monolog.handler'] = function ($app) use ($channelValues) {
+        $app['monolog.handler'] = function($app) use ($channelValues) {
             return $app['eccube.monolog.helper']->getHandler($channelValues);
         };
 
-        $app['eccube.monolog.listener'] = function () use ($app) {
+        $app['eccube.monolog.listener'] = function() use ($app) {
             return new LogListener($app['eccube.logger']);
         };
 
-        $app['listener.requestdump'] = function ($app) {
+        $app['listener.requestdump'] = function($app) {
             return new \Eccube\EventListener\RequestDumpListener($app);
         };
     }

src/Eccube/ServiceProvider/InstallServiceProvider.php

Spacing +2 added lines, -2 removed lines

@@ -42,13 +42,13 @@
      */
     public function register(Container $app)
     {
-        $app->extend('form.type.extensions', function ($extensions) use ($app) {
+        $app->extend('form.type.extensions', function($extensions) use ($app) {
             $extensions[] = new \Eccube\Form\Extension\HelpTypeExtension();
 
             return $extensions;
         });
 
-        $app->extend('form.types', function ($types) use ($app) {
+        $app->extend('form.types', function($types) use ($app) {
             $types[] = new \Eccube\Form\Type\Install\Step1Type($app);
             $types[] = new \Eccube\Form\Type\Install\Step3Type($app);
             $types[] = new \Eccube\Form\Type\Install\Step4Type($app);