EC-CUBE / ec-cube

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

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
                 'label' => '手数料',
             ))
             ->add('fixed', HiddenType::class)
-            ->addEventListener(FormEvents::POST_SUBMIT, function ($event) {
+            ->addEventListener(FormEvents::POST_SUBMIT, function($event) {
                 $form = $event->getForm();
                 $ruleMax = $form['rule_max']->getData();
                 $ruleMin = $form['rule_min']->getData();

src/Eccube/Controller/Admin/Content/BlockController.php

Spacing +3 added lines, -3 removed lines

@@ -171,7 +171,7 @@ 
                 // ファイル生成・更新
                 $tplDir = $this->appConfig['block_realdir'];
 
-                $filePath = $tplDir . '/' . $Block->getFileName() . '.twig';
+                $filePath = $tplDir.'/'.$Block->getFileName().'.twig';
 
                 $fs = new Filesystem();
                 $blockData = $form->get('block_html')->getData();
@@ -179,7 +179,7 @@ 
                 $fs->dumpFile($filePath, $blockData);
                 // 更新でファイル名を変更した場合、以前のファイルを削除
                 if ($Block->getFileName() != $previous_filename && !is_null($previous_filename)) {
-                    $oldFilePath = $tplDir . '/' . $previous_filename . '.twig';
+                    $oldFilePath = $tplDir.'/'.$previous_filename.'.twig';
                     if ($fs->exists($oldFilePath)) {
                         $fs->remove($oldFilePath);
                     }
@@ -236,7 +236,7 @@ 
         // テンプレートが変更されていた場合、DBからはブロック削除されるがtwigファイルは残る
         if ($Block->isDeletable()) {
             $tplDir = $this->appConfig['block_realdir'];
-            $file = $tplDir . '/' . $Block->getFileName() . '.twig';
+            $file = $tplDir.'/'.$Block->getFileName().'.twig';
             $fs = new Filesystem();
             if ($fs->exists($file)) {
                 $fs->remove($file);

src/Eccube/DI/AutoWiring/RepositoryDefinition.php

Spacing +3 added lines, -3 removed lines

@@ -58,9 +58,9 @@
 
         // 同じパッケージのEntityがあれば返す
         if (count($partsOfFqcn) > 2) {
-            $parentNamespace = implode('\\', array_slice($partsOfFqcn, 0, count($partsOfFqcn)-2));
-            $entityName = preg_replace('/(.*)Repository/', '$1', $partsOfFqcn[count($partsOfFqcn) -1]);
-            $result = $parentNamespace . '\\Entity\\' . $entityName;
+            $parentNamespace = implode('\\', array_slice($partsOfFqcn, 0, count($partsOfFqcn) - 2));
+            $entityName = preg_replace('/(.*)Repository/', '$1', $partsOfFqcn[count($partsOfFqcn) - 1]);
+            $result = $parentNamespace.'\\Entity\\'.$entityName;
             if (class_exists($result)) {
                 return $result;
             }

src/Eccube/Application.php

Spacing +27 added lines, -27 removed lines

@@ -234,7 +234,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;
             }
@@ -299,7 +299,7 @@ 
 
         $pluginSubDirs = (function($dirName) use ($enabledPluginDirs) {
             return array_map(function($pluginDir) use ($dirName) {
-                return $pluginDir . '/' . $dirName;
+                return $pluginDir.'/'.$dirName;
             }, $enabledPluginDirs);
         });
 
@@ -375,7 +375,7 @@ 
             return $router;
         });
 
-        $this['eccube.router.origin'] = function ($app) {
+        $this['eccube.router.origin'] = function($app) {
             $resource = __DIR__.'/Controller';
             $cachePrefix = 'Origin';
 
@@ -385,7 +385,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';
 
@@ -394,7 +394,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'];
@@ -408,7 +408,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'];
@@ -423,7 +423,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());
             }
@@ -458,7 +458,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';
@@ -501,14 +501,14 @@ 
         $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());
 
             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) {
@@ -524,7 +524,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) {
@@ -539,7 +539,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));
@@ -557,7 +557,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) {
@@ -642,7 +642,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');
@@ -677,7 +677,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);
 
@@ -794,7 +794,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();
@@ -816,7 +816,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);
@@ -841,7 +841,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();
@@ -930,31 +930,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');
         };
 
@@ -969,7 +969,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);
@@ -988,7 +988,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);
             }
@@ -1110,7 +1110,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/OutputParser.php

Spacing +4 added lines, -4 removed lines

@@ -39,7 +39,7 @@ 
         $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output));
         $installedLogs = array_filter(
             array_map(
-                function ($line) {
+                function($line) {
                     $matches = array();
                     preg_match('/^  - Installing (.*?) \((.*?)\) .*/', $line, $matches);
 
@@ -62,7 +62,7 @@ 
     public static function parseInfo($output)
     {
         $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output));
-        $infoLogs = array_filter(array_map(function ($line) {
+        $infoLogs = array_filter(array_map(function($line) {
             $matches = array();
             preg_match('/^(name|descrip.|keywords|versions|type|license|source|dist|names)\s*:\s*(.*)$/', $line, $matches);
 
@@ -86,7 +86,7 @@ 
     public static function parseConfig($output)
     {
         $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output));
-        $rowArray = array_filter($rowArray, function ($line) {
+        $rowArray = array_filter($rowArray, function($line) {
             return !preg_match('/^<warning>.*/', $line);
         });
 
@@ -102,7 +102,7 @@ 
     public static function parseList($output)
     {
         $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output));
-        $rawConfig = array_map(function ($line) {
+        $rawConfig = array_map(function($line) {
             $matches = array();
             preg_match('/^\[(.*?)\]\s?(.*)$/', $line, $matches);
 

src/Eccube/ServiceProvider/PurchaseFlowServiceProvider.php

Spacing +12 added lines, -12 removed lines

@@ -17,11 +17,11 @@ 
 {
     public function register(Container $app)
     {
-        $app['eccube.purchase.context'] = $app->protect(function (ItemHolderInterface $origin = null, Customer $user = null) {
+        $app['eccube.purchase.context'] = $app->protect(function(ItemHolderInterface $origin = null, Customer $user = null) {
             return new PurchaseContext($origin, $user);
         });
 
-        $app['eccube.purchase.flow.cart.item_processors'] = function (Container $app) {
+        $app['eccube.purchase.flow.cart.item_processors'] = function(Container $app) {
             $processors = new ArrayCollection();
             $processors[] = new Processor\DisplayStatusValidator();
             $processors[] = new Processor\SaleLimitValidator();
@@ -31,7 +31,7 @@ 
             return $processors;
         };
 
-        $app['eccube.purchase.flow.cart.holder_processors'] = function (Container $app) {
+        $app['eccube.purchase.flow.cart.holder_processors'] = function(Container $app) {
             $processors = new ArrayCollection();
             $processors[] = new Processor\PaymentProcessor($app[DeliveryRepository::class]);
             $processors[] = new Processor\PaymentTotalLimitValidator($app['config']['max_total_fee']);
@@ -41,7 +41,7 @@ 
             return $processors;
         };
 
-        $app['eccube.purchase.flow.cart'] = function (Container $app) {
+        $app['eccube.purchase.flow.cart'] = function(Container $app) {
             $flow = new PurchaseFlow();
             $flow->setItemProcessors($app['eccube.purchase.flow.cart.item_processors']);
             $flow->setItemHolderProcessors($app['eccube.purchase.flow.cart.holder_processors']);
@@ -49,7 +49,7 @@ 
             return $flow;
         };
 
-        $app['eccube.purchase.flow.shopping.item_processors'] = function (Container $app) {
+        $app['eccube.purchase.flow.shopping.item_processors'] = function(Container $app) {
             $processors = new ArrayCollection();
             $processors[] = new Processor\StockValidator();
             $processors[] = new Processor\DisplayStatusValidator();
@@ -57,7 +57,7 @@ 
             return $processors;
         };
 
-        $app['eccube.purchase.flow.shopping.holder_processors'] = function (Container $app) {
+        $app['eccube.purchase.flow.shopping.holder_processors'] = function(Container $app) {
             $processors = new ArrayCollection();
             $processors[] = new Processor\PaymentTotalLimitValidator($app['config']['max_total_fee']);
             $processors[] = new Processor\DeliveryFeeProcessor($app['orm.em']);
@@ -67,13 +67,13 @@ 
             return $processors;
         };
 
-        $app['eccube.purchase.flow.shopping.purchase'] = function (Container $app) {
+        $app['eccube.purchase.flow.shopping.purchase'] = function(Container $app) {
             $processors = new ArrayCollection();
             $processors[] = new Processor\UsePointToCustomerPurchaseProcessor();
             return $processors;
         };
 
-        $app['eccube.purchase.flow.shopping'] = function (Container $app) {
+        $app['eccube.purchase.flow.shopping'] = function(Container $app) {
             $flow = new PurchaseFlow();
             $flow->setItemProcessors($app['eccube.purchase.flow.shopping.item_processors']);
             $flow->setItemHolderProcessors($app['eccube.purchase.flow.shopping.holder_processors']);
@@ -82,14 +82,14 @@ 
             return $flow;
         };
 
-        $app['eccube.purchase.flow.order.item_processors'] = function (Container $app) {
+        $app['eccube.purchase.flow.order.item_processors'] = function(Container $app) {
             $processors = new ArrayCollection();
             $processors[] = new Processor\StockValidator();
 
             return $processors;
         };
 
-        $app['eccube.purchase.flow.order.holder_processors'] = function (Container $app) {
+        $app['eccube.purchase.flow.order.holder_processors'] = function(Container $app) {
             $processors = new ArrayCollection();
             $processors[] = new Processor\PaymentTotalLimitValidator($app['config']['max_total_fee']);
             $processors[] = new Processor\UpdateDatePurchaseProcessor($app['config']);
@@ -97,14 +97,14 @@ 
             return $processors;
         };
 
-        $app['eccube.purchase.flow.order.purchase'] = function (Container $app) {
+        $app['eccube.purchase.flow.order.purchase'] = function(Container $app) {
             $processors = new ArrayCollection();
             $processors[] = new Processor\AdminOrderRegisterPurchaseProcessor($app);
 
             return $processors;
         };
 
-        $app['eccube.purchase.flow.order'] = function (Container $app) {
+        $app['eccube.purchase.flow.order'] = function(Container $app) {
             $flow = new PurchaseFlow();
             $flow->setItemProcessors($app['eccube.purchase.flow.order.item_processors']);
             $flow->setItemHolderProcessors($app['eccube.purchase.flow.order.holder_processors']);

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

Spacing +3 added lines, -3 removed lines

@@ -238,7 +238,7 @@ 
                 'class' => 'Eccube\Entity\Master\OrderStatus',
                 'choice_label' => 'name',
                 'placeholder' => '選択してください',
-                'query_builder' => function ($er) {
+                'query_builder' => function($er) {
                     return $er->createQueryBuilder('o')
                         ->orderBy('o.rank', 'ASC');
                 },
@@ -274,7 +274,7 @@ 
                 )));
 
         // 選択された支払い方法の名称をエンティティにコピーする
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
             $Order = $event->getData();
             $Payment = $Order->getPayment();
             if (!is_null($Payment)) {
@@ -282,7 +282,7 @@ 
             }
         });
         // 会員受注の場合、会員の性別/職業/誕生日をエンティティにコピーする
-        $builder->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) {
+        $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) {
             $Order = $event->getData();
             $Customer = $Order->getCustomer();
             if (!is_null($Customer)) {