EC-CUBE / ec-cube

src/Eccube/Controller/AbstractController.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         @trigger_error('The '.__METHOD__.' method is deprecated.', E_USER_DEPRECATED);
 
         $form = $app['form.factory']
-            ->createBuilder($app['eccube.form.type.' . $type], $app['eccube.entity.' . $type])
+            ->createBuilder($app['eccube.form.type.'.$type], $app['eccube.entity.'.$type])
             ->getForm();
         $form->handleRequest($app['request_stack']->getCurrentRequest());
 

src/Eccube/Form/Type/Master/ProductListMaxType.php

Spacing +2 added lines, -2 removed lines

@@ -38,14 +38,14 @@
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
+        $builder->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) {
             $options = $event->getForm()->getConfig()->getOptions();
             if (!$event->getData()) {
                 $data = current(array_keys($options['choice_loader']->loadChoiceList()->getValues()));
                 $event->setData($data);
             }
         });
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) {
             $options = $event->getForm()->getConfig()->getOptions();
             $values = $options['choice_loader']->loadChoiceList()->getValues();
             if (!in_array($event->getData(), $values)) {

src/Eccube/Form/Type/Master/ProductListOrderByType.php

Spacing +2 added lines, -2 removed lines

@@ -38,14 +38,14 @@
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-         $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
+         $builder->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) {
              $options = $event->getForm()->getConfig()->getOptions();
              if (!$event->getData()) {
                  $data = current(array_keys($options['choice_loader']->loadChoiceList()->getValues()));
                  $event->setData($data);
              }
          });
-         $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
+         $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) {
              $options = $event->getForm()->getConfig()->getOptions();
              $values = $options['choice_loader']->loadChoiceList()->getValues();
              if (!in_array($event->getData(), $values)) {

src/Eccube/Form/Type/MasterType.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
             'expanded' => false,
             'required' => false,
             'placeholder' => false,
-            'query_builder' => function (EntityRepository $er) {
+            'query_builder' => function(EntityRepository $er) {
                 return $er->createQueryBuilder('m')
                     ->orderBy('m.rank', 'ASC');
             },

src/Eccube/Form/Type/Master/PageMaxType.php

Spacing +2 added lines, -2 removed lines

@@ -38,14 +38,14 @@
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) {
+        $builder->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) {
             $options = $event->getForm()->getConfig()->getOptions();
             if (!$event->getData()) {
                 $data = current(array_keys($options['choice_loader']->loadChoiceList()->getValues()));
                 $event->setData($data);
             }
         });
-        $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) {
+        $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) {
             $options = $event->getForm()->getConfig()->getOptions();
             $values = $options['choice_loader']->loadChoiceList()->getValues();
             if (!in_array($event->getData(), $values)) {

app/Plugin/ExamplePlugin/Resource/doctrine/migrations/Version20170222080706.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     {
         $Table = $schema->getTable('dtb_payment');
         if (!$Table->hasColumn('use_paypal')) {
-            $Table->addColumn('use_paypal','smallint', [
+            $Table->addColumn('use_paypal', 'smallint', [
                 'notnull' => false,
                 'default' => 0
             ]);

src/Eccube/Routing/EccubeRouter.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
     public function setRequireHttps($requireHttps)
     {
-        $this->requireHttps = (bool)$requireHttps;
+        $this->requireHttps = (bool) $requireHttps;
     }
 
     public function setAdminPrefix($adminPrefix)

src/Eccube/ServiceProvider/DebugServiceProvider.php

Spacing +13 added lines, -13 removed lines

@@ -72,7 +72,7 @@ 
 {
     public function register(Container $app)
     {
-        $app['var_dumper.cloner'] = function ($app) {
+        $app['var_dumper.cloner'] = function($app) {
             $cloner = new VarCloner();
 
             if (isset($app['debug.max_items'])) {
@@ -86,37 +86,37 @@ 
             return $cloner;
         };
 
-        $app->extend('data_collector.templates', function ($templates) {
+        $app->extend('data_collector.templates', function($templates) {
             return array_merge($templates, array(array('dump', '@Debug/Profiler/dump.html.twig')));
         });
 
-        $app['data_collector.dump'] = function ($app) {
+        $app['data_collector.dump'] = function($app) {
             return new DumpDataCollector($app['stopwatch'], $app['code.file_link_format'], null, null, new HtmlDumper());
         };
 
-        $app->extend('data_collectors', function ($collectors, $app) {
-            $collectors['dump'] = function ($app) {
+        $app->extend('data_collectors', function($collectors, $app) {
+            $collectors['dump'] = function($app) {
                 return $app['data_collector.dump'];
             };
 
-            $collectors['eccube'] = function ($app) {
+            $collectors['eccube'] = function($app) {
                 return new EccubeDataCollector($app);
             };
             return $collectors;
         });
 
-        $app->extend('data_collector.templates', function ($templates, $app) {
+        $app->extend('data_collector.templates', function($templates, $app) {
                 array_unshift($templates, ['eccube', '@EccubeProfiler/eccube.html.twig']);
                 return $templates;
             }
         );
 
-        $app->extend('twig.loader.filesystem', function ($filesystem, $app) {
+        $app->extend('twig.loader.filesystem', function($filesystem, $app) {
                 return $filesystem;
             }
         );
 
-        $app->extend('twig', function ($twig, $app) {
+        $app->extend('twig', function($twig, $app) {
             if (class_exists('\Symfony\Bridge\Twig\Extension\DumpExtension')) {
                 $twig->addExtension(new DumpExtension($app['var_dumper.cloner']));
             }
@@ -124,14 +124,14 @@ 
             return $twig;
         });
 
-        $app->extend('twig.loader.filesystem', function ($loader, $app) {
+        $app->extend('twig.loader.filesystem', function($loader, $app) {
             $loader->addPath($app['debug.templates_path'], 'Debug');
             $loader->addPath(__DIR__.'/../Resource/template/toolbar', 'EccubeProfiler');
 
             return $loader;
         });
 
-        $app['debug.templates_path'] = function () {
+        $app['debug.templates_path'] = function() {
             $r = new \ReflectionClass('Symfony\Bundle\DebugBundle\DependencyInjection\Configuration');
 
             return dirname(dirname($r->getFileName())).'/Resources/views';
@@ -143,11 +143,11 @@ 
         // This code is here to lazy load the dump stack. This default
         // configuration for CLI mode is overridden in HTTP mode on
         // 'kernel.request' event
-        VarDumper::setHandler(function ($var) use ($app) {
+        VarDumper::setHandler(function($var) use ($app) {
             $dumper = $app['data_collector.dump'];
             $cloner = $app['var_dumper.cloner'];
 
-            $handler = function ($var) use ($dumper, $cloner) {
+            $handler = function($var) use ($dumper, $cloner) {
                 $dumper->dump($cloner->cloneVar($var));
             };
 

src/Eccube/Application.php

Spacing +20 added lines, -20 removed lines

@@ -160,7 +160,7 @@ 
         $this->register(new \Silex\Provider\SerializerServiceProvider());
         $this->register(new \Silex\Provider\ValidatorServiceProvider());
 
-        $this->error(function (\Exception $e, Request $request, $code) {
+        $this->error(function(\Exception $e, Request $request, $code) {
             if ($this['debug']) {
                 return;
             }
@@ -252,14 +252,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')
@@ -276,7 +276,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';
@@ -286,7 +286,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) {
@@ -298,7 +298,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) {
@@ -329,7 +329,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('yaml', new \Symfony\Component\Translation\Loader\YamlFileLoader());
 
             $file = __DIR__.'/Resource/locale/validator.'.$app['locale'].'.yml';
@@ -376,14 +376,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'] = false;
             $app['front'] = false;
             $pathinfo = rawurldecode($request->getPathInfo());
@@ -415,7 +415,7 @@ 
             // フロント or 管理画面ごとにtwigの探索パスを切り替える.
             if (!$app->offsetExists('twig')) {
 
-                $app->extend('twig', function (\Twig_Environment $twig, \Silex\Application $app) {
+                $app->extend('twig', function(\Twig_Environment $twig, \Silex\Application $app) {
                         $paths = array();
 
                         // 互換性がないのでprofiler とproduction 時のcacheを分離する
@@ -462,7 +462,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) {
@@ -529,7 +529,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');
@@ -656,7 +656,7 @@ 
                     'EXTRACT' => 'Eccube\Doctrine\ORM\Query\Extract',
                 ),
             ));
-            $this->extend('orm.em', function (\Doctrine\ORM\EntityManager $em, \Silex\Application $app) {
+            $this->extend('orm.em', function(\Doctrine\ORM\EntityManager $em, \Silex\Application $app) {
                 // tax_rule
                 $taxRuleRepository = $em->getRepository('Eccube\Entity\TaxRule');
                 $taxRuleRepository->setApplication($app);
@@ -746,31 +746,31 @@ 
             array('^/mypage', 'ROLE_USER'),
         );
 
-        $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');
         };
 
@@ -928,7 +928,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;