EC-CUBE / ec-cube

src/Eccube/Application.php

Spacing +27 added lines, -27 removed lines

@@ -173,7 +173,7 @@ 
         $this->register(new MobileDetectServiceProvider());
         $this->register(new TwigLintServiceProvider());
 
-        $this->error(function (\Exception $e, Request $request, $code) {
+        $this->error(function(\Exception $e, Request $request, $code) {
             if ($this['debug']) {
                 return;
             }
@@ -279,14 +279,14 @@ 
             return $router;
         });
 
-        $this['eccube.router.origin'] = function ($app) {
+        $this['eccube.router.origin'] = function($app) {
             $resource = __DIR__.'/Controller';
             $cachePrefix = 'Origin';
 
             return $app['eccube.router']($resource, $cachePrefix);
         };
 
-        $this['eccube.routers.plugin'] = function ($app) {
+        $this['eccube.routers.plugin'] = function($app) {
             // TODO 有効なプラグインを対象とする必要がある.
             $dirs = Finder::create()
                 ->in($app['config']['root_dir'].'/app/Plugin')
@@ -303,7 +303,7 @@ 
             return $routers;
         };
 
-        $this['eccube.router.extend'] = function ($app) {
+        $this['eccube.router.extend'] = function($app) {
             // TODO ディレクトリ名は暫定
             $resource = $app['config']['root_dir'].'/app/Acme/Controller';
             $cachePrefix = 'Extend';
@@ -313,7 +313,7 @@ 
             return $router;
         };
 
-        $this->extend('request_matcher', function ($matcher, $app) {
+        $this->extend('request_matcher', function($matcher, $app) {
             $matchers = [];
             $matchers[] = $app['eccube.router.extend'];
             foreach ($app['eccube.routers.plugin'] as $router) {
@@ -325,7 +325,7 @@ 
             return new ChainUrlMatcher($matchers, $app['request_context']);
         });
 
-        $this->extend('url_generator', function ($generator, $app) {
+        $this->extend('url_generator', function($generator, $app) {
             $generators = [];
             $generators[] = $app['eccube.router.extend'];
             foreach ($app['eccube.routers.plugin'] as $router) {
@@ -338,7 +338,7 @@ 
         });
 
         // Route CollectionにEC-CUBEで定義したルーティングを追加(debug tool barに出力するため)
-        $this->extend('routes', function ($routes, $app) {
+        $this->extend('routes', function($routes, $app) {
             $routes->addCollection($app['eccube.router.extend']->getRouteCollection());
             foreach ($app['eccube.routers.plugin'] as $router) {
                 $routes->addCollection($router->getRouteCollection());
@@ -371,7 +371,7 @@ 
             'translator.cache_dir' => $this['debug'] ? null : $this['config']['root_dir'].'/app/cache/translator',
             'locale_fallbacks' => ['ja', 'en'],
         ));
-        $this->extend('translator', function ($translator, \Silex\Application $app) {
+        $this->extend('translator', function($translator, \Silex\Application $app) {
             $translator->addLoader('php', new \Symfony\Component\Translation\Loader\PhpFileLoader());
 
             $file = __DIR__.'/Resource/locale/messages.'.$app['locale'].'.php';
@@ -414,14 +414,14 @@ 
         $this->register(new \Silex\Provider\TwigServiceProvider(), array(
             'twig.form.templates' => array('Form/form_layout.twig'),
         ));
-        $this->extend('twig', function (\Twig_Environment $twig, \Silex\Application $app) {
+        $this->extend('twig', function(\Twig_Environment $twig, \Silex\Application $app) {
             $twig->addExtension(new \Eccube\Twig\Extension\EccubeExtension($app));
             $twig->addExtension(new \Twig_Extension_StringLoader());
 
             return $twig;
         });
 
-        $this->before(function (Request $request, \Silex\Application $app) {
+        $this->before(function(Request $request, \Silex\Application $app) {
             $app['admin'] = $app['front'] = false;
             $pathinfo = rawurldecode($request->getPathInfo());
             if (strpos($pathinfo, '/'.trim($app['config']['admin_route'], '/').'/') === 0) {
@@ -437,7 +437,7 @@ 
                 }
                 $paths[] = $app['config']['template_admin_realdir'];
                 $paths[] = __DIR__.'/../../app/Plugin';
-                $cacheDir =  __DIR__.'/../../app/cache/twig/admin';
+                $cacheDir = __DIR__.'/../../app/cache/twig/admin';
             } else {
                 // モバイル端末時、smartphoneディレクトリを探索パスに追加する.
                 if ($app['mobile_detect.device_type'] == \Eccube\Entity\Master\DeviceType::DEVICE_TYPE_SP) {
@@ -452,7 +452,7 @@ 
                 }
                 $paths[] = $app['config']['template_default_realdir'];
                 $paths[] = __DIR__.'/../../app/Plugin';
-                $cacheDir =  __DIR__.'/../../app/cache/twig/'.$app['config']['template_code'];
+                $cacheDir = __DIR__.'/../../app/cache/twig/'.$app['config']['template_code'];
             }
             $app['twig']->setCache($app['debug'] ? null : $cacheDir);
             $app['twig.loader']->addLoader(new \Twig_Loader_Filesystem($paths));
@@ -470,7 +470,7 @@ 
         }, self::EARLY_EVENT);
 
         // twigのグローバル変数を定義.
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function (\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) {
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function(\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) {
             // 未ログイン時にマイページや管理画面以下にアクセスするとSubRequestで実行されるため,
             // $event->isMasterRequest()ではなく、グローバル変数が初期化済かどうかの判定を行う
             if (isset($this['twig_global_initialized']) && $this['twig_global_initialized'] === true) {
@@ -555,7 +555,7 @@ 
         // メール送信時の文字エンコード指定(デフォルトはUTF-8)
         if (isset($this['config']['mail']['charset_iso_2022_jp']) && is_bool($this['config']['mail']['charset_iso_2022_jp'])) {
             if ($this['config']['mail']['charset_iso_2022_jp'] === true) {
-                \Swift::init(function () {
+                \Swift::init(function() {
                     \Swift_DependencyContainer::getInstance()
                         ->register('mime.qpheaderencoder')
                         ->asAliasOf('mime.base64headerencoder');
@@ -590,7 +590,7 @@ 
         $this->register(new \Saxulum\DoctrineOrmManagerRegistry\Provider\DoctrineOrmManagerRegistryProvider());
 
         $app = $this;
-        $this->extend('db.event_manager', function ($evm) use ($app) {
+        $this->extend('db.event_manager', function($evm) use ($app) {
             $initSubscriber = new InitSubscriber($app);
             $evm->addEventSubscriber($initSubscriber);
 
@@ -685,7 +685,7 @@ 
 
         $this->extend(
             'orm.em.config',
-            function (\Doctrine\ORM\Configuration $config, \Silex\Application $app) {
+            function(\Doctrine\ORM\Configuration $config, \Silex\Application $app) {
 
                 /** @var $chain \Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain */
                 $chain = $config->getMetadataDriverImpl();
@@ -707,7 +707,7 @@ 
             }
         );
 
-        $this->extend('orm.em', function (\Doctrine\ORM\EntityManager $em, \Silex\Application $app) {
+        $this->extend('orm.em', function(\Doctrine\ORM\EntityManager $em, \Silex\Application $app) {
             // save
             $saveEventSubscriber = new \Eccube\Doctrine\EventSubscriber\SaveEventSubscriber($app);
             $em->getEventManager()->addEventSubscriber($saveEventSubscriber);
@@ -730,7 +730,7 @@ 
             // second level cacheの設定.
             $this->extend(
                 'orm.em.config',
-                function (\Doctrine\ORM\Configuration $config, \Silex\Application $app) {
+                function(\Doctrine\ORM\Configuration $config, \Silex\Application $app) {
                     $config->setSecondLevelCacheEnabled();
                     $cacheConfig = $config->getSecondLevelCacheConfiguration();
                     $regionConfig = $cacheConfig->getRegionsConfiguration();
@@ -819,31 +819,31 @@ 
             array('^/mypage', 'ROLE_USER', $channel),
         );
 
-        $this['eccube.password_encoder'] = function ($app) {
+        $this['eccube.password_encoder'] = function($app) {
             return new \Eccube\Security\Core\Encoder\PasswordEncoder($app['config']);
         };
-        $this['security.encoder_factory'] = function ($app) {
+        $this['security.encoder_factory'] = function($app) {
             return new \Symfony\Component\Security\Core\Encoder\EncoderFactory(array(
                 'Eccube\Entity\Customer' => $app['eccube.password_encoder'],
                 'Eccube\Entity\Member' => $app['eccube.password_encoder'],
             ));
         };
-        $this['eccube.event_listner.security'] = function ($app) {
+        $this['eccube.event_listner.security'] = function($app) {
             return new \Eccube\EventListener\SecurityEventListener($app['orm.em']);
         };
 
         // Voterの設定
-        $this['authority_voter'] = function ($app) {
+        $this['authority_voter'] = function($app) {
             return new \Eccube\Security\Voter\AuthorityVoter($app);
         };
 
-        $this->extend('security.voters', function ($voters, \Silex\Application $app) {
+        $this->extend('security.voters', function($voters, \Silex\Application $app) {
             $voters[] = $app['authority_voter'];
 
             return $voters;
         });
 
-        $this['security.access_manager'] = function ($app) {
+        $this['security.access_manager'] = function($app) {
             return new \Symfony\Component\Security\Core\Authorization\AccessDecisionManager($app['security.voters'], 'unanimous');
         };
 
@@ -857,7 +857,7 @@ 
     {
         $config = $this['config'];
         if (isset($config['trusted_proxies_connection_only']) && !empty($config['trusted_proxies_connection_only'])) {
-            $this->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($config) {
+            $this->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($config) {
                 // サブリクエストのREMOTE_ADDRも動的に設定を行う必要があるため、KernelEvents::REQUESTを使用する
                 Request::setTrustedProxies(array_merge(array($event->getRequest()->server->get('REMOTE_ADDR')), $config['trusted_proxies']));
             }, self::EARLY_EVENT);
@@ -874,7 +874,7 @@ 
         $this->register(new ServiceProvider\EccubePluginServiceProvider());
 
         // TODO Acme\ServiceProvider の初期化はここで OK?
-        if (array_key_exists('service',$this['config'])) {
+        if (array_key_exists('service', $this['config'])) {
             foreach ($this['config']['service'] as $service) {
                 $this->register(new $service);
             }
@@ -1030,7 +1030,7 @@ 
         $app = $this;
 
         // Response Event(http cache対応、event実行は一番遅く設定)
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
 
             if (!$event->isMasterRequest()) {
                 return;

src/Eccube/Controller/Install/InstallController.php

Spacing +50 added lines, -50 removed lines

@@ -53,9 +53,9 @@ 
     const SESSION_KEY = 'eccube.session.install';
     public function __construct()
     {
-        $this->config_path = __DIR__ . '/../../../../app/config/eccube';
-        $this->dist_path = __DIR__ . '/../../Resource/config';
-        $this->cache_path = __DIR__ . '/../../../../app/cache';
+        $this->config_path = __DIR__.'/../../../../app/config/eccube';
+        $this->dist_path = __DIR__.'/../../Resource/config';
+        $this->cache_path = __DIR__.'/../../../../app/cache';
     }
     private function isValid(Request $request, Form $form)
     {
@@ -95,7 +95,7 @@ 
         $this->checkModules($app);
         return $app['twig']->render('step1.twig', array(
             'form' => $form->createView(),
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
         ));
     }
     // 権限チェック
@@ -114,7 +114,7 @@ 
         }
         return $app['twig']->render('step2.twig', array(
             'protectedDirs' => $protectedDirs,
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
         ));
     }
     //    サイトの設定
@@ -125,7 +125,7 @@ 
             ->getForm();
         $sessionData = $this->getSessionData($request);
         if (empty($sessionData['shop_name'])) {
-            $config_file = $this->config_path . '/config.php';
+            $config_file = $this->config_path.'/config.php';
             $fs = new Filesystem();
             if ($fs->exists($config_file)) {
                 // すでに登録されていた場合、登録データを表示
@@ -136,10 +136,10 @@ 
                     $sessionData['email'] = $row['email01'];
                 }
                 // セキュリティの設定
-                $config_file = $this->config_path . '/path.php';
+                $config_file = $this->config_path.'/path.php';
                 $config = require $config_file;
                 $sessionData['admin_dir'] = $config['admin_route'];
-                $config_file = $this->config_path . '/config.php';
+                $config_file = $this->config_path.'/config.php';
                 $config = require $config_file;
                 $allowHost = $config['admin_allow_host'];
                 if (count($allowHost) > 0) {
@@ -148,7 +148,7 @@ 
                 $sessionData['admin_force_ssl'] = (bool) $config['force_ssl'];
                 // ロードバランサー、プロキシサーバ設定
                 if (isset($config['trusted_proxies_connection_only'])) {
-                    $sessionData['trusted_proxies_connection_only'] = (bool)$config['trusted_proxies_connection_only'];
+                    $sessionData['trusted_proxies_connection_only'] = (bool) $config['trusted_proxies_connection_only'];
                 }
                 if (isset($config['trusted_proxies'])) {
                     $trustedProxies = $config['trusted_proxies'];
@@ -157,7 +157,7 @@ 
                     }
                 }
                 // メール設定
-                $config_file = $this->config_path . '/mail.php';
+                $config_file = $this->config_path.'/mail.php';
                 $config = require $config_file;
                 $mail = $config['mail'];
                 $sessionData['mail_backend'] = $mail['transport'];
@@ -177,7 +177,7 @@ 
         }
         return $app['twig']->render('step3.twig', array(
             'form' => $form->createView(),
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
         ));
     }
     //    データベースの設定
@@ -188,7 +188,7 @@ 
             ->getForm();
         $sessionData = $this->getSessionData($request);
         if (empty($sessionData['database'])) {
-            $config_file = $this->config_path . '/database.php';
+            $config_file = $this->config_path.'/database.php';
             $fs = new Filesystem();
             if ($fs->exists($config_file)) {
                 // すでに登録されていた場合、登録データを表示
@@ -211,7 +211,7 @@ 
         }
         return $app['twig']->render('step4.twig', array(
             'form' => $form->createView(),
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
         ));
     }
     //    データベースの初期化
@@ -250,7 +250,7 @@ 
                 $host = $request->getSchemeAndHttpHost();
                 $basePath = $request->getBasePath();
                 $params = array(
-                    'http_url' => $host . $basePath,
+                    'http_url' => $host.$basePath,
                     'shop_name' => $sessionData['shop_name'],
                 );
                 $this->sendAppData($params);
@@ -261,15 +261,15 @@ 
         }
         return $app['twig']->render('step5.twig', array(
             'form' => $form->createView(),
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
         ));
     }
     //    インストール完了
     public function complete(InstallApplication $app, Request $request)
     {
-        $config_yml = $this->config_path . '/config.php';
+        $config_yml = $this->config_path.'/config.php';
         $config = require $config_yml;
-        $config_path = $this->config_path . '/path.php';
+        $config_path = $this->config_path.'/path.php';
         $path_yml = require $config_path;
         $config = array_replace_recursive($path_yml, $config);
         if (isset($config['trusted_proxies_connection_only']) && !empty($config['trusted_proxies_connection_only'])) {
@@ -279,10 +279,10 @@ 
         }
         $host = $request->getSchemeAndHttpHost();
         $basePath = $request->getBasePath();
-        $adminUrl = $host . $basePath . '/' . $config['admin_dir'];
+        $adminUrl = $host.$basePath.'/'.$config['admin_dir'];
         return $app['twig']->render('complete.twig', array(
             'admin_url' => $adminUrl,
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
         ));
     }
     private function resetNatTimer()
@@ -296,11 +296,11 @@ 
     {
         foreach ($this->required_modules as $module) {
             if (!extension_loaded($module)) {
-                $app->addDanger('[必須] ' . $module . ' 拡張モジュールが有効になっていません。', 'install');
+                $app->addDanger('[必須] '.$module.' 拡張モジュールが有効になっていません。', 'install');
             }
         }
         if (!extension_loaded('pdo_mysql') && !extension_loaded('pdo_pgsql')) {
-            $app->addDanger('[必須] ' . 'pdo_pgsql又はpdo_mysql 拡張モジュールを有効にしてください。', 'install');
+            $app->addDanger('[必須] '.'pdo_pgsql又はpdo_mysql 拡張モジュールを有効にしてください。', 'install');
         }
         foreach ($this->recommended_module as $module) {
             if (!extension_loaded($module)) {
@@ -325,7 +325,7 @@ 
             if (!function_exists('apache_get_modules')) {
                 $app->addWarning('mod_rewrite が有効になっているか不明です。', 'install');
             } elseif (!in_array('mod_rewrite', apache_get_modules())) {
-                $app->addDanger('[必須] ' . 'mod_rewriteを有効にしてください。', 'install');
+                $app->addDanger('[必須] '.'mod_rewriteを有効にしてください。', 'install');
             }
         } elseif (isset($_SERVER['SERVER_SOFTWARE']) && strpos('Microsoft-IIS', $_SERVER['SERVER_SOFTWARE']) !== false) {
             // iis
@@ -335,7 +335,7 @@ 
     }
     private function setPDO()
     {
-        $config_file = $this->config_path . '/database.php';
+        $config_file = $this->config_path.'/database.php';
         $config = require $config_file;
         try {
             $this->PDO = \Doctrine\DBAL\DriverManager::getConnection($config['database'], new \Doctrine\DBAL\Configuration());
@@ -362,7 +362,7 @@ 
     private function getEntityManager()
     {
         if (!isset($this->app['orm.em'])) {
-            $config_file = $this->config_path . '/database.php';
+            $config_file = $this->config_path.'/database.php';
             $database = require $config_file;
             $this->app->register(new \Silex\Provider\DoctrineServiceProvider(), array(
                 'db.options' => $database['database']
@@ -372,7 +372,7 @@ 
                     'type' => 'annotation',
                     'namespace' => 'Eccube\Entity',
                     'path' => array(
-                        __DIR__ . '/../../Entity',
+                        __DIR__.'/../../Entity',
                     ),
                     'use_simple_annotation_reader' => false,
                 ),
@@ -404,7 +404,7 @@ 
                 }
             }
             $this->app->register(new \Dflydev\Provider\DoctrineOrm\DoctrineOrmServiceProvider(), array(
-                'orm.proxies_dir' => __DIR__ . '/../../app/cache/doctrine',
+                'orm.proxies_dir' => __DIR__.'/../../app/cache/doctrine',
                 'orm.em.options' => array(
                     'mappings' => $ormMappings
                 )
@@ -433,10 +433,10 @@ 
     private function insert()
     {
         $this->resetNatTimer();
-        $config_file = $this->config_path . '/database.php';
+        $config_file = $this->config_path.'/database.php';
         $database = require $config_file;
         $config['database'] = $database['database'];
-        $config_file = $this->config_path . '/config.php';
+        $config_file = $this->config_path.'/config.php';
         $baseConfig = require $config_file;
         $config['config'] = $baseConfig;
         $this->PDO->beginTransaction();
@@ -485,10 +485,10 @@ 
     private function update()
     {
         $this->resetNatTimer();
-        $config_file = $this->config_path . '/database.php';
+        $config_file = $this->config_path.'/database.php';
         $database = require $config_file;
         $config['database'] = $database['database'];
-        $config_file = $this->config_path . '/config.php';
+        $config_file = $this->config_path.'/config.php';
         $baseConfig = require $config_file;
         $config['config'] = $baseConfig;
         $this->PDO->beginTransaction();
@@ -539,7 +539,7 @@ 
         $app->boot();
         $config = new Configuration($app['db']);
         $config->setMigrationsNamespace('DoctrineMigrations');
-        $migrationDir = __DIR__ . '/../../Resource/doctrine/migration';
+        $migrationDir = __DIR__.'/../../Resource/doctrine/migration';
         $config->setMigrationsDirectory($migrationDir);
         $config->registerMigrationsFromDirectory($migrationDir);
         $migration = new Migration($config);
@@ -565,7 +565,7 @@ 
     private function getProtectedDirs()
     {
         $protectedDirs = array();
-        $base = __DIR__ . '/../../../..';
+        $base = __DIR__.'/../../../..';
         $dirs = array(
             '/html',
             '/app',
@@ -577,7 +577,7 @@ 
             '/app/Plugin',
         );
         foreach ($dirs as $dir) {
-            if (!is_writable($base . $dir)) {
+            if (!is_writable($base.$dir)) {
                 $protectedDirs[] = $dir;
             }
         }
@@ -586,7 +586,7 @@ 
     private function createConfigYamlFile($data, $auth = true)
     {
         $fs = new Filesystem();
-        $config_file = $this->config_path . '/config.php';
+        $config_file = $this->config_path.'/config.php';
         if ($fs->exists($config_file)) {
             $config = require $config_file;
             $fs->remove($config_file);
@@ -619,7 +619,7 @@ 
             $adminTrustedProxies = array('127.0.0.1/8', '::1');
         }
 
-        $config = require $this->dist_path . '/config.php';
+        $config = require $this->dist_path.'/config.php';
         $config['eccube_install'] = 0;
         $config['auth_magic'] = $auth_magic;
         $config['shop_name'] = $data['shop_name'];
@@ -643,7 +643,7 @@ 
 
     private function addInstallStatus()
     {
-        $config_file = $this->config_path . '/config.php';
+        $config_file = $this->config_path.'/config.php';
         $config = require $config_file;
         $config['eccube_install'] = 1;
 
@@ -654,7 +654,7 @@ 
     private function createDatabaseYamlFile($data)
     {
         $fs = new Filesystem();
-        $config_file = $this->config_path . '/database.php';
+        $config_file = $this->config_path.'/database.php';
         if ($fs->exists($config_file)) {
             $fs->remove($config_file);
         }
@@ -675,7 +675,7 @@ 
                     break;
             }
 
-            $config = $this->dist_path . '/database.php';
+            $config = $this->dist_path.'/database.php';
             $config['database']['driver'] = $data['db_driver'];
             $config['database']['host'] = $data['database_host'];
             $config['database']['dbname'] = $data['database_name'];
@@ -684,9 +684,9 @@ 
             $config['database']['password'] = $data['database_password'];
 
         } else {
-            $config = $this->dist_path . '/database_sqlite3.php';
+            $config = $this->dist_path.'/database_sqlite3.php';
             $config['database']['driver'] = 'pdo_sqlite';
-            $config['database']['path'] = realpath($this->config_path . '/eccube.db');
+            $config['database']['path'] = realpath($this->config_path.'/eccube.db');
         }
 
         $this->createPhp($config_file, $config);
@@ -696,7 +696,7 @@ 
     private function createMailYamlFile($data)
     {
         $fs = new Filesystem();
-        $config_file = $this->config_path . '/mail.php';
+        $config_file = $this->config_path.'/mail.php';
         if ($fs->exists($config_file)) {
             $fs->remove($config_file);
         }
@@ -715,7 +715,7 @@ 
     private function createPathYamlFile($data, Request $request)
     {
         $fs = new Filesystem();
-        $config_file = $this->config_path . '/path.php';
+        $config_file = $this->config_path.'/path.php';
         if ($fs->exists($config_file)) {
             $fs->remove($config_file);
         }
@@ -724,11 +724,11 @@ 
         $USER_DATA_ROUTE = 'user_data';
         $ROOT_DIR = '%ROOT_DIR%';
         $ROOT_URLPATH = $request->getBasePath();
-        $ROOT_PUBLIC_URLPATH = $ROOT_URLPATH . RELATIVE_PUBLIC_DIR_PATH;
+        $ROOT_PUBLIC_URLPATH = $ROOT_URLPATH.RELATIVE_PUBLIC_DIR_PATH;
         $target = array('${ADMIN_ROUTE}', '${TEMPLATE_CODE}', '${USER_DATA_ROUTE}', '${ROOT_DIR}', '${ROOT_URLPATH}', '${ROOT_PUBLIC_URLPATH}');
         $replace = array($ADMIN_ROUTE, $TEMPLATE_CODE, $USER_DATA_ROUTE, $ROOT_DIR, $ROOT_URLPATH, $ROOT_PUBLIC_URLPATH);
 
-        $config = require $this->dist_path . '/path.php';
+        $config = require $this->dist_path.'/path.php';
 
         $this->createPhp($config_file, $config);
 
@@ -736,7 +736,7 @@ 
     }
     private function sendAppData($params)
     {
-        $config_file = $this->config_path . '/database.php';
+        $config_file = $this->config_path.'/database.php';
         $db_config = require $config_file;
         $this->setPDO();
         $stmt = $this->PDO->query('select version() as v');
@@ -745,7 +745,7 @@ 
             $version = $row['v'];
         }
         if ($db_config['database']['driver'] === 'pdo_mysql') {
-            $db_ver = 'MySQL:' . $version;
+            $db_ver = 'MySQL:'.$version;
         } else {
             $db_ver = $version;
         }
@@ -761,7 +761,7 @@ 
         );
         $header = array(
             'Content-Type: application/x-www-form-urlencoded',
-            'Content-Length: ' . strlen($data),
+            'Content-Length: '.strlen($data),
         );
         $context = stream_context_create(
             array(
@@ -786,7 +786,7 @@ 
     public function migration(InstallApplication $app, Request $request)
     {
         return $app['twig']->render('migration.twig', array(
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
         ));
     }
     /**
@@ -812,7 +812,7 @@ 
             return $app['twig']->render('migration_plugin.twig', array(
                 'Plugins' => $Plugins,
                 'version' => Constant::VERSION,
-                'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+                'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
             ));
         }
     }
@@ -832,7 +832,7 @@ 
         $config_app->boot();
         \Eccube\Util\Cache::clear($config_app, true);
         return $app['twig']->render('migration_end.twig', array(
-            'publicPath' => '..' . RELATIVE_PUBLIC_DIR_PATH . '/',
+            'publicPath' => '..'.RELATIVE_PUBLIC_DIR_PATH.'/',
         ));
     }
 }
\ No newline at end of file

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

Spacing +14 added lines, -14 removed lines

@@ -320,7 +320,7 @@ 
                     }
 
                     $extension = $image->getClientOriginalExtension();
-                    $filename = date('mdHis') . uniqid('_') . '.' . $extension;
+                    $filename = date('mdHis').uniqid('_').'.'.$extension;
                     $image->move($this->appConfig['image_temp_realdir'], $filename);
                     $files[] = $filename;
                 }
@@ -399,7 +399,7 @@ 
         $form = $builder->getForm();
 
         if (!$has_class) {
-            $ProductClass->setStockUnlimited((boolean)$ProductClass->getStockUnlimited());
+            $ProductClass->setStockUnlimited((boolean) $ProductClass->getStockUnlimited());
             $form['class']->setData($ProductClass);
         }
 
@@ -481,8 +481,8 @@ 
                 $Categories = $form->get('Category')->getData();
                 $categoriesIdList = array();
                 foreach ($Categories as $Category) {
-                    foreach($Category->getPath() as $ParentCategory){
-                        if (!isset($categoriesIdList[$ParentCategory->getId()])){
+                    foreach ($Category->getPath() as $ParentCategory) {
+                        if (!isset($categoriesIdList[$ParentCategory->getId()])) {
                             $ProductCategory = $this->createProductCategory($Product, $ParentCategory, $count);
                             $this->entityManager->persist($ProductCategory);
                             $count++;
@@ -491,7 +491,7 @@ 
                             $categoriesIdList[$ParentCategory->getId()] = true;
                         }
                     }
-                    if (!isset($categoriesIdList[$Category->getId()])){
+                    if (!isset($categoriesIdList[$Category->getId()])) {
                         $ProductCategory = $this->createProductCategory($Product, $Category, $count);
                         $this->entityManager->persist($ProductCategory);
                         $count++;
@@ -513,7 +513,7 @@ 
                     $this->entityManager->persist($ProductImage);
 
                     // 移動
-                    $file = new File($this->appConfig['image_temp_realdir'] . '/' . $add_image);
+                    $file = new File($this->appConfig['image_temp_realdir'].'/'.$add_image);
                     $file->move($this->appConfig['image_save_realdir']);
                 }
 
@@ -533,7 +533,7 @@ 
 
                     // 削除
                     $fs = new Filesystem();
-                    $fs->remove($this->appConfig['image_save_realdir'] . '/' . $delete_image);
+                    $fs->remove($this->appConfig['image_save_realdir'].'/'.$delete_image);
                 }
                 $this->entityManager->persist($Product);
                 $this->entityManager->flush();
@@ -668,7 +668,7 @@ 
                     foreach ($deleteImages as $deleteImage) {
                         try {
                             $fs = new Filesystem();
-                            $fs->remove($this->appConfig['image_save_realdir'] . '/' . $deleteImage);
+                            $fs->remove($this->appConfig['image_save_realdir'].'/'.$deleteImage);
                         } catch (\Exception $e) {
                             // エラーが発生しても無視する
                         }
@@ -742,10 +742,10 @@ 
 
                     // 画像ファイルを新規作成
                     $extension = pathinfo($Image->getFileName(), PATHINFO_EXTENSION);
-                    $filename = date('mdHis') . uniqid('_') . '.' . $extension;
+                    $filename = date('mdHis').uniqid('_').'.'.$extension;
                     try {
                         $fs = new Filesystem();
-                        $fs->copy($this->appConfig['image_save_realdir'] . '/' . $Image->getFileName(), $this->appConfig['image_save_realdir'] . '/' . $filename);
+                        $fs->copy($this->appConfig['image_save_realdir'].'/'.$Image->getFileName(), $this->appConfig['image_save_realdir'].'/'.$filename);
                     } catch (\Exception $e) {
                         // エラーが発生しても無視する
                     }
@@ -825,7 +825,7 @@ 
         $em->getConfiguration()->setSQLLogger(null);
 
         $response = new StreamedResponse();
-        $response->setCallback(function () use ($app, $request) {
+        $response->setCallback(function() use ($app, $request) {
 
             // CSV種別を元に初期化.
             $this->csvExportService->initCsvType(CsvType::CSV_TYPE_PRODUCT);
@@ -865,7 +865,7 @@ 
             // データ行の出力.
             $this->csvExportService->setExportQueryBuilder($qb);
 
-            $this->csvExportService->exportData(function ($entity, CsvExportService $csvService) use ($app, $request) {
+            $this->csvExportService->exportData(function($entity, CsvExportService $csvService) use ($app, $request) {
                 $Csvs = $csvService->getCsvs();
 
                 /** @var $Product \Eccube\Entity\Product */
@@ -908,9 +908,9 @@ 
         });
 
         $now = new \DateTime();
-        $filename = 'product_' . $now->format('YmdHis') . '.csv';
+        $filename = 'product_'.$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/CsvImportController.php

Spacing +74 added lines, -74 removed lines

@@ -190,7 +190,7 @@ 
                     foreach ($data as $row) {
 
                         if ($headerSize != count($row)) {
-                            $this->addErrors(($data->key() + 1) . '行目のCSVフォーマットが一致しません。');
+                            $this->addErrors(($data->key() + 1).'行目のCSVフォーマットが一致しません。');
                             return $this->render($app, $form, $headers);
                         }
 
@@ -201,33 +201,33 @@ 
                             if (preg_match('/^\d+$/', $row['商品ID'])) {
                                 $Product = $this->productRepository->find($row['商品ID']);
                                 if (!$Product) {
-                                    $this->addErrors(($data->key() + 1) . '行目の商品IDが存在しません。');
+                                    $this->addErrors(($data->key() + 1).'行目の商品IDが存在しません。');
                                     return $this->render($app, $form, $headers);
                                 }
                             } else {
-                                $this->addErrors(($data->key() + 1) . '行目の商品IDが存在しません。');
+                                $this->addErrors(($data->key() + 1).'行目の商品IDが存在しません。');
                                 return $this->render($app, $form, $headers);
                             }
 
                         }
 
                         if ($row['公開ステータス(ID)'] == '') {
-                            $this->addErrors(($data->key() + 1) . '行目の公開ステータス(ID)が設定されていません。');
+                            $this->addErrors(($data->key() + 1).'行目の公開ステータス(ID)が設定されていません。');
                         } else {
                             if (preg_match('/^\d+$/', $row['公開ステータス(ID)'])) {
                                 $Disp = $this->dispRepository->find($row['公開ステータス(ID)']);
                                 if (!$Disp) {
-                                    $this->addErrors(($data->key() + 1) . '行目の公開ステータス(ID)が存在しません。');
+                                    $this->addErrors(($data->key() + 1).'行目の公開ステータス(ID)が存在しません。');
                                 } else {
                                     $Product->setStatus($Disp);
                                 }
                             } else {
-                                $this->addErrors(($data->key() + 1) . '行目の公開ステータス(ID)が存在しません。');
+                                $this->addErrors(($data->key() + 1).'行目の公開ステータス(ID)が存在しません。');
                             }
                         }
 
                         if (Str::isBlank($row['商品名'])) {
-                            $this->addErrors(($data->key() + 1) . '行目の商品名が設定されていません。');
+                            $this->addErrors(($data->key() + 1).'行目の商品名が設定されていません。');
                             return $this->render($app, $form, $headers);
                         } else {
                             $Product->setName(Str::trimAll($row['商品名']));
@@ -286,7 +286,7 @@ 
                                     if (preg_match('/^\d+$/', $deliveryFee) && $deliveryFee >= 0) {
                                         $ProductClassOrg->setDeliveryFee($deliveryFee);
                                     } else {
-                                        $this->addErrors(($data->key() + 1) . '行目の送料は0以上の数値を設定してください。');
+                                        $this->addErrors(($data->key() + 1).'行目の送料は0以上の数値を設定してください。');
                                     }
                                 }
                             }
@@ -294,7 +294,7 @@ 
                             if ($row['規格分類1(ID)'] != '') {
 
                                 if ($row['規格分類1(ID)'] == $row['規格分類2(ID)']) {
-                                    $this->addErrors(($data->key() + 1) . '行目の規格分類1(ID)と規格分類2(ID)には同じ値を使用できません。');
+                                    $this->addErrors(($data->key() + 1).'行目の規格分類1(ID)と規格分類2(ID)には同じ値を使用できません。');
                                 } else {
                                     // 商品規格あり
                                     // 企画分類あり商品を作成
@@ -309,30 +309,30 @@ 
                                     if (preg_match('/^\d+$/', $row['規格分類1(ID)'])) {
                                         $ClassCategory1 = $this->classCategoryRepository->find($row['規格分類1(ID)']);
                                         if (!$ClassCategory1) {
-                                            $this->addErrors(($data->key() + 1) . '行目の規格分類1(ID)が存在しません。');
+                                            $this->addErrors(($data->key() + 1).'行目の規格分類1(ID)が存在しません。');
                                         } else {
                                             $ProductClass->setClassCategory1($ClassCategory1);
                                         }
                                     } else {
-                                        $this->addErrors(($data->key() + 1) . '行目の規格分類1(ID)が存在しません。');
+                                        $this->addErrors(($data->key() + 1).'行目の規格分類1(ID)が存在しません。');
                                     }
 
                                     if ($row['規格分類2(ID)'] != '') {
                                         if (preg_match('/^\d+$/', $row['規格分類2(ID)'])) {
                                             $ClassCategory2 = $this->classCategoryRepository->find($row['規格分類2(ID)']);
                                             if (!$ClassCategory2) {
-                                                $this->addErrors(($data->key() + 1) . '行目の規格分類2(ID)が存在しません。');
+                                                $this->addErrors(($data->key() + 1).'行目の規格分類2(ID)が存在しません。');
                                             } else {
                                                 if ($ClassCategory1 &&
                                                     ($ClassCategory1->getClassName()->getId() == $ClassCategory2->getClassName()->getId())
                                                 ) {
-                                                    $this->addErrors(($data->key() + 1) . '行目の規格分類1(ID)と規格分類2(ID)の規格名が同じです。');
+                                                    $this->addErrors(($data->key() + 1).'行目の規格分類1(ID)と規格分類2(ID)の規格名が同じです。');
                                                 } else {
                                                     $ProductClass->setClassCategory2($ClassCategory2);
                                                 }
                                             }
                                         } else {
-                                            $this->addErrors(($data->key() + 1) . '行目の規格分類2(ID)が存在しません。');
+                                            $this->addErrors(($data->key() + 1).'行目の規格分類2(ID)が存在しません。');
                                         }
                                     }
                                     $ProductClass->setProductStock($ProductStock);
@@ -344,7 +344,7 @@ 
 
                             } else {
                                 if ($row['規格分類2(ID)'] != '') {
-                                    $this->addErrors(($data->key() + 1) . '行目の規格分類1(ID)が存在しません。');
+                                    $this->addErrors(($data->key() + 1).'行目の規格分類1(ID)が存在しません。');
                                 }
                             }
 
@@ -372,7 +372,7 @@ 
                                             if (preg_match('/^\d+$/', $deliveryFee) && $deliveryFee >= 0) {
                                                 $pc->setDeliveryFee($deliveryFee);
                                             } else {
-                                                $this->addErrors(($data->key() + 1) . '行目の送料は0以上の数値を設定してください。');
+                                                $this->addErrors(($data->key() + 1).'行目の送料は0以上の数値を設定してください。');
                                             }
                                         }
                                     }
@@ -394,7 +394,7 @@ 
                                 }
 
                                 if ($row['規格分類1(ID)'] == $row['規格分類2(ID)']) {
-                                    $this->addErrors(($data->key() + 1) . '行目の規格分類1(ID)と規格分類2(ID)には同じ値を使用できません。');
+                                    $this->addErrors(($data->key() + 1).'行目の規格分類1(ID)と規格分類2(ID)には同じ値を使用できません。');
                                 } else {
 
                                     // 必ず規格分類1がセットされている
@@ -403,36 +403,36 @@ 
                                     if (preg_match('/^\d+$/', $classCategoryId1)) {
                                         $ClassCategory1 = $this->classCategoryRepository->find($classCategoryId1);
                                         if (!$ClassCategory1) {
-                                            $this->addErrors(($data->key() + 1) . '行目の規格分類1(ID)が存在しません。');
+                                            $this->addErrors(($data->key() + 1).'行目の規格分類1(ID)が存在しません。');
                                         }
                                     } else {
-                                        $this->addErrors(($data->key() + 1) . '行目の規格分類1(ID)が存在しません。');
+                                        $this->addErrors(($data->key() + 1).'行目の規格分類1(ID)が存在しません。');
                                     }
 
                                     $ClassCategory2 = null;
                                     if ($row['規格分類2(ID)'] != '') {
                                         if ($pc->getClassCategory1() != null && $pc->getClassCategory2() == null) {
-                                            $this->addErrors(($data->key() + 1) . '行目の規格分類2(ID)は設定できません。');
+                                            $this->addErrors(($data->key() + 1).'行目の規格分類2(ID)は設定できません。');
                                         } else {
                                             if (preg_match('/^\d+$/', $classCategoryId2)) {
                                                 $ClassCategory2 = $this->classCategoryRepository->find($classCategoryId2);
                                                 if (!$ClassCategory2) {
-                                                    $this->addErrors(($data->key() + 1) . '行目の規格分類2(ID)が存在しません。');
+                                                    $this->addErrors(($data->key() + 1).'行目の規格分類2(ID)が存在しません。');
                                                 } else {
                                                     if ($ClassCategory1 &&
                                                         ($ClassCategory1->getClassName()->getId() == $ClassCategory2->getClassName()->getId())
                                                     ) {
-                                                        $this->addErrors(($data->key() + 1) . '行目の規格分類1(ID)と規格分類2(ID)の規格名が同じです。');
+                                                        $this->addErrors(($data->key() + 1).'行目の規格分類1(ID)と規格分類2(ID)の規格名が同じです。');
                                                     }
                                                 }
                                             } else {
-                                                $this->addErrors(($data->key() + 1) . '行目の規格分類2(ID)が存在しません。');
+                                                $this->addErrors(($data->key() + 1).'行目の規格分類2(ID)が存在しません。');
                                             }
 
                                         }
                                     } else {
                                         if ($pc->getClassCategory1() != null && $pc->getClassCategory2() != null) {
-                                            $this->addErrors(($data->key() + 1) . '行目の規格分類2(ID)に値を設定してください。');
+                                            $this->addErrors(($data->key() + 1).'行目の規格分類2(ID)に値を設定してください。');
                                         }
                                     }
                                     $ProductClass = $this->createProductClass($row, $Product, $app, $data, $ClassCategory1, $ClassCategory2);
@@ -443,7 +443,7 @@ 
                                             if (preg_match('/^\d+$/', $deliveryFee) && $deliveryFee >= 0) {
                                                 $ProductClass->setDeliveryFee($deliveryFee);
                                             } else {
-                                                $this->addErrors(($data->key() + 1) . '行目の送料は0以上の数値を設定してください。');
+                                                $this->addErrors(($data->key() + 1).'行目の送料は0以上の数値を設定してください。');
                                             }
                                         }
                                     }
@@ -533,7 +533,7 @@ 
                     foreach ($data as $row) {
 
                         if ($headerSize != count($row)) {
-                            $this->addErrors(($data->key() + 1) . '行目のCSVフォーマットが一致しません。');
+                            $this->addErrors(($data->key() + 1).'行目のCSVフォーマットが一致しません。');
                             return $this->render($app, $form, $headers);
                         }
 
@@ -541,23 +541,23 @@ 
                             $Category = new Category();
                         } else {
                             if (!preg_match('/^\d+$/', $row['カテゴリID'])) {
-                                $this->addErrors(($data->key() + 1) . '行目のカテゴリIDが存在しません。');
+                                $this->addErrors(($data->key() + 1).'行目のカテゴリIDが存在しません。');
                                 return $this->render($app, $form, $headers);
                             }
                             $Category = $this->categoryRepository->find($row['カテゴリID']);
                             if (!$Category) {
-                                $this->addErrors(($data->key() + 1) . '行目のカテゴリIDが存在しません。');
+                                $this->addErrors(($data->key() + 1).'行目のカテゴリIDが存在しません。');
                                 return $this->render($app, $form, $headers);
                             }
                             if ($row['カテゴリID'] == $row['親カテゴリID']) {
-                                $this->addErrors(($data->key() + 1) . '行目のカテゴリIDと親カテゴリIDが同じです。');
+                                $this->addErrors(($data->key() + 1).'行目のカテゴリIDと親カテゴリIDが同じです。');
                                 return $this->render($app, $form, $headers);
                             }
 
                         }
 
                         if (Str::isBlank($row['カテゴリ名'])) {
-                            $this->addErrors(($data->key() + 1) . '行目のカテゴリ名が設定されていません。');
+                            $this->addErrors(($data->key() + 1).'行目のカテゴリ名が設定されていません。');
                             return $this->render($app, $form, $headers);
                         } else {
                             $Category->setName(Str::trimAll($row['カテゴリ名']));
@@ -566,13 +566,13 @@ 
                         if ($row['親カテゴリID'] != '') {
 
                             if (!preg_match('/^\d+$/', $row['親カテゴリID'])) {
-                                $this->addErrors(($data->key() + 1) . '行目の親カテゴリIDが存在しません。');
+                                $this->addErrors(($data->key() + 1).'行目の親カテゴリIDが存在しません。');
                                 return $this->render($app, $form, $headers);
                             }
 
                             $ParentCategory = $this->categoryRepository->find($row['親カテゴリID']);
                             if (!$ParentCategory) {
-                                $this->addErrors(($data->key() + 1) . '行目の親カテゴリIDが存在しません。');
+                                $this->addErrors(($data->key() + 1).'行目の親カテゴリIDが存在しません。');
                                 return $this->render($app, $form, $headers);
                             }
 
@@ -588,14 +588,14 @@ 
                         }
 
                         if ($this->appConfig['category_nest_level'] < $Category->getLevel()) {
-                            $this->addErrors(($data->key() + 1) . '行目のカテゴリが最大レベルを超えているため設定できません。');
+                            $this->addErrors(($data->key() + 1).'行目のカテゴリが最大レベルを超えているため設定できません。');
                             return $this->render($app, $form, $headers);
                         }
 
                         $status = $this->categoryRepository->save($Category);
 
                         if (!$status) {
-                            $this->addErrors(($data->key() + 1) . '行目のカテゴリが設定できません。');
+                            $this->addErrors(($data->key() + 1).'行目のカテゴリが設定できません。');
                         }
 
                         if ($this->hasErrors()) {
@@ -642,7 +642,7 @@ 
             throw new NotFoundHttpException();
         }
 
-        $response->setCallback(function () use ($app, $request, $headers) {
+        $response->setCallback(function() use ($app, $request, $headers) {
 
             // ヘッダ行の出力
             $row = array();
@@ -657,7 +657,7 @@ 
         });
 
         $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();
 
         return $response;
@@ -680,7 +680,7 @@ 
         if (!empty($this->fileName)) {
             try {
                 $fs = new Filesystem();
-                $fs->remove($this->appConfig['csv_temp_realdir'] . '/' . $this->fileName);
+                $fs->remove($this->appConfig['csv_temp_realdir'].'/'.$this->fileName);
             } catch (\Exception $e) {
                 // エラーが発生しても無視する
             }
@@ -703,10 +703,10 @@ 
     protected function getImportData($app, $formFile)
     {
         // アップロードされたCSVファイルを一時ディレクトリに保存
-        $this->fileName = 'upload_' . Str::random() . '.' . $formFile->getClientOriginalExtension();
+        $this->fileName = 'upload_'.Str::random().'.'.$formFile->getClientOriginalExtension();
         $formFile->move($this->appConfig['csv_temp_realdir'], $this->fileName);
 
-        $file = file_get_contents($this->appConfig['csv_temp_realdir'] . '/' . $this->fileName);
+        $file = file_get_contents($this->appConfig['csv_temp_realdir'].'/'.$this->fileName);
 
         if ('\\' === DIRECTORY_SEPARATOR && PHP_VERSION_ID >= 70000) {
             // Windows 環境の PHP7 の場合はファイルエンコーディングを CP932 に合わせる
@@ -802,8 +802,8 @@ 
                 if (!$Category) {
                     $this->addErrors(($data->key() + 1).'行目の商品カテゴリ(ID)「'.$category.'」が存在しません。');
                 } else {
-                    foreach($Category->getPath() as $ParentCategory){
-                        if (!isset($categoriesIdList[$ParentCategory->getId()])){
+                    foreach ($Category->getPath() as $ParentCategory) {
+                        if (!isset($categoriesIdList[$ParentCategory->getId()])) {
                             $ProductCategory = $this->makeProductCategory($Product, $ParentCategory, $rank);
                             $this->entityManager->persist($ProductCategory);
                             $rank++;
@@ -811,7 +811,7 @@ 
                             $categoriesIdList[$ParentCategory->getId()] = true;
                         }
                     }
-                    if (!isset($categoriesIdList[$Category->getId()])){
+                    if (!isset($categoriesIdList[$Category->getId()])) {
                         $ProductCategory = $this->makeProductCategory($Product, $Category, $rank);
                         $rank++;
                         $this->em->persist($ProductCategory);
@@ -866,7 +866,7 @@ 
                 }
             }
             if (!$Tag) {
-                $this->addErrors(($data->key() + 1) . '行目のタグ(ID)「' . $tag_id . '」が存在しません。');
+                $this->addErrors(($data->key() + 1).'行目のタグ(ID)「'.$tag_id.'」が存在しません。');
             }
         }
     }
@@ -885,17 +885,17 @@ 
 
 
         if ($row['商品種別(ID)'] == '') {
-            $this->addErrors(($data->key() + 1) . '行目の商品種別(ID)が設定されていません。');
+            $this->addErrors(($data->key() + 1).'行目の商品種別(ID)が設定されていません。');
         } else {
             if (preg_match('/^\d+$/', $row['商品種別(ID)'])) {
                 $ProductType = $this->productTypeRepository->find($row['商品種別(ID)']);
                 if (!$ProductType) {
-                    $this->addErrors(($data->key() + 1) . '行目の商品種別(ID)が存在しません。');
+                    $this->addErrors(($data->key() + 1).'行目の商品種別(ID)が存在しません。');
                 } else {
                     $ProductClass->setProductType($ProductType);
                 }
             } else {
-                $this->addErrors(($data->key() + 1) . '行目の商品種別(ID)が存在しません。');
+                $this->addErrors(($data->key() + 1).'行目の商品種別(ID)が存在しません。');
             }
         }
 
@@ -906,12 +906,12 @@ 
             if (preg_match('/^\d+$/', $row['発送日目安(ID)'])) {
                 $DeliveryDate = $this->deliveryDateRepository->find($row['発送日目安(ID)']);
                 if (!$DeliveryDate) {
-                    $this->addErrors(($data->key() + 1) . '行目の発送日目安(ID)が存在しません。');
+                    $this->addErrors(($data->key() + 1).'行目の発送日目安(ID)が存在しません。');
                 } else {
                     $ProductClass->setDeliveryDate($DeliveryDate);
                 }
             } else {
-                $this->addErrors(($data->key() + 1) . '行目の発送日目安(ID)が存在しません。');
+                $this->addErrors(($data->key() + 1).'行目の発送日目安(ID)が存在しません。');
             }
         }
 
@@ -922,19 +922,19 @@ 
         }
 
         if ($row['在庫数無制限フラグ'] == '') {
-            $this->addErrors(($data->key() + 1) . '行目の在庫数無制限フラグが設定されていません。');
+            $this->addErrors(($data->key() + 1).'行目の在庫数無制限フラグが設定されていません。');
         } else {
             if ($row['在庫数無制限フラグ'] == (string) Constant::DISABLED) {
                 $ProductClass->setStockUnlimited(Constant::DISABLED);
                 // 在庫数が設定されていなければエラー
                 if ($row['在庫数'] == '') {
-                    $this->addErrors(($data->key() + 1) . '行目の在庫数が設定されていません。');
+                    $this->addErrors(($data->key() + 1).'行目の在庫数が設定されていません。');
                 } else {
                     $stock = str_replace(',', '', $row['在庫数']);
                     if (preg_match('/^\d+$/', $stock) && $stock >= 0) {
                         $ProductClass->setStock($stock);
                     } else {
-                        $this->addErrors(($data->key() + 1) . '行目の在庫数は0以上の数値を設定してください。');
+                        $this->addErrors(($data->key() + 1).'行目の在庫数は0以上の数値を設定してください。');
                     }
                 }
 
@@ -942,7 +942,7 @@ 
                 $ProductClass->setStockUnlimited(Constant::ENABLED);
                 $ProductClass->setStock(null);
             } else {
-                $this->addErrors(($data->key() + 1) . '行目の在庫数無制限フラグが設定されていません。');
+                $this->addErrors(($data->key() + 1).'行目の在庫数無制限フラグが設定されていません。');
             }
         }
 
@@ -951,7 +951,7 @@ 
             if (preg_match('/^\d+$/', $saleLimit) && $saleLimit >= 0) {
                 $ProductClass->setSaleLimit($saleLimit);
             } else {
-                $this->addErrors(($data->key() + 1) . '行目の販売制限数は0以上の数値を設定してください。');
+                $this->addErrors(($data->key() + 1).'行目の販売制限数は0以上の数値を設定してください。');
             }
         }
 
@@ -960,18 +960,18 @@ 
             if (preg_match('/^\d+$/', $price01) && $price01 >= 0) {
                 $ProductClass->setPrice01($price01);
             } else {
-                $this->addErrors(($data->key() + 1) . '行目の通常価格は0以上の数値を設定してください。');
+                $this->addErrors(($data->key() + 1).'行目の通常価格は0以上の数値を設定してください。');
             }
         }
 
         if ($row['販売価格'] == '') {
-            $this->addErrors(($data->key() + 1) . '行目の販売価格が設定されていません。');
+            $this->addErrors(($data->key() + 1).'行目の販売価格が設定されていません。');
         } else {
             $price02 = str_replace(',', '', $row['販売価格']);
             if (preg_match('/^\d+$/', $price02) && $price02 >= 0) {
                 $ProductClass->setPrice02($price02);
             } else {
-                $this->addErrors(($data->key() + 1) . '行目の販売価格は0以上の数値を設定してください。');
+                $this->addErrors(($data->key() + 1).'行目の販売価格は0以上の数値を設定してください。');
             }
         }
 
@@ -980,7 +980,7 @@ 
             if (preg_match('/^\d+$/', $delivery_fee) && $delivery_fee >= 0) {
                 $ProductClass->setDeliveryFee($delivery_fee);
             } else {
-                $this->addErrors(($data->key() + 1) . '行目の送料は0以上の数値を設定してください。');
+                $this->addErrors(($data->key() + 1).'行目の送料は0以上の数値を設定してください。');
             }
         }
 
@@ -1013,17 +1013,17 @@ 
         $ProductClass->setProduct($Product);
 
         if ($row['商品種別(ID)'] == '') {
-            $this->addErrors(($data->key() + 1) . '行目の商品種別(ID)が設定されていません。');
+            $this->addErrors(($data->key() + 1).'行目の商品種別(ID)が設定されていません。');
         } else {
             if (preg_match('/^\d+$/', $row['商品種別(ID)'])) {
                 $ProductType = $this->productTypeRepository->find($row['商品種別(ID)']);
                 if (!$ProductType) {
-                    $this->addErrors(($data->key() + 1) . '行目の商品種別(ID)が存在しません。');
+                    $this->addErrors(($data->key() + 1).'行目の商品種別(ID)が存在しません。');
                 } else {
                     $ProductClass->setProductType($ProductType);
                 }
             } else {
-                $this->addErrors(($data->key() + 1) . '行目の商品種別(ID)が存在しません。');
+                $this->addErrors(($data->key() + 1).'行目の商品種別(ID)が存在しません。');
             }
         }
 
@@ -1032,12 +1032,12 @@ 
             if (preg_match('/^\d+$/', $row['規格分類1(ID)'])) {
                 $ClassCategory = $this->classCategoryRepository->find($row['規格分類1(ID)']);
                 if (!$ClassCategory) {
-                    $this->addErrors(($data->key() + 1) . '行目の規格分類1(ID)が存在しません。');
+                    $this->addErrors(($data->key() + 1).'行目の規格分類1(ID)が存在しません。');
                 } else {
                     $ProductClass->setClassCategory1($ClassCategory);
                 }
             } else {
-                $this->addErrors(($data->key() + 1) . '行目の規格分類1(ID)が存在しません。');
+                $this->addErrors(($data->key() + 1).'行目の規格分類1(ID)が存在しません。');
             }
         }
 
@@ -1045,12 +1045,12 @@ 
             if (preg_match('/^\d+$/', $row['規格分類2(ID)'])) {
                 $ClassCategory = $this->classCategoryRepository->find($row['規格分類2(ID)']);
                 if (!$ClassCategory) {
-                    $this->addErrors(($data->key() + 1) . '行目の規格分類2(ID)が存在しません。');
+                    $this->addErrors(($data->key() + 1).'行目の規格分類2(ID)が存在しません。');
                 } else {
                     $ProductClass->setClassCategory2($ClassCategory);
                 }
             } else {
-                $this->addErrors(($data->key() + 1) . '行目の規格分類2(ID)が存在しません。');
+                $this->addErrors(($data->key() + 1).'行目の規格分類2(ID)が存在しません。');
             }
         }
 
@@ -1058,12 +1058,12 @@ 
             if (preg_match('/^\d+$/', $row['発送日目安(ID)'])) {
                 $DeliveryDate = $this->deliveryDateRepository->find($row['発送日目安(ID)']);
                 if (!$DeliveryDate) {
-                    $this->addErrors(($data->key() + 1) . '行目の発送日目安(ID)が存在しません。');
+                    $this->addErrors(($data->key() + 1).'行目の発送日目安(ID)が存在しません。');
                 } else {
                     $ProductClass->setDeliveryDate($DeliveryDate);
                 }
             } else {
-                $this->addErrors(($data->key() + 1) . '行目の発送日目安(ID)が存在しません。');
+                $this->addErrors(($data->key() + 1).'行目の発送日目安(ID)が存在しません。');
             }
         }
 
@@ -1074,19 +1074,19 @@ 
         }
 
         if ($row['在庫数無制限フラグ'] == '') {
-            $this->addErrors(($data->key() + 1) . '行目の在庫数無制限フラグが設定されていません。');
+            $this->addErrors(($data->key() + 1).'行目の在庫数無制限フラグが設定されていません。');
         } else {
             if ($row['在庫数無制限フラグ'] == (string) Constant::DISABLED) {
                 $ProductClass->setStockUnlimited(Constant::DISABLED);
                 // 在庫数が設定されていなければエラー
                 if ($row['在庫数'] == '') {
-                    $this->addErrors(($data->key() + 1) . '行目の在庫数が設定されていません。');
+                    $this->addErrors(($data->key() + 1).'行目の在庫数が設定されていません。');
                 } else {
                     $stock = str_replace(',', '', $row['在庫数']);
                     if (preg_match('/^\d+$/', $stock) && $stock >= 0) {
                         $ProductClass->setStock($row['在庫数']);
                     } else {
-                        $this->addErrors(($data->key() + 1) . '行目の在庫数は0以上の数値を設定してください。');
+                        $this->addErrors(($data->key() + 1).'行目の在庫数は0以上の数値を設定してください。');
                     }
                 }
 
@@ -1094,7 +1094,7 @@ 
                 $ProductClass->setStockUnlimited(Constant::ENABLED);
                 $ProductClass->setStock(null);
             } else {
-                $this->addErrors(($data->key() + 1) . '行目の在庫数無制限フラグが設定されていません。');
+                $this->addErrors(($data->key() + 1).'行目の在庫数無制限フラグが設定されていません。');
             }
         }
 
@@ -1103,7 +1103,7 @@ 
             if (preg_match('/^\d+$/', $saleLimit) && $saleLimit >= 0) {
                 $ProductClass->setSaleLimit($saleLimit);
             } else {
-                $this->addErrors(($data->key() + 1) . '行目の販売制限数は0以上の数値を設定してください。');
+                $this->addErrors(($data->key() + 1).'行目の販売制限数は0以上の数値を設定してください。');
             }
         }
 
@@ -1112,18 +1112,18 @@ 
             if (preg_match('/^\d+$/', $price01) && $price01 >= 0) {
                 $ProductClass->setPrice01($price01);
             } else {
-                $this->addErrors(($data->key() + 1) . '行目の通常価格は0以上の数値を設定してください。');
+                $this->addErrors(($data->key() + 1).'行目の通常価格は0以上の数値を設定してください。');
             }
         }
 
         if ($row['販売価格'] == '') {
-            $this->addErrors(($data->key() + 1) . '行目の販売価格が設定されていません。');
+            $this->addErrors(($data->key() + 1).'行目の販売価格が設定されていません。');
         } else {
             $price02 = str_replace(',', '', $row['販売価格']);
             if (preg_match('/^\d+$/', $price02) && $price02 >= 0) {
                 $ProductClass->setPrice02($price02);
             } else {
-                $this->addErrors(($data->key() + 1) . '行目の販売価格は0以上の数値を設定してください。');
+                $this->addErrors(($data->key() + 1).'行目の販売価格は0以上の数値を設定してください。');
             }
         }
 

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

Spacing +9 added lines, -9 removed lines

@@ -303,7 +303,7 @@ 
         log_info('受注削除開始', array($Order->getId()));
 
         // 出荷に紐付いている明細がある場合は削除できない.
-        $hasShipping = $Order->getItems()->exists(function ($k, $v) {
+        $hasShipping = $Order->getItems()->exists(function($k, $v) {
             return false === is_null($v->getShipping());
         });
         if ($hasShipping) {
@@ -361,7 +361,7 @@ 
         $em->getConfiguration()->setSQLLogger(null);
 
         $response = new StreamedResponse();
-        $response->setCallback(function () use ($app, $request) {
+        $response->setCallback(function() use ($app, $request) {
 
             // CSV種別を元に初期化.
             $this->csvExportService->initCsvType(CsvType::CSV_TYPE_ORDER);
@@ -375,7 +375,7 @@ 
 
             // データ行の出力.
             $this->csvExportService->setExportQueryBuilder($qb);
-            $this->csvExportService->exportData(function ($entity, $csvService) use ($app, $request) {
+            $this->csvExportService->exportData(function($entity, $csvService) use ($app, $request) {
 
                 $Csvs = $csvService->getCsvs();
 
@@ -416,9 +416,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));
@@ -445,7 +445,7 @@ 
         $em->getConfiguration()->setSQLLogger(null);
 
         $response = new StreamedResponse();
-        $response->setCallback(function () use ($app, $request) {
+        $response->setCallback(function() use ($app, $request) {
 
             // CSV種別を元に初期化.
             $this->csvExportService->initCsvType(CsvType::CSV_TYPE_SHIPPING);
@@ -459,7 +459,7 @@ 
 
             // データ行の出力.
             $this->csvExportService->setExportQueryBuilder($qb);
-            $this->csvExportService->exportData(function ($entity, $csvService) use ($app, $request) {
+            $this->csvExportService->exportData(function($entity, $csvService) use ($app, $request) {
 
                 $Csvs = $csvService->getCsvs();
 
@@ -509,9 +509,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/Setting/Shop/PaymentController.php

Spacing +1 added lines, -1 removed lines

@@ -242,7 +242,7 @@
             $this->eventDispatcher->dispatch(EccubeEvents::ADMIN_SETTING_SHOP_PAYMENT_DELETE_COMPLETE, $event);
 
             $app->addSuccess('admin.delete.complete', 'admin');
-        } catch(ForeignKeyConstraintViolationException $e) {
+        } catch (ForeignKeyConstraintViolationException $e) {
             $this->entityManager->rollback();
             $app->addError('admin.payment.delete.error', 'admin');
         }

src/Eccube/Repository/PluginEventHandlerRepository.php

Spacing +31 added lines, -31 removed lines

@@ -42,8 +42,8 @@ 
     {
         $qb = $this->createQueryBuilder('e')
             ->innerJoin('e.Plugin', 'p')
-            ->Orderby('e.event','ASC') 
-            ->addOrderby('e.priority','DESC');
+            ->Orderby('e.event', 'ASC') 
+            ->addOrderby('e.priority', 'DESC');
             ;
 
         return $qb->getQuery()->getResult();
@@ -52,65 +52,65 @@ 
     public function getPriorityRange($type)
     {
 
-        if(PluginEventHandler::EVENT_HANDLER_TYPE_FIRST==$type){
-            $range_start=PluginEventHandler::EVENT_PRIORITY_FIRST_START;
-            $range_end=PluginEventHandler::EVENT_PRIORITY_FIRST_END;
-        }elseif(PluginEventHandler::EVENT_HANDLER_TYPE_LAST==$type){
-            $range_start=PluginEventHandler::EVENT_PRIORITY_LAST_START;
-            $range_end=PluginEventHandler::EVENT_PRIORITY_LAST_END;
-        }else{
-            $range_start=PluginEventHandler::EVENT_PRIORITY_NORMAL_START;
-            $range_end=PluginEventHandler::EVENT_PRIORITY_NORMAL_END;
+        if (PluginEventHandler::EVENT_HANDLER_TYPE_FIRST == $type) {
+            $range_start = PluginEventHandler::EVENT_PRIORITY_FIRST_START;
+            $range_end = PluginEventHandler::EVENT_PRIORITY_FIRST_END;
+        }elseif (PluginEventHandler::EVENT_HANDLER_TYPE_LAST == $type) {
+            $range_start = PluginEventHandler::EVENT_PRIORITY_LAST_START;
+            $range_end = PluginEventHandler::EVENT_PRIORITY_LAST_END;
+        } else {
+            $range_start = PluginEventHandler::EVENT_PRIORITY_NORMAL_START;
+            $range_end = PluginEventHandler::EVENT_PRIORITY_NORMAL_END;
         }
-        return array($range_start,$range_end);
+        return array($range_start, $range_end);
 
     }
 
-    public function calcNewPriority($event , $type)
+    public function calcNewPriority($event, $type)
     {
 
-        list($range_start,$range_end) = $this->getPriorityRange($type);
+        list($range_start, $range_end) = $this->getPriorityRange($type);
 
         $qb = $this->createQueryBuilder('e');
         $qb->andWhere("e.priority >= $range_end ")
            ->andWhere("e.priority <= $range_start ")
            ->andWhere('e.event = :event')
-           ->setParameter('event',$event)
+           ->setParameter('event', $event)
            ->setMaxResults(1)
-           ->orderBy('e.priority','ASC');
+           ->orderBy('e.priority', 'ASC');
 
-        $result=$qb->getQuery()->getResult();
-        if(count($result)){
-             return $result[0]->getPriority() -1;
-        }else{
+        $result = $qb->getQuery()->getResult();
+        if (count($result)) {
+             return $result[0]->getPriority() - 1;
+        } else {
              return $range_start;
         }
 
     }
 
-    public function upPriority($pluginEventHandler,$up=true)
+    public function upPriority($pluginEventHandler, $up = true)
     {
 
-        list($range_start,$range_end) = $this->getPriorityRange($pluginEventHandler->getHandlerType());
+        list($range_start, $range_end) = $this->getPriorityRange($pluginEventHandler->getHandlerType());
 
         $qb = $this->createQueryBuilder('e');
 
         $qb->andWhere("e.priority >= $range_end ")
            ->andWhere("e.priority <= $range_start ")
-           ->andWhere('e.priority '.($up ?  '>' : '<' ).' :pri')
+           ->andWhere('e.priority '.($up ? '>' : '<').' :pri')
            ->andWhere('e.event = :event')
-           ->setParameter('event',$pluginEventHandler->getEvent())
-           ->setParameter('pri',  $pluginEventHandler->getPriority()  )
+           ->setParameter('event', $pluginEventHandler->getEvent())
+           ->setParameter('pri', $pluginEventHandler->getPriority())
            ->setMaxResults(1)
-           ->orderBy('e.priority', ($up ? 'ASC':'DESC' )  );
+           ->orderBy('e.priority', ($up ? 'ASC' : 'DESC'));
 
-        $result=$qb->getQuery()->getResult();
+        $result = $qb->getQuery()->getResult();
 
-        if(count($result)){
-            $em =$this->getEntityManager();
+        if (count($result)) {
+            $em = $this->getEntityManager();
             $em->getConnection()->beginTransaction();
             // 2個のentityのprioriryを入れ替える
-            $tmp=$pluginEventHandler->getPriority();
+            $tmp = $pluginEventHandler->getPriority();
             $pluginEventHandler->setPriority($result[0]->getPriority());
             $result[0]->setPriority($tmp);
             $em->persist($result[0]);
@@ -118,7 +118,7 @@ 
             $em->flush();
             $em->getConnection()->commit();
             # 移動する
-        }else{
+        } else {
             # 移動しない
             throw new PluginException("Can't swap");
         }

src/Eccube/ServiceProvider/EccubeServiceProvider.php

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