Completed
Push — master ( 0fe6f9...d3b3ff )
by Ryo
24s
created
src/Eccube/Application.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
         $this->register(new \Eccube\ServiceProvider\ValidatorServiceProvider());
134 134
 
135 135
         $app = $this;
136
-        $this->error(function (\Exception $e, $code) use ($app) {
136
+        $this->error(function(\Exception $e, $code) use ($app) {
137 137
             if ($app['debug']) {
138 138
                 return;
139 139
             }
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
         $this->register(new \Silex\Provider\TranslationServiceProvider(), array(
198 198
             'locale' => $this['config']['locale'],
199 199
         ));
200
-        $this['translator'] = $this->share($this->extend('translator', function ($translator, \Silex\Application $app) {
200
+        $this['translator'] = $this->share($this->extend('translator', function($translator, \Silex\Application $app) {
201 201
             $translator->addLoader('yaml', new \Symfony\Component\Translation\Loader\YamlFileLoader());
202 202
 
203 203
             $r = new \ReflectionClass('Symfony\Component\Validator\Validator');
@@ -241,16 +241,16 @@  discard block
 block discarded – undo
241 241
         $this->register(new \Silex\Provider\TwigServiceProvider(), array(
242 242
             'twig.form.templates' => array('Form/form_layout.twig'),
243 243
         ));
244
-        $this['twig'] = $this->share($this->extend('twig', function (\Twig_Environment $twig, \Silex\Application $app) {
244
+        $this['twig'] = $this->share($this->extend('twig', function(\Twig_Environment $twig, \Silex\Application $app) {
245 245
             $twig->addExtension(new \Eccube\Twig\Extension\EccubeExtension($app));
246 246
             $twig->addExtension(new \Twig_Extension_StringLoader());
247 247
 
248 248
             return $twig;
249 249
         }));
250 250
 
251
-        $this->before(function (Request $request, \Silex\Application $app) {
251
+        $this->before(function(Request $request, \Silex\Application $app) {
252 252
             // フロント or 管理画面ごとにtwigの探索パスを切り替える.
253
-            $app['twig'] = $app->share($app->extend('twig', function (\Twig_Environment $twig, \Silex\Application $app) {
253
+            $app['twig'] = $app->share($app->extend('twig', function(\Twig_Environment $twig, \Silex\Application $app) {
254 254
                 $paths = array();
255 255
 
256 256
                 // 互換性がないのでprofiler とproduction 時のcacheを分離する
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
 
303 303
         // twigのグローバル変数を定義.
304 304
         $app = $this;
305
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function (\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) {
305
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function(\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) {
306 306
             // ショップ基本情報
307 307
             $BaseInfo = $app['eccube.repository.base_info']->get();
308 308
             $app['twig']->addGlobal('BaseInfo', $BaseInfo);
@@ -362,7 +362,7 @@  discard block
 block discarded – undo
362 362
         // メール送信時の文字エンコード指定(デフォルトはUTF-8)
363 363
         if (isset($this['config']['mail']['charset_iso_2022_jp']) && is_bool($this['config']['mail']['charset_iso_2022_jp'])) {
364 364
             if ($this['config']['mail']['charset_iso_2022_jp'] === true) {
365
-                \Swift::init(function () {
365
+                \Swift::init(function() {
366 366
                     \Swift_DependencyContainer::getInstance()
367 367
                         ->register('mime.qpheaderencoder')
368 368
                         ->asAliasOf('mime.base64headerencoder');
@@ -529,19 +529,19 @@  discard block
 block discarded – undo
529 529
             array('^/mypage', 'ROLE_USER'),
530 530
         );
531 531
 
532
-        $this['eccube.password_encoder'] = $this->share(function ($app) {
532
+        $this['eccube.password_encoder'] = $this->share(function($app) {
533 533
             return new \Eccube\Security\Core\Encoder\PasswordEncoder($app['config']);
534 534
         });
535
-        $this['security.encoder_factory'] = $this->share(function ($app) {
535
+        $this['security.encoder_factory'] = $this->share(function($app) {
536 536
             return new \Symfony\Component\Security\Core\Encoder\EncoderFactory(array(
537 537
                 'Eccube\Entity\Customer' => $app['eccube.password_encoder'],
538 538
                 'Eccube\Entity\Member' => $app['eccube.password_encoder'],
539 539
             ));
540 540
         });
541
-        $this['eccube.event_listner.security'] = $this->share(function ($app) {
541
+        $this['eccube.event_listner.security'] = $this->share(function($app) {
542 542
             return new \Eccube\EventListener\SecurityEventListener($app['orm.em']);
543 543
         });
544
-        $this['user'] = function ($app) {
544
+        $this['user'] = function($app) {
545 545
             $token = $app['security']->getToken();
546 546
 
547 547
             return ($token !== null) ? $token->getUser() : null;
@@ -552,17 +552,17 @@  discard block
 block discarded – undo
552 552
 
553 553
         // Voterの設定
554 554
         $app = $this;
555
-        $this['authority_voter'] = $this->share(function ($app) {
555
+        $this['authority_voter'] = $this->share(function($app) {
556 556
             return new \Eccube\Security\Voter\AuthorityVoter($app);
557 557
         });
558 558
 
559
-        $app['security.voters'] = $app->extend('security.voters', function ($voters) use ($app) {
559
+        $app['security.voters'] = $app->extend('security.voters', function($voters) use ($app) {
560 560
             $voters[] = $app['authority_voter'];
561 561
 
562 562
             return $voters;
563 563
         });
564 564
 
565
-        $this['security.access_manager'] = $this->share(function ($app) {
565
+        $this['security.access_manager'] = $this->share(function($app) {
566 566
             return new \Symfony\Component\Security\Core\Authorization\AccessDecisionManager($app['security.voters'], 'unanimous');
567 567
         });
568 568
 
@@ -586,14 +586,14 @@  discard block
 block discarded – undo
586 586
     public function initPluginEventDispatcher()
587 587
     {
588 588
         // EventDispatcher
589
-        $this['eccube.event.dispatcher'] = $this->share(function () {
589
+        $this['eccube.event.dispatcher'] = $this->share(function() {
590 590
             return new EventDispatcher();
591 591
         });
592 592
 
593 593
         $app = $this;
594 594
 
595 595
         // hook point
596
-        $this->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($app) {
596
+        $this->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($app) {
597 597
             if (!$event->isMasterRequest()) {
598 598
                 return;
599 599
             }
@@ -601,7 +601,7 @@  discard block
 block discarded – undo
601 601
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
602 602
         }, self::EARLY_EVENT);
603 603
 
604
-        $this->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($app) {
604
+        $this->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($app) {
605 605
             if (!$event->isMasterRequest()) {
606 606
                 return;
607 607
             }
@@ -610,7 +610,7 @@  discard block
 block discarded – undo
610 610
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
611 611
         });
612 612
 
613
-        $this->on(KernelEvents::RESPONSE, function (FilterResponseEvent $event) use ($app) {
613
+        $this->on(KernelEvents::RESPONSE, function(FilterResponseEvent $event) use ($app) {
614 614
             if (!$event->isMasterRequest()) {
615 615
                 return;
616 616
             }
@@ -619,7 +619,7 @@  discard block
 block discarded – undo
619 619
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
620 620
         });
621 621
 
622
-        $this->on(KernelEvents::RESPONSE, function (FilterResponseEvent $event) use ($app) {
622
+        $this->on(KernelEvents::RESPONSE, function(FilterResponseEvent $event) use ($app) {
623 623
             if (!$event->isMasterRequest()) {
624 624
                 return;
625 625
             }
@@ -627,19 +627,19 @@  discard block
 block discarded – undo
627 627
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
628 628
         }, self::LATE_EVENT);
629 629
 
630
-        $this->on(KernelEvents::TERMINATE, function (PostResponseEvent $event) use ($app) {
630
+        $this->on(KernelEvents::TERMINATE, function(PostResponseEvent $event) use ($app) {
631 631
             $route = $event->getRequest()->attributes->get('_route');
632 632
             $hookpoint = "eccube.event.controller.$route.finish";
633 633
             $app['eccube.event.dispatcher']->dispatch($hookpoint, $event);
634 634
         });
635 635
 
636
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
636
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
637 637
             $route = $event->getRequest()->attributes->get('_route');
638 638
             $app['eccube.event.dispatcher']->dispatch('eccube.event.render.'.$route.'.before', $event);
639 639
         });
640 640
 
641 641
         // Request Event
642
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::REQUEST, function (\Symfony\Component\HttpKernel\Event\GetResponseEvent $event) use ($app) {
642
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::REQUEST, function(\Symfony\Component\HttpKernel\Event\GetResponseEvent $event) use ($app) {
643 643
 
644 644
             if (\Symfony\Component\HttpKernel\HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
645 645
                 return;
@@ -670,7 +670,7 @@  discard block
 block discarded – undo
670 670
         }, 30); // Routing(32)が解決しし, 認証判定(8)が実行される前のタイミング.
671 671
 
672 672
         // Controller Event
673
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function (\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) {
673
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function(\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) use ($app) {
674 674
 
675 675
             if (\Symfony\Component\HttpKernel\HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
676 676
                 return;
@@ -701,7 +701,7 @@  discard block
 block discarded – undo
701 701
         });
702 702
 
703 703
         // Response Event
704
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
704
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
705 705
 
706 706
             if (\Symfony\Component\HttpKernel\HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
707 707
                 return;
@@ -731,7 +731,7 @@  discard block
 block discarded – undo
731 731
         });
732 732
 
733 733
         // Exception Event
734
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::EXCEPTION, function (\Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event) use ($app) {
734
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::EXCEPTION, function(\Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent $event) use ($app) {
735 735
 
736 736
             if (\Symfony\Component\HttpKernel\HttpKernelInterface::MASTER_REQUEST !== $event->getRequestType()) {
737 737
                 return;
@@ -761,7 +761,7 @@  discard block
 block discarded – undo
761 761
         });
762 762
 
763 763
         // Terminate Event
764
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::TERMINATE, function (\Symfony\Component\HttpKernel\Event\PostResponseEvent $event) use ($app) {
764
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::TERMINATE, function(\Symfony\Component\HttpKernel\Event\PostResponseEvent $event) use ($app) {
765 765
 
766 766
             $route = $event->getRequest()->attributes->get('_route');
767 767
 
@@ -840,7 +840,7 @@  discard block
 block discarded – undo
840 840
 
841 841
             // const
842 842
             if (isset($config['const'])) {
843
-                $this['config'] = $this->share($this->extend('config', function ($eccubeConfig) use ($config) {
843
+                $this['config'] = $this->share($this->extend('config', function($eccubeConfig) use ($config) {
844 844
                     $eccubeConfig[$config['code']] = array(
845 845
                         'const' => $config['const'],
846 846
                     );
@@ -982,7 +982,7 @@  discard block
 block discarded – undo
982 982
         $app = $this;
983 983
 
984 984
         // Response Event(http cache対応、event実行は一番遅く設定)
985
-        $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
985
+        $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) {
986 986
 
987 987
             if ($app['config']['http_cache']['enabled']) {
988 988
                 // httpキャッシュが有効の場合
Please login to merge, or discard this patch.