@@ -38,7 +38,7 @@ |
||
| 38 | 38 | { |
| 39 | 39 | $builder->addEventListener( |
| 40 | 40 | FormEvents::PRE_SET_DATA, |
| 41 | - function (FormEvent $event) { |
|
| 41 | + function(FormEvent $event) { |
|
| 42 | 42 | $form = $event->getForm(); |
| 43 | 43 | $config = $form->getConfig(); |
| 44 | 44 | // data_classオプションが必要 |
@@ -16,7 +16,7 @@ |
||
| 16 | 16 | return new \Mobile_Detect(); |
| 17 | 17 | }; |
| 18 | 18 | |
| 19 | - $app['mobile_detect.device_type'] = function ($app) { |
|
| 19 | + $app['mobile_detect.device_type'] = function($app) { |
|
| 20 | 20 | if ($app['mobile_detect']->isMobile()) { |
| 21 | 21 | return \Eccube\Entity\Master\DeviceType::DEVICE_TYPE_SP; |
| 22 | 22 | } else { |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | { |
| 29 | 29 | const PRODUCT_SEARCH = 'Product.getQueryBuilderBySearchData'; |
| 30 | 30 | const PRODUCT_SEARCH_ADMIN = 'Product.getQueryBuilderBySearchDataForAdmin'; |
| 31 | - const PRODUCT_GET_FAVORITE = 'Product.getFavoriteProductQueryBuilderByCustomer'; |
|
| 31 | + const PRODUCT_GET_FAVORITE = 'Product.getFavoriteProductQueryBuilderByCustomer'; |
|
| 32 | 32 | |
| 33 | 33 | const CUSTOMER_SEARCH = 'Customer.getQueryBuilderBySearchData'; |
| 34 | 34 | |
@@ -28,7 +28,7 @@ |
||
| 28 | 28 | public function load(ObjectManager $manager) |
| 29 | 29 | { |
| 30 | 30 | // CSV Reader に設定 |
| 31 | - $this->file->setFlags(\SplFileObject::READ_CSV | \SplFileObject::READ_AHEAD | \SplFileObject::SKIP_EMPTY |\SplFileObject::DROP_NEW_LINE); |
|
| 31 | + $this->file->setFlags(\SplFileObject::READ_CSV|\SplFileObject::READ_AHEAD|\SplFileObject::SKIP_EMPTY|\SplFileObject::DROP_NEW_LINE); |
|
| 32 | 32 | |
| 33 | 33 | // ヘッダ行を取得 |
| 34 | 34 | $headers = $this->file->current(); |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | // 配送業者のプルダウンを生成 |
| 60 | 60 | $builder->addEventListener( |
| 61 | 61 | FormEvents::PRE_SET_DATA, |
| 62 | - function (FormEvent $event) { |
|
| 62 | + function(FormEvent $event) { |
|
| 63 | 63 | /* @var Shipping $Shipping */ |
| 64 | 64 | $Shipping = $event->getData(); |
| 65 | 65 | if (is_null($Shipping) || !$Shipping->getId()) { |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | // お届け日のプルダウンを生成 |
| 102 | 102 | $builder->addEventListener( |
| 103 | 103 | FormEvents::PRE_SET_DATA, |
| 104 | - function (FormEvent $event) { |
|
| 104 | + function(FormEvent $event) { |
|
| 105 | 105 | $Shipping = $event->getData(); |
| 106 | 106 | if (is_null($Shipping) || !$Shipping->getId()) { |
| 107 | 107 | return; |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | |
| 140 | 140 | // 配送日数が設定されている |
| 141 | 141 | if ($deliveryDateFlag) { |
| 142 | - $period = new \DatePeriod ( |
|
| 142 | + $period = new \DatePeriod( |
|
| 143 | 143 | new \DateTime($minDate.' day'), |
| 144 | 144 | new \DateInterval('P1D'), |
| 145 | 145 | new \DateTime($minDate + $this->config['deliv_date_end_max'].' day') |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | // お届け時間のプルダウンを生成 |
| 168 | 168 | $builder->addEventListener( |
| 169 | 169 | FormEvents::PRE_SET_DATA, |
| 170 | - function (FormEvent $event) { |
|
| 170 | + function(FormEvent $event) { |
|
| 171 | 171 | $Shipping = $event->getData(); |
| 172 | 172 | if (is_null($Shipping) || !$Shipping->getId()) { |
| 173 | 173 | return; |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | // 支払い方法のプルダウンを生成 |
| 86 | 86 | $builder->addEventListener( |
| 87 | 87 | FormEvents::PRE_SET_DATA, |
| 88 | - function (FormEvent $event) { |
|
| 88 | + function(FormEvent $event) { |
|
| 89 | 89 | /** @var Order $Order */ |
| 90 | 90 | $Order = $event->getData(); |
| 91 | 91 | if (is_null($Order) || !$Order->getId()) { |
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | // TODO Calculatorで行うのが適切. |
| 134 | 134 | $builder->addEventListener( |
| 135 | 135 | FormEvents::POST_SUBMIT, |
| 136 | - function (FormEvent $event) { |
|
| 136 | + function(FormEvent $event) { |
|
| 137 | 137 | /** @var Order $Order */ |
| 138 | 138 | $Order = $event->getData(); |
| 139 | 139 | $Payment = $Order->getPayment(); |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | 'prototype' => true, |
| 176 | 176 | )) |
| 177 | 177 | |
| 178 | - ->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($BaseInfo) { |
|
| 178 | + ->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event) use ($BaseInfo) { |
|
| 179 | 179 | if ($BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) { |
| 180 | 180 | $form = $event->getForm(); |
| 181 | 181 | $form->add('ShipmentItems', CollectionType::class, array( |
@@ -186,7 +186,7 @@ discard block |
||
| 186 | 186 | )); |
| 187 | 187 | } |
| 188 | 188 | }) |
| 189 | - ->addEventListener(FormEvents::POST_SET_DATA, function (FormEvent $event) { |
|
| 189 | + ->addEventListener(FormEvents::POST_SET_DATA, function(FormEvent $event) { |
|
| 190 | 190 | /** @var \Eccube\Entity\Shipping $data */ |
| 191 | 191 | $data = $event->getData(); |
| 192 | 192 | /** @var \Symfony\Component\Form\Form $form */ |
@@ -205,7 +205,7 @@ discard block |
||
| 205 | 205 | 'choice_label' => 'delivery_time', |
| 206 | 206 | 'placeholder' => '指定なし', |
| 207 | 207 | 'required' => false, |
| 208 | - 'query_builder' => function (EntityRepository $er) use($Delivery) { |
|
| 208 | + 'query_builder' => function(EntityRepository $er) use($Delivery) { |
|
| 209 | 209 | return $er->createQueryBuilder('dt') |
| 210 | 210 | ->where('dt.Delivery = :Delivery') |
| 211 | 211 | ->setParameter('Delivery', $Delivery); |
@@ -213,7 +213,7 @@ discard block |
||
| 213 | 213 | )); |
| 214 | 214 | |
| 215 | 215 | }) |
| 216 | - ->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($app) { |
|
| 216 | + ->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($app) { |
|
| 217 | 217 | $data = $event->getData(); |
| 218 | 218 | $form = $event->getForm(); |
| 219 | 219 | if (!$data) { |
@@ -233,14 +233,14 @@ discard block |
||
| 233 | 233 | 'choice_label' => 'delivery_time', |
| 234 | 234 | 'placeholder' => '指定なし', |
| 235 | 235 | 'required' => false, |
| 236 | - 'query_builder' => function (EntityRepository $er) use($Delivery) { |
|
| 236 | + 'query_builder' => function(EntityRepository $er) use($Delivery) { |
|
| 237 | 237 | return $er->createQueryBuilder('dt') |
| 238 | 238 | ->where('dt.Delivery = :Delivery') |
| 239 | 239 | ->setParameter('Delivery', $Delivery); |
| 240 | 240 | }, |
| 241 | 241 | )); |
| 242 | 242 | }) |
| 243 | - ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use ($BaseInfo) { |
|
| 243 | + ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) use ($BaseInfo) { |
|
| 244 | 244 | if ($BaseInfo->getOptionMultipleShipping() == Constant::ENABLED) { |
| 245 | 245 | $form = $event->getForm(); |
| 246 | 246 | $shipmentItems = $form['ShipmentItems']->getData(); |
@@ -251,7 +251,7 @@ discard block |
||
| 251 | 251 | } |
| 252 | 252 | } |
| 253 | 253 | }) |
| 254 | - ->addEventListener(FormEvents::POST_SUBMIT, function (FormEvent $event) use ($BaseInfo) { |
|
| 254 | + ->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) use ($BaseInfo) { |
|
| 255 | 255 | $Shipping = $event->getData(); |
| 256 | 256 | $Delivery = $Shipping->getDelivery(); |
| 257 | 257 | $Shipping->setShippingDeliveryName($Delivery ? $Delivery : null); |
@@ -446,7 +446,7 @@ |
||
| 446 | 446 | $session->set('eccube.admin.order.product.search', $searchData); |
| 447 | 447 | $session->set('eccube.admin.order.product.search.page_no', $page_no); |
| 448 | 448 | } else { |
| 449 | - $searchData = (array)$session->get('eccube.admin.order.product.search'); |
|
| 449 | + $searchData = (array) $session->get('eccube.admin.order.product.search'); |
|
| 450 | 450 | if (is_null($page_no)) { |
| 451 | 451 | $page_no = intval($session->get('eccube.admin.order.product.search.page_no')); |
| 452 | 452 | } else { |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | $this->register(new \Saxulum\Validator\Provider\SaxulumValidatorProvider()); |
| 161 | 161 | $this->register(new MobileDetectServiceProvider()); |
| 162 | 162 | |
| 163 | - $this->error(function (\Exception $e, Request $request, $code) { |
|
| 163 | + $this->error(function(\Exception $e, Request $request, $code) { |
|
| 164 | 164 | if ($this['debug']) { |
| 165 | 165 | return; |
| 166 | 166 | } |
@@ -254,14 +254,14 @@ discard block |
||
| 254 | 254 | return $router; |
| 255 | 255 | }); |
| 256 | 256 | |
| 257 | - $this['eccube.router.origin'] = function ($app) { |
|
| 257 | + $this['eccube.router.origin'] = function($app) { |
|
| 258 | 258 | $resource = __DIR__.'/Controller'; |
| 259 | 259 | $cachePrefix = 'Origin'; |
| 260 | 260 | |
| 261 | 261 | return $app['eccube.router']($resource, $cachePrefix); |
| 262 | 262 | }; |
| 263 | 263 | |
| 264 | - $this['eccube.routers.plugin'] = function ($app) { |
|
| 264 | + $this['eccube.routers.plugin'] = function($app) { |
|
| 265 | 265 | // TODO 有効なプラグインを対象とする必要がある. |
| 266 | 266 | $dirs = Finder::create() |
| 267 | 267 | ->in($app['config']['root_dir'].'/app/Plugin') |
@@ -278,7 +278,7 @@ discard block |
||
| 278 | 278 | return $routers; |
| 279 | 279 | }; |
| 280 | 280 | |
| 281 | - $this['eccube.router.extend'] = function ($app) { |
|
| 281 | + $this['eccube.router.extend'] = function($app) { |
|
| 282 | 282 | // TODO ディレクトリ名は暫定 |
| 283 | 283 | $resource = $app['config']['root_dir'].'/app/Acme/Controller'; |
| 284 | 284 | $cachePrefix = 'Extend'; |
@@ -288,7 +288,7 @@ discard block |
||
| 288 | 288 | return $router; |
| 289 | 289 | }; |
| 290 | 290 | |
| 291 | - $this->extend('request_matcher', function ($matcher, $app) { |
|
| 291 | + $this->extend('request_matcher', function($matcher, $app) { |
|
| 292 | 292 | $matchers = []; |
| 293 | 293 | $matchers[] = $app['eccube.router.extend']; |
| 294 | 294 | foreach ($app['eccube.routers.plugin'] as $router) { |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | return new ChainUrlMatcher($matchers, $app['request_context']); |
| 301 | 301 | }); |
| 302 | 302 | |
| 303 | - $this->extend('url_generator', function ($generator, $app) { |
|
| 303 | + $this->extend('url_generator', function($generator, $app) { |
|
| 304 | 304 | $generators = []; |
| 305 | 305 | $generators[] = $app['eccube.router.extend']; |
| 306 | 306 | foreach ($app['eccube.routers.plugin'] as $router) { |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | }); |
| 314 | 314 | |
| 315 | 315 | // TODO この設定が正しいか要確認 |
| 316 | - $this->extend('routes_factory', function ($routes, $app ) { |
|
| 316 | + $this->extend('routes_factory', function($routes, $app) { |
|
| 317 | 317 | return $this['sensio_framework_extra.routing.loader.annot_dir']->load($this['config']['root_dir'].'/src/Eccube/Controller'); |
| 318 | 318 | }); |
| 319 | 319 | // init http cache |
@@ -335,7 +335,7 @@ discard block |
||
| 335 | 335 | 'translator.cache_dir' => $this['debug'] ? null : $this['config']['root_dir'].'/app/cache/translator', |
| 336 | 336 | 'locale_fallbacks' => ['ja', 'en'], |
| 337 | 337 | )); |
| 338 | - $this->extend('translator', function ($translator, \Silex\Application $app) { |
|
| 338 | + $this->extend('translator', function($translator, \Silex\Application $app) { |
|
| 339 | 339 | $translator->addLoader('yaml', new \Symfony\Component\Translation\Loader\YamlFileLoader()); |
| 340 | 340 | |
| 341 | 341 | $file = __DIR__.'/Resource/locale/validator.'.$app['locale'].'.yml'; |
@@ -382,14 +382,14 @@ discard block |
||
| 382 | 382 | $this->register(new \Silex\Provider\TwigServiceProvider(), array( |
| 383 | 383 | 'twig.form.templates' => array('Form/form_layout.twig'), |
| 384 | 384 | )); |
| 385 | - $this->extend('twig', function (\Twig_Environment $twig, \Silex\Application $app) { |
|
| 385 | + $this->extend('twig', function(\Twig_Environment $twig, \Silex\Application $app) { |
|
| 386 | 386 | $twig->addExtension(new \Eccube\Twig\Extension\EccubeExtension($app)); |
| 387 | 387 | $twig->addExtension(new \Twig_Extension_StringLoader()); |
| 388 | 388 | |
| 389 | 389 | return $twig; |
| 390 | 390 | }); |
| 391 | 391 | |
| 392 | - $this->before(function (Request $request, \Silex\Application $app) { |
|
| 392 | + $this->before(function(Request $request, \Silex\Application $app) { |
|
| 393 | 393 | $app['admin'] = $app['front'] = false; |
| 394 | 394 | $pathinfo = rawurldecode($request->getPathInfo()); |
| 395 | 395 | if (strpos($pathinfo, '/'.trim($app['config']['admin_route'], '/').'/') === 0) { |
@@ -405,7 +405,7 @@ discard block |
||
| 405 | 405 | } |
| 406 | 406 | $paths[] = $app['config']['template_admin_realdir']; |
| 407 | 407 | $paths[] = __DIR__.'/../../app/Plugin'; |
| 408 | - $cacheDir = __DIR__.'/../../app/cache/twig/admin'; |
|
| 408 | + $cacheDir = __DIR__.'/../../app/cache/twig/admin'; |
|
| 409 | 409 | } else { |
| 410 | 410 | // モバイル端末時、smartphoneディレクトリを探索パスに追加する. |
| 411 | 411 | if ($app['mobile_detect.device_type'] == \Eccube\Entity\Master\DeviceType::DEVICE_TYPE_SP) { |
@@ -420,7 +420,7 @@ discard block |
||
| 420 | 420 | } |
| 421 | 421 | $paths[] = $app['config']['template_default_realdir']; |
| 422 | 422 | $paths[] = __DIR__.'/../../app/Plugin'; |
| 423 | - $cacheDir = __DIR__.'/../../app/cache/twig/'.$app['config']['template_code']; |
|
| 423 | + $cacheDir = __DIR__.'/../../app/cache/twig/'.$app['config']['template_code']; |
|
| 424 | 424 | } |
| 425 | 425 | $app['twig']->setCache($app['debug'] ? null : $cacheDir); |
| 426 | 426 | $app['twig.loader']->addLoader(new \Twig_Loader_Filesystem($paths)); |
@@ -438,7 +438,7 @@ discard block |
||
| 438 | 438 | }, self::EARLY_EVENT); |
| 439 | 439 | |
| 440 | 440 | // twigのグローバル変数を定義. |
| 441 | - $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function (\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) { |
|
| 441 | + $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function(\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) { |
|
| 442 | 442 | // 未ログイン時にマイページや管理画面以下にアクセスするとSubRequestで実行されるため, |
| 443 | 443 | // $event->isMasterRequest()ではなく、グローバル変数が初期化済かどうかの判定を行う |
| 444 | 444 | if (isset($this['twig_global_initialized']) && $this['twig_global_initialized'] === true) { |
@@ -524,7 +524,7 @@ discard block |
||
| 524 | 524 | // メール送信時の文字エンコード指定(デフォルトはUTF-8) |
| 525 | 525 | if (isset($this['config']['mail']['charset_iso_2022_jp']) && is_bool($this['config']['mail']['charset_iso_2022_jp'])) { |
| 526 | 526 | if ($this['config']['mail']['charset_iso_2022_jp'] === true) { |
| 527 | - \Swift::init(function () { |
|
| 527 | + \Swift::init(function() { |
|
| 528 | 528 | \Swift_DependencyContainer::getInstance() |
| 529 | 529 | ->register('mime.qpheaderencoder') |
| 530 | 530 | ->asAliasOf('mime.base64headerencoder'); |
@@ -559,7 +559,7 @@ discard block |
||
| 559 | 559 | $this->register(new \Saxulum\DoctrineOrmManagerRegistry\Provider\DoctrineOrmManagerRegistryProvider()); |
| 560 | 560 | |
| 561 | 561 | $app = $this; |
| 562 | - $this->extend('db.event_manager', function ($evm) use ($app) { |
|
| 562 | + $this->extend('db.event_manager', function($evm) use ($app) { |
|
| 563 | 563 | $initSubscriber = new InitSubscriber($app); |
| 564 | 564 | $evm->addEventSubscriber($initSubscriber); |
| 565 | 565 | |
@@ -654,7 +654,7 @@ discard block |
||
| 654 | 654 | |
| 655 | 655 | $this->extend( |
| 656 | 656 | 'orm.em.config', |
| 657 | - function (\Doctrine\ORM\Configuration $config, \Silex\Application $app) { |
|
| 657 | + function(\Doctrine\ORM\Configuration $config, \Silex\Application $app) { |
|
| 658 | 658 | |
| 659 | 659 | /** @var $chain \Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain */ |
| 660 | 660 | $chain = $config->getMetadataDriverImpl(); |
@@ -676,7 +676,7 @@ discard block |
||
| 676 | 676 | } |
| 677 | 677 | ); |
| 678 | 678 | |
| 679 | - $this->extend('orm.em', function (\Doctrine\ORM\EntityManager $em, \Silex\Application $app) { |
|
| 679 | + $this->extend('orm.em', function(\Doctrine\ORM\EntityManager $em, \Silex\Application $app) { |
|
| 680 | 680 | // tax_rule |
| 681 | 681 | $taxRuleRepository = $em->getRepository('Eccube\Entity\TaxRule'); |
| 682 | 682 | $taxRuleRepository->setApplication($app); |
@@ -705,7 +705,7 @@ discard block |
||
| 705 | 705 | // second level cacheの設定. |
| 706 | 706 | $this->extend( |
| 707 | 707 | 'orm.em.config', |
| 708 | - function (\Doctrine\ORM\Configuration $config, \Silex\Application $app) { |
|
| 708 | + function(\Doctrine\ORM\Configuration $config, \Silex\Application $app) { |
|
| 709 | 709 | $config->setSecondLevelCacheEnabled(); |
| 710 | 710 | $cacheConfig = $config->getSecondLevelCacheConfiguration(); |
| 711 | 711 | $regionConfig = $cacheConfig->getRegionsConfiguration(); |
@@ -794,31 +794,31 @@ discard block |
||
| 794 | 794 | array('^/mypage', 'ROLE_USER', $channel), |
| 795 | 795 | ); |
| 796 | 796 | |
| 797 | - $this['eccube.password_encoder'] = function ($app) { |
|
| 797 | + $this['eccube.password_encoder'] = function($app) { |
|
| 798 | 798 | return new \Eccube\Security\Core\Encoder\PasswordEncoder($app['config']); |
| 799 | 799 | }; |
| 800 | - $this['security.encoder_factory'] = function ($app) { |
|
| 800 | + $this['security.encoder_factory'] = function($app) { |
|
| 801 | 801 | return new \Symfony\Component\Security\Core\Encoder\EncoderFactory(array( |
| 802 | 802 | 'Eccube\Entity\Customer' => $app['eccube.password_encoder'], |
| 803 | 803 | 'Eccube\Entity\Member' => $app['eccube.password_encoder'], |
| 804 | 804 | )); |
| 805 | 805 | }; |
| 806 | - $this['eccube.event_listner.security'] = function ($app) { |
|
| 806 | + $this['eccube.event_listner.security'] = function($app) { |
|
| 807 | 807 | return new \Eccube\EventListener\SecurityEventListener($app['orm.em']); |
| 808 | 808 | }; |
| 809 | 809 | |
| 810 | 810 | // Voterの設定 |
| 811 | - $this['authority_voter'] = function ($app) { |
|
| 811 | + $this['authority_voter'] = function($app) { |
|
| 812 | 812 | return new \Eccube\Security\Voter\AuthorityVoter($app); |
| 813 | 813 | }; |
| 814 | 814 | |
| 815 | - $this->extend('security.voters', function ($voters, \Silex\Application $app) { |
|
| 815 | + $this->extend('security.voters', function($voters, \Silex\Application $app) { |
|
| 816 | 816 | $voters[] = $app['authority_voter']; |
| 817 | 817 | |
| 818 | 818 | return $voters; |
| 819 | 819 | }); |
| 820 | 820 | |
| 821 | - $this['security.access_manager'] = function ($app) { |
|
| 821 | + $this['security.access_manager'] = function($app) { |
|
| 822 | 822 | return new \Symfony\Component\Security\Core\Authorization\AccessDecisionManager($app['security.voters'], 'unanimous'); |
| 823 | 823 | }; |
| 824 | 824 | |
@@ -832,7 +832,7 @@ discard block |
||
| 832 | 832 | { |
| 833 | 833 | $config = $this['config']; |
| 834 | 834 | if (isset($config['trusted_proxies_connection_only']) && !empty($config['trusted_proxies_connection_only'])) { |
| 835 | - $this->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($config) { |
|
| 835 | + $this->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($config) { |
|
| 836 | 836 | // サブリクエストのREMOTE_ADDRも動的に設定を行う必要があるため、KernelEvents::REQUESTを使用する |
| 837 | 837 | Request::setTrustedProxies(array_merge(array($event->getRequest()->server->get('REMOTE_ADDR')), $config['trusted_proxies'])); |
| 838 | 838 | }, self::EARLY_EVENT); |
@@ -849,7 +849,7 @@ discard block |
||
| 849 | 849 | $this->register(new ServiceProvider\EccubePluginServiceProvider()); |
| 850 | 850 | |
| 851 | 851 | // TODO Acme\ServiceProvider の初期化はここで OK? |
| 852 | - if (array_key_exists('service',$this['config'])) { |
|
| 852 | + if (array_key_exists('service', $this['config'])) { |
|
| 853 | 853 | foreach ($this['config']['service'] as $service) { |
| 854 | 854 | $this->register(new $service); |
| 855 | 855 | } |
@@ -1005,7 +1005,7 @@ discard block |
||
| 1005 | 1005 | $app = $this; |
| 1006 | 1006 | |
| 1007 | 1007 | // Response Event(http cache対応、event実行は一番遅く設定) |
| 1008 | - $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) { |
|
| 1008 | + $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) { |
|
| 1009 | 1009 | |
| 1010 | 1010 | if (!$event->isMasterRequest()) { |
| 1011 | 1011 | return; |