@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | $this->register(new MobileDetectServiceProvider()); |
174 | 174 | $this->register(new TwigLintServiceProvider()); |
175 | 175 | |
176 | - $this->error(function (\Exception $e, Request $request, $code) { |
|
176 | + $this->error(function(\Exception $e, Request $request, $code) { |
|
177 | 177 | if ($this['debug']) { |
178 | 178 | return; |
179 | 179 | } |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | |
241 | 241 | $pluginSubDirs = (function($dirName) use ($enabledPluginDirs) { |
242 | 242 | return array_map(function($pluginDir) use ($dirName) { |
243 | - return $pluginDir . '/' . $dirName; |
|
243 | + return $pluginDir.'/'.$dirName; |
|
244 | 244 | }, $enabledPluginDirs); |
245 | 245 | }); |
246 | 246 | |
@@ -301,7 +301,7 @@ discard block |
||
301 | 301 | return $router; |
302 | 302 | }); |
303 | 303 | |
304 | - $this['eccube.router.origin'] = function ($app) { |
|
304 | + $this['eccube.router.origin'] = function($app) { |
|
305 | 305 | $resource = __DIR__.'/Controller'; |
306 | 306 | $cachePrefix = 'Origin'; |
307 | 307 | |
@@ -310,7 +310,7 @@ discard block |
||
310 | 310 | |
311 | 311 | $this['eccube.routers.plugin'] = []; |
312 | 312 | |
313 | - $this['eccube.router.extend'] = function ($app) { |
|
313 | + $this['eccube.router.extend'] = function($app) { |
|
314 | 314 | // TODO ディレクトリ名は暫定 |
315 | 315 | $resource = $app['config']['root_dir'].'/app/Acme/Controller'; |
316 | 316 | $cachePrefix = 'Extend'; |
@@ -320,7 +320,7 @@ discard block |
||
320 | 320 | return $router; |
321 | 321 | }; |
322 | 322 | |
323 | - $this->extend('request_matcher', function ($matcher, $app) { |
|
323 | + $this->extend('request_matcher', function($matcher, $app) { |
|
324 | 324 | $matchers = []; |
325 | 325 | $matchers[] = $app['eccube.router.extend']; |
326 | 326 | foreach ($app['eccube.routers.plugin'] as $router) { |
@@ -332,7 +332,7 @@ discard block |
||
332 | 332 | return new ChainUrlMatcher($matchers, $app['request_context']); |
333 | 333 | }); |
334 | 334 | |
335 | - $this->extend('url_generator', function ($generator, $app) { |
|
335 | + $this->extend('url_generator', function($generator, $app) { |
|
336 | 336 | $generators = []; |
337 | 337 | $generators[] = $app['eccube.router.extend']; |
338 | 338 | foreach ($app['eccube.routers.plugin'] as $router) { |
@@ -345,7 +345,7 @@ discard block |
||
345 | 345 | }); |
346 | 346 | |
347 | 347 | // Route CollectionにEC-CUBEで定義したルーティングを追加(debug tool barに出力するため) |
348 | - $this->extend('routes', function ($routes, $app) { |
|
348 | + $this->extend('routes', function($routes, $app) { |
|
349 | 349 | $routes->addCollection($app['eccube.router.extend']->getRouteCollection()); |
350 | 350 | foreach ($app['eccube.routers.plugin'] as $router) { |
351 | 351 | $routes->addCollection($router->getRouteCollection()); |
@@ -378,7 +378,7 @@ discard block |
||
378 | 378 | 'translator.cache_dir' => $this['debug'] ? null : $this['config']['root_dir'].'/app/cache/translator', |
379 | 379 | 'locale_fallbacks' => ['ja', 'en'], |
380 | 380 | )); |
381 | - $this->extend('translator', function ($translator, \Silex\Application $app) { |
|
381 | + $this->extend('translator', function($translator, \Silex\Application $app) { |
|
382 | 382 | $translator->addLoader('php', new \Symfony\Component\Translation\Loader\PhpFileLoader()); |
383 | 383 | |
384 | 384 | $file = __DIR__.'/Resource/locale/messages.'.$app['locale'].'.php'; |
@@ -421,14 +421,14 @@ discard block |
||
421 | 421 | $this->register(new \Silex\Provider\TwigServiceProvider(), array( |
422 | 422 | 'twig.form.templates' => array('Form/form_layout.twig'), |
423 | 423 | )); |
424 | - $this->extend('twig', function (\Twig_Environment $twig, \Silex\Application $app) { |
|
424 | + $this->extend('twig', function(\Twig_Environment $twig, \Silex\Application $app) { |
|
425 | 425 | $twig->addExtension(new \Eccube\Twig\Extension\EccubeExtension($app)); |
426 | 426 | $twig->addExtension(new \Twig_Extension_StringLoader()); |
427 | 427 | |
428 | 428 | return $twig; |
429 | 429 | }); |
430 | 430 | |
431 | - $this->before(function (Request $request, \Silex\Application $app) { |
|
431 | + $this->before(function(Request $request, \Silex\Application $app) { |
|
432 | 432 | $app['admin'] = $app['front'] = false; |
433 | 433 | $pathinfo = rawurldecode($request->getPathInfo()); |
434 | 434 | if (strpos($pathinfo, '/'.trim($app['config']['admin_route'], '/').'/') === 0) { |
@@ -444,7 +444,7 @@ discard block |
||
444 | 444 | } |
445 | 445 | $paths[] = $app['config']['template_admin_realdir']; |
446 | 446 | $paths[] = __DIR__.'/../../app/Plugin'; |
447 | - $cacheDir = __DIR__.'/../../app/cache/twig/admin'; |
|
447 | + $cacheDir = __DIR__.'/../../app/cache/twig/admin'; |
|
448 | 448 | } else { |
449 | 449 | // モバイル端末時、smartphoneディレクトリを探索パスに追加する. |
450 | 450 | if ($app['mobile_detect.device_type'] == \Eccube\Entity\Master\DeviceType::DEVICE_TYPE_SP) { |
@@ -459,7 +459,7 @@ discard block |
||
459 | 459 | } |
460 | 460 | $paths[] = $app['config']['template_default_realdir']; |
461 | 461 | $paths[] = __DIR__.'/../../app/Plugin'; |
462 | - $cacheDir = __DIR__.'/../../app/cache/twig/'.$app['config']['template_code']; |
|
462 | + $cacheDir = __DIR__.'/../../app/cache/twig/'.$app['config']['template_code']; |
|
463 | 463 | } |
464 | 464 | $app['twig']->setCache($app['debug'] ? null : $cacheDir); |
465 | 465 | $app['twig.loader']->addLoader(new \Twig_Loader_Filesystem($paths)); |
@@ -477,7 +477,7 @@ discard block |
||
477 | 477 | }, self::EARLY_EVENT); |
478 | 478 | |
479 | 479 | // twigのグローバル変数を定義. |
480 | - $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function (\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) { |
|
480 | + $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function(\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) { |
|
481 | 481 | // 未ログイン時にマイページや管理画面以下にアクセスするとSubRequestで実行されるため, |
482 | 482 | // $event->isMasterRequest()ではなく、グローバル変数が初期化済かどうかの判定を行う |
483 | 483 | if (isset($this['twig_global_initialized']) && $this['twig_global_initialized'] === true) { |
@@ -562,7 +562,7 @@ discard block |
||
562 | 562 | // メール送信時の文字エンコード指定(デフォルトはUTF-8) |
563 | 563 | if (isset($this['config']['mail']['charset_iso_2022_jp']) && is_bool($this['config']['mail']['charset_iso_2022_jp'])) { |
564 | 564 | if ($this['config']['mail']['charset_iso_2022_jp'] === true) { |
565 | - \Swift::init(function () { |
|
565 | + \Swift::init(function() { |
|
566 | 566 | \Swift_DependencyContainer::getInstance() |
567 | 567 | ->register('mime.qpheaderencoder') |
568 | 568 | ->asAliasOf('mime.base64headerencoder'); |
@@ -597,7 +597,7 @@ discard block |
||
597 | 597 | $this->register(new \Saxulum\DoctrineOrmManagerRegistry\Provider\DoctrineOrmManagerRegistryProvider()); |
598 | 598 | |
599 | 599 | $app = $this; |
600 | - $this->extend('db.event_manager', function ($evm) use ($app) { |
|
600 | + $this->extend('db.event_manager', function($evm) use ($app) { |
|
601 | 601 | $initSubscriber = new InitSubscriber($app); |
602 | 602 | $evm->addEventSubscriber($initSubscriber); |
603 | 603 | |
@@ -692,7 +692,7 @@ discard block |
||
692 | 692 | |
693 | 693 | $this->extend( |
694 | 694 | 'orm.em.config', |
695 | - function (\Doctrine\ORM\Configuration $config, \Silex\Application $app) { |
|
695 | + function(\Doctrine\ORM\Configuration $config, \Silex\Application $app) { |
|
696 | 696 | |
697 | 697 | /** @var $chain \Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain */ |
698 | 698 | $chain = $config->getMetadataDriverImpl(); |
@@ -714,7 +714,7 @@ discard block |
||
714 | 714 | } |
715 | 715 | ); |
716 | 716 | |
717 | - $this->extend('orm.em', function (\Doctrine\ORM\EntityManager $em, \Silex\Application $app) { |
|
717 | + $this->extend('orm.em', function(\Doctrine\ORM\EntityManager $em, \Silex\Application $app) { |
|
718 | 718 | // save |
719 | 719 | $saveEventSubscriber = new \Eccube\Doctrine\EventSubscriber\SaveEventSubscriber($app); |
720 | 720 | $em->getEventManager()->addEventSubscriber($saveEventSubscriber); |
@@ -735,7 +735,7 @@ discard block |
||
735 | 735 | // second level cacheの設定. |
736 | 736 | $this->extend( |
737 | 737 | 'orm.em.config', |
738 | - function (\Doctrine\ORM\Configuration $config, \Silex\Application $app) { |
|
738 | + function(\Doctrine\ORM\Configuration $config, \Silex\Application $app) { |
|
739 | 739 | $config->setSecondLevelCacheEnabled(); |
740 | 740 | $cacheConfig = $config->getSecondLevelCacheConfiguration(); |
741 | 741 | $regionConfig = $cacheConfig->getRegionsConfiguration(); |
@@ -824,31 +824,31 @@ discard block |
||
824 | 824 | array('^/mypage', 'ROLE_USER', $channel), |
825 | 825 | ); |
826 | 826 | |
827 | - $this['eccube.password_encoder'] = function ($app) { |
|
827 | + $this['eccube.password_encoder'] = function($app) { |
|
828 | 828 | return new \Eccube\Security\Core\Encoder\PasswordEncoder($app['config']); |
829 | 829 | }; |
830 | - $this['security.encoder_factory'] = function ($app) { |
|
830 | + $this['security.encoder_factory'] = function($app) { |
|
831 | 831 | return new \Symfony\Component\Security\Core\Encoder\EncoderFactory(array( |
832 | 832 | 'Eccube\Entity\Customer' => $app['eccube.password_encoder'], |
833 | 833 | 'Eccube\Entity\Member' => $app['eccube.password_encoder'], |
834 | 834 | )); |
835 | 835 | }; |
836 | - $this['eccube.event_listner.security'] = function ($app) { |
|
836 | + $this['eccube.event_listner.security'] = function($app) { |
|
837 | 837 | return new \Eccube\EventListener\SecurityEventListener($app['orm.em']); |
838 | 838 | }; |
839 | 839 | |
840 | 840 | // Voterの設定 |
841 | - $this['authority_voter'] = function ($app) { |
|
841 | + $this['authority_voter'] = function($app) { |
|
842 | 842 | return new \Eccube\Security\Voter\AuthorityVoter($app); |
843 | 843 | }; |
844 | 844 | |
845 | - $this->extend('security.voters', function ($voters, \Silex\Application $app) { |
|
845 | + $this->extend('security.voters', function($voters, \Silex\Application $app) { |
|
846 | 846 | $voters[] = $app['authority_voter']; |
847 | 847 | |
848 | 848 | return $voters; |
849 | 849 | }); |
850 | 850 | |
851 | - $this['security.access_manager'] = function ($app) { |
|
851 | + $this['security.access_manager'] = function($app) { |
|
852 | 852 | return new \Symfony\Component\Security\Core\Authorization\AccessDecisionManager($app['security.voters'], 'unanimous'); |
853 | 853 | }; |
854 | 854 | |
@@ -862,7 +862,7 @@ discard block |
||
862 | 862 | { |
863 | 863 | $config = $this['config']; |
864 | 864 | if (isset($config['trusted_proxies_connection_only']) && !empty($config['trusted_proxies_connection_only'])) { |
865 | - $this->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($config) { |
|
865 | + $this->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($config) { |
|
866 | 866 | // サブリクエストのREMOTE_ADDRも動的に設定を行う必要があるため、KernelEvents::REQUESTを使用する |
867 | 867 | Request::setTrustedProxies(array_merge(array($event->getRequest()->server->get('REMOTE_ADDR')), $config['trusted_proxies'])); |
868 | 868 | }, self::EARLY_EVENT); |
@@ -879,7 +879,7 @@ discard block |
||
879 | 879 | $this->register(new ServiceProvider\EccubePluginServiceProvider()); |
880 | 880 | |
881 | 881 | // TODO Acme\ServiceProvider の初期化はここで OK? |
882 | - if (array_key_exists('service',$this['config'])) { |
|
882 | + if (array_key_exists('service', $this['config'])) { |
|
883 | 883 | foreach ($this['config']['service'] as $service) { |
884 | 884 | $this->register(new $service); |
885 | 885 | } |
@@ -1016,7 +1016,7 @@ discard block |
||
1016 | 1016 | $app = $this; |
1017 | 1017 | |
1018 | 1018 | // Response Event(http cache対応、event実行は一番遅く設定) |
1019 | - $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) { |
|
1019 | + $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) { |
|
1020 | 1020 | |
1021 | 1021 | if (!$event->isMasterRequest()) { |
1022 | 1022 | return; |
@@ -26,7 +26,6 @@ discard block |
||
26 | 26 | use Doctrine\ORM\EntityManager; |
27 | 27 | use Eccube\Annotation\Inject; |
28 | 28 | use Eccube\Application; |
29 | -use Eccube\Common\Constant; |
|
30 | 29 | use Eccube\Controller\AbstractController; |
31 | 30 | use Eccube\Entity\CustomerAddress; |
32 | 31 | use Eccube\Event\EccubeEvents; |
@@ -35,12 +34,10 @@ discard block |
||
35 | 34 | use Eccube\Repository\CustomerRepository; |
36 | 35 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
37 | 36 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
38 | -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
|
39 | 37 | use Symfony\Component\EventDispatcher\EventDispatcher; |
40 | 38 | use Symfony\Component\Form\FormFactory; |
41 | 39 | use Symfony\Component\HttpFoundation\Request; |
42 | 40 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
43 | -use Symfony\Component\Security\Core\Encoder\EncoderFactory; |
|
44 | 41 | use Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface; |
45 | 42 | |
46 | 43 | /** |
@@ -27,7 +27,6 @@ |
||
27 | 27 | use Doctrine\ORM\EntityManager; |
28 | 28 | use Eccube\Annotation\Inject; |
29 | 29 | use Eccube\Application; |
30 | -use Eccube\Common\Constant; |
|
31 | 30 | use Eccube\Controller\AbstractController; |
32 | 31 | use Eccube\Entity\Delivery; |
33 | 32 | use Eccube\Event\EccubeEvents; |
@@ -27,14 +27,12 @@ |
||
27 | 27 | use Doctrine\ORM\EntityManager; |
28 | 28 | use Eccube\Annotation\Inject; |
29 | 29 | use Eccube\Application; |
30 | -use Eccube\Common\Constant; |
|
31 | 30 | use Eccube\Controller\AbstractController; |
32 | 31 | use Eccube\Entity\Master\CustomerStatus; |
33 | 32 | use Eccube\Event\EccubeEvents; |
34 | 33 | use Eccube\Event\EventArgs; |
35 | 34 | use Eccube\Repository\Master\CustomerStatusRepository; |
36 | 35 | use Eccube\Service\MailService; |
37 | -use Eccube\Util\Str; |
|
38 | 36 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
39 | 37 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
40 | 38 | use Symfony\Component\EventDispatcher\EventDispatcher; |
@@ -24,8 +24,6 @@ |
||
24 | 24 | namespace Eccube\Di\Scanner; |
25 | 25 | |
26 | 26 | |
27 | -use Doctrine\Common\Annotations\AnnotationReader; |
|
28 | -use Doctrine\ORM\Mapping\Annotation; |
|
29 | 27 | use Eccube\Di\ComponentDefinition; |
30 | 28 | use Eccube\Di\Scanner; |
31 | 29 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |