EC-CUBE / ec-cube

src/Eccube/Repository/OrderRepository.php

Spacing +11 added lines, -11 removed lines

@@ -100,14 +100,14 @@ 
         if (isset($searchData['name']) && Str::isNotBlank($searchData['name'])) {
             $qb
                 ->andWhere('CONCAT(o.name01, o.name02) LIKE :name')
-                ->setParameter('name', '%' . $searchData['name'] . '%');
+                ->setParameter('name', '%'.$searchData['name'].'%');
         }
 
         // kana
         if (isset($searchData['kana']) && Str::isNotBlank($searchData['kana'])) {
             $qb
                 ->andWhere('CONCAT(o.kana01, o.kana02) LIKE :kana')
-                ->setParameter('kana', '%' . $searchData['kana'] . '%');
+                ->setParameter('kana', '%'.$searchData['kana'].'%');
         }
 
         // email
@@ -244,7 +244,7 @@ 
             $qb
                 ->leftJoin('o.OrderDetails', 'od')
                 ->andWhere('od.product_name LIKE :buy_product_name')
-                ->setParameter('buy_product_name', '%' . $searchData['buy_product_name'] . '%');
+                ->setParameter('buy_product_name', '%'.$searchData['buy_product_name'].'%');
         }
 
         // Order By
@@ -270,13 +270,13 @@ 
                 ->setParameter('order_id_start', $searchData['order_id_start']);
         }
         // multi
-        if (isset( $searchData['multi']) && Str::isNotBlank($searchData['multi'])) {
+        if (isset($searchData['multi']) && Str::isNotBlank($searchData['multi'])) {
             $multi = preg_match('/^\d+$/', $searchData['multi']) ? $searchData['multi'] : null;
             $qb
-                ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR ' .
+                ->andWhere('o.id = :multi OR o.name01 LIKE :likemulti OR o.name02 LIKE :likemulti OR '.
                            'o.kana01 LIKE :likemulti OR o.kana02 LIKE :likemulti OR o.company_name LIKE :likemulti')
                 ->setParameter('multi', $multi)
-                ->setParameter('likemulti', '%' . $searchData['multi'] . '%');
+                ->setParameter('likemulti', '%'.$searchData['multi'].'%');
         }
 
         // order_id_end
@@ -313,28 +313,28 @@ 
         if (isset($searchData['name']) && Str::isNotBlank($searchData['name'])) {
             $qb
                 ->andWhere('CONCAT(o.name01, o.name02) LIKE :name')
-                ->setParameter('name', '%' . $searchData['name'] . '%');
+                ->setParameter('name', '%'.$searchData['name'].'%');
         }
 
         // kana
         if (isset($searchData['kana']) && Str::isNotBlank($searchData['kana'])) {
             $qb
                 ->andWhere('CONCAT(o.kana01, o.kana02) LIKE :kana')
-                ->setParameter('kana', '%' . $searchData['kana'] . '%');
+                ->setParameter('kana', '%'.$searchData['kana'].'%');
         }
 
         // email
         if (isset($searchData['email']) && Str::isNotBlank($searchData['email'])) {
             $qb
                 ->andWhere('o.email like :email')
-                ->setParameter('email', '%' . $searchData['email'] . '%');
+                ->setParameter('email', '%'.$searchData['email'].'%');
         }
 
         // tel
         if (isset($searchData['tel']) && Str::isNotBlank($searchData['tel'])) {
             $qb
                 ->andWhere('CONCAT(o.tel01, o.tel02, o.tel03) LIKE :tel')
-                ->setParameter('tel', '%' . $searchData['tel'] . '%');
+                ->setParameter('tel', '%'.$searchData['tel'].'%');
         }
 
         // sex
@@ -446,7 +446,7 @@ 
             $qb
                 ->leftJoin('o.OrderDetails', 'od')
                 ->andWhere('od.product_name LIKE :buy_product_name')
-                ->setParameter('buy_product_name', '%' . $searchData['buy_product_name'] . '%');
+                ->setParameter('buy_product_name', '%'.$searchData['buy_product_name'].'%');
         }
 
         // Order By

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

src/Eccube/ServiceProvider/ValidatorServiceProvider.php

Spacing +4 added lines, -4 removed lines

@@ -32,7 +32,7 @@ 
 {
     public function register(Container $app)
     {
-        $app['validator'] = function ($app) {
+        $app['validator'] = function($app) {
 
             return new Validator(
                 $app['validator.mapping.class_metadata_factory'],
@@ -43,17 +43,17 @@ 
             );
         };
 
-        $app['validator.mapping.class_metadata_factory'] = function ($app) {
+        $app['validator.mapping.class_metadata_factory'] = function($app) {
             return new ClassMetadataFactory(new StaticMethodLoader());
         };
 
-        $app['validator.validator_factory'] = function () use ($app) {
+        $app['validator.validator_factory'] = function() use ($app) {
             $validators = isset($app['validator.validator_service_ids']) ? $app['validator.validator_service_ids'] : array();
 
             return new ConstraintValidatorFactory($app, $validators);
         };
 
-        $app['validator.object_initializers'] = function ($app) {
+        $app['validator.object_initializers'] = function($app) {
             return array();
         };
     }

src/Eccube/ServiceProvider/EccubePluginServiceProvider.php

Spacing +13 added lines, -13 removed lines

@@ -25,7 +25,7 @@ 
     public function register(Container $app)
     {
         // EventDispatcher
-        $app['eccube.event.dispatcher'] = function () {
+        $app['eccube.event.dispatcher'] = function() {
             return new EventDispatcher();
         };
 
@@ -36,7 +36,7 @@ 
             $config = $pluginConfig['config'];
 
             if (isset($config['const'])) {
-                $app->extend('config', function ($eccubeConfig) use ($config) {
+                $app->extend('config', function($eccubeConfig) use ($config) {
                     $eccubeConfig[$config['code']] = array(
                         'const' => $config['const'],
                     );
@@ -72,7 +72,7 @@ 
     public function initPluginEventDispatcher(Application $app)
     {
         // hook point
-        $app->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($app) {
+        $app->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($app) {
             if (!$event->isMasterRequest()) {
                 return;
             }
@@ -80,7 +80,7 @@ 
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
         }, Application::EARLY_EVENT);
 
-        $app->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($app) {
+        $app->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($app) {
             if (!$event->isMasterRequest()) {
                 return;
             }
@@ -89,7 +89,7 @@ 
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
         });
 
-        $app->on(KernelEvents::RESPONSE, function (FilterResponseEvent $event) use ($app) {
+        $app->on(KernelEvents::RESPONSE, function(FilterResponseEvent $event) use ($app) {
             if (!$event->isMasterRequest()) {
                 return;
             }
@@ -98,7 +98,7 @@ 
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
         });
 
-        $app->on(KernelEvents::RESPONSE, function (FilterResponseEvent $event) use ($app) {
+        $app->on(KernelEvents::RESPONSE, function(FilterResponseEvent $event) use ($app) {
             if (!$event->isMasterRequest()) {
                 return;
             }
@@ -106,13 +106,13 @@ 
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
         }, Application::LATE_EVENT);
 
-        $app->on(KernelEvents::TERMINATE, function (PostResponseEvent $event) use ($app) {
+        $app->on(KernelEvents::TERMINATE, function(PostResponseEvent $event) use ($app) {
             $route = $event->getRequest()->attributes->get('_route');
             $hookpoint = "eccube.event.controller.$route.finish";
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
         });
 
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
             if (!$event->isMasterRequest()) {
                 return;
             }
@@ -121,7 +121,7 @@ 
         });
 
         // Request Event
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::REQUEST, function (\Symfony\Component\HttpKernel\Event\GetResponseEvent $event) use ($app) {
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::REQUEST, function(\Symfony\Component\HttpKernel\Event\GetResponseEvent $event) use ($app) {
 
             if (!$event->isMasterRequest()) {
                 return;
@@ -152,7 +152,7 @@ 
         }, 30); // Routing(32)が解決し, 認証判定(8)が実行される前のタイミング.
 
         // Controller Event
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function (\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) {
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function(\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) {
 
             if (!$event->isMasterRequest()) {
                 return;
@@ -181,7 +181,7 @@ 
         });
 
         // Response Event
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
             if (!$event->isMasterRequest()) {
                 return;
             }
@@ -210,7 +210,7 @@ 
         });
 
         // Exception Event
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::EXCEPTION, function (\Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event) use ($app) {
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::EXCEPTION, function(\Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event) use ($app) {
 
             if (!$event->isMasterRequest()) {
                 return;
@@ -240,7 +240,7 @@ 
         });
 
         // Terminate Event
-        $app->on(\Symfony\Component\HttpKernel\KernelEvents::TERMINATE, function (\Symfony\Component\HttpKernel\Event\PostResponseEvent $event) use ($app) {
+        $app->on(\Symfony\Component\HttpKernel\KernelEvents::TERMINATE, function(\Symfony\Component\HttpKernel\Event\PostResponseEvent $event) use ($app) {
 
             $route = $event->getRequest()->attributes->get('_route');
 

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

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
                 'label' => false,
                 'class' => 'Eccube\Entity\PageLayout',
                 'choice_label' => 'name',
-                'query_builder' => function (EntityRepository $er) {
+                'query_builder' => function(EntityRepository $er) {
                     return $er
                         ->createQueryBuilder('l')
                         ->where('l.id <> 0')

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

Spacing +3 added lines, -3 removed lines

@@ -72,19 +72,19 @@
                 'label' => 'SSLを強制',
                 'required' => false,
             ))
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) use($app) {
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) use($app) {
                 $form = $event->getForm();
                 $data = $form->getData();
 
                 $ips = preg_split("/\R/", $data['admin_allow_host'], null, PREG_SPLIT_NO_EMPTY);
 
-                foreach($ips as $ip) {
+                foreach ($ips as $ip) {
                     $errors = $app['validator']->validate($ip, array(
                             new Assert\Ip(),
                         )
                     );
                     if ($errors->count() != 0) {
-                        $form['admin_allow_host']->addError(new FormError($ip . 'はIPv4アドレスではありません。'));
+                        $form['admin_allow_host']->addError(new FormError($ip.'はIPv4アドレスではありません。'));
                     }
                 }
             })