EC-CUBE / ec-cube

src/Eccube/Application.php

Spacing +27 added lines, -27 removed lines

@@ -236,7 +236,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;
             }
@@ -301,7 +301,7 @@ 
 
         $pluginSubDirs = (function($dirName) use ($enabledPluginDirs) {
             return array_map(function($pluginDir) use ($dirName) {
-                return $pluginDir . '/' . $dirName;
+                return $pluginDir.'/'.$dirName;
             }, $enabledPluginDirs);
         });
 
@@ -378,7 +378,7 @@ 
             return $router;
         });
 
-        $this['eccube.router.origin'] = function ($app) {
+        $this['eccube.router.origin'] = function($app) {
             $resource = __DIR__.'/Controller';
             $cachePrefix = 'Origin';
 
@@ -388,7 +388,7 @@ 
         $this['eccube.routers.plugin'] = [];
 
         if (isset($this['config']['vendor_dir']) && file_exists($this['config']['vendor_dir'].'/Controller')) {
-            $this['eccube.router.extend'] = function ($app) {
+            $this['eccube.router.extend'] = function($app) {
                 $resource = $app['config']['vendor_dir'].'/Controller';
                 $cachePrefix = 'Extend';
 
@@ -397,7 +397,7 @@ 
                 return $router;
             };
         }
-        $this->extend('request_matcher', function ($matcher, $app) {
+        $this->extend('request_matcher', function($matcher, $app) {
             $matchers = [];
             if (isset($app['eccube.router.extend'])) {
                 $matchers[] = $app['eccube.router.extend'];
@@ -411,7 +411,7 @@ 
             return new ChainUrlMatcher($matchers, $app['request_context']);
         });
 
-        $this->extend('url_generator', function ($generator, $app) {
+        $this->extend('url_generator', function($generator, $app) {
             $generators = [];
             if (isset($app['eccube.router.extend'])) {
                 $generators[] = $app['eccube.router.extend'];
@@ -426,7 +426,7 @@ 
         });
 
         // Route CollectionにEC-CUBEで定義したルーティングを追加(debug tool barに出力するため)
-        $this->extend('routes', function ($routes, $app) {
+        $this->extend('routes', function($routes, $app) {
             if (isset($app['eccube.router.extend'])) {
                 $routes->addCollection($app['eccube.router.extend']->getRouteCollection());
             }
@@ -461,7 +461,7 @@ 
             'translator.cache_dir' => $this['debug'] ? null : $this['config']['root_dir'].'/app/cache/translator',
             'locale_fallbacks' => [$this['config']['locale'], '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';
@@ -504,7 +504,7 @@ 
         $this->register(new \Silex\Provider\TwigServiceProvider(), array(
             'twig.form.templates' => array('Form/form_div_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());
 
@@ -522,7 +522,7 @@ 
             return $runtimes;
         });
 
-        $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) {
@@ -538,7 +538,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) {
@@ -553,7 +553,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));
@@ -571,7 +571,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) {
@@ -656,7 +656,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');
@@ -691,7 +691,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);
 
@@ -808,7 +808,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();
@@ -830,7 +830,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);
@@ -855,7 +855,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();
@@ -944,31 +944,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');
         };
 
@@ -983,7 +983,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);
@@ -1002,7 +1002,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);
             }
@@ -1124,7 +1124,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/Service/Composer/ComposerProcessService.php

Spacing +2 added lines, -2 removed lines

@@ -122,7 +122,7 @@ 
             if ($returnValue == true) {
                 throw new PluginException($outputString);
             }
-            log_info(PHP_EOL . $outputString . PHP_EOL);
+            log_info(PHP_EOL.$outputString.PHP_EOL);
         } catch (\Exception $exception) {
             throw new PluginException($exception->getMessage());
         }
@@ -275,7 +275,7 @@ 
     public function composerVersion()
     {
         $this->init();
-        $command = $this->pathPHP . ' ' . $this->composerFile . ' -V';
+        $command = $this->pathPHP.' '.$this->composerFile.' -V';
         return exec($command);
     }
 

src/Eccube/Controller/Admin/Store/OwnerStoreController.php

Spacing +5 added lines, -5 removed lines

@@ -251,7 +251,7 @@ 
         $packageNames = '';
         if (!empty($dependents)) {
             foreach ($dependents as $item) {
-                $packageNames .= self::$vendorName . '/' . $item['product_code'] . ' ';
+                $packageNames .= self::$vendorName.'/'.$item['product_code'].' ';
                 $pluginItem = [
                     "product_code" => $item['product_code'],
                     "version" => $item['version']
@@ -259,14 +259,14 @@ 
                 array_push($dependentModifier, $pluginItem);
             }
         }
-        $packageNames .= self::$vendorName . '/' . $pluginCode;
+        $packageNames .= self::$vendorName.'/'.$pluginCode;
         $data = array(
             'code' => $pluginCode,
             'version' => $version,
             'core_version' => $eccubeVersion,
             'php_version' => phpversion(),
             'db_version' => $this->systemService->getDbversion(),
-            'os' => php_uname('s') . ' ' . php_uname('r') . ' ' . php_uname('v'),
+            'os' => php_uname('s').' '.php_uname('r').' '.php_uname('v'),
             'host' => $request->getHost(),
             'web_server' => $request->server->get("SERVER_SOFTWARE"),
             'composer_version' => $this->composerService->composerVersion(),
@@ -277,7 +277,7 @@ 
         try {
             $this->composerService->execRequire($packageNames);
             // Do report to package repo
-            $url = $this->appConfig['package_repo_url'] . '/report';
+            $url = $this->appConfig['package_repo_url'].'/report';
             $this->postRequestApi($url, $data);
             $app->addSuccess('admin.plugin.install.complete', 'admin');
 
@@ -287,7 +287,7 @@ 
         }
 
         // Do report to package repo
-        $url = $this->appConfig['package_repo_url'] . '/report/fail';
+        $url = $this->appConfig['package_repo_url'].'/report/fail';
         $this->postRequestApi($url, $data);
         $app->addError('admin.plugin.install.fail', 'admin');