@@ -964,7 +964,7 @@ |
||
964 | 964 | * 失敗 : \Doctrine\DBAL\DBALExceptionエラーが発生( 接続に失敗した場合 )、エラー画面を表示しdie() |
965 | 965 | * 備考 : app['debug']がtrueの際は処理を行わない |
966 | 966 | * |
967 | - * @return boolean true |
|
967 | + * @return null|boolean true |
|
968 | 968 | * |
969 | 969 | */ |
970 | 970 | protected function checkDatabaseConnection() |
@@ -660,13 +660,13 @@ |
||
660 | 660 | $pluginConfigs = PluginConfigManager::getPluginConfigAll($this['debug']); |
661 | 661 | $ormMappings = array(); |
662 | 662 | $ormMappings[] = array( |
663 | - 'type' => 'annotation', |
|
664 | - 'namespace' => 'Eccube\Entity', |
|
665 | - 'path' => array( |
|
666 | - __DIR__.'/Entity' |
|
667 | - ), |
|
668 | - 'use_simple_annotation_reader' => false, |
|
669 | - ); |
|
663 | + 'type' => 'annotation', |
|
664 | + 'namespace' => 'Eccube\Entity', |
|
665 | + 'path' => array( |
|
666 | + __DIR__.'/Entity' |
|
667 | + ), |
|
668 | + 'use_simple_annotation_reader' => false, |
|
669 | + ); |
|
670 | 670 | |
671 | 671 | if (isset($this['config']['vendor_dir']) && file_exists($this['config']['vendor_dir'].'/Entity')) { |
672 | 672 |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | $this->register(new MobileDetectServiceProvider()); |
235 | 235 | $this->register(new TwigLintServiceProvider()); |
236 | 236 | |
237 | - $this->error(function (\Exception $e, Request $request, $code) { |
|
237 | + $this->error(function(\Exception $e, Request $request, $code) { |
|
238 | 238 | if ($this['debug']) { |
239 | 239 | return; |
240 | 240 | } |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | |
300 | 300 | $pluginSubDirs = (function($dirName) use ($enabledPluginDirs) { |
301 | 301 | return array_map(function($pluginDir) use ($dirName) { |
302 | - return $pluginDir . '/' . $dirName; |
|
302 | + return $pluginDir.'/'.$dirName; |
|
303 | 303 | }, $enabledPluginDirs); |
304 | 304 | }); |
305 | 305 | |
@@ -375,7 +375,7 @@ discard block |
||
375 | 375 | return $router; |
376 | 376 | }); |
377 | 377 | |
378 | - $this['eccube.router.origin'] = function ($app) { |
|
378 | + $this['eccube.router.origin'] = function($app) { |
|
379 | 379 | $resource = __DIR__.'/Controller'; |
380 | 380 | $cachePrefix = 'Origin'; |
381 | 381 | |
@@ -385,7 +385,7 @@ discard block |
||
385 | 385 | $this['eccube.routers.plugin'] = []; |
386 | 386 | |
387 | 387 | if (isset($this['config']['vendor_dir']) && file_exists($this['config']['vendor_dir'].'/Controller')) { |
388 | - $this['eccube.router.extend'] = function ($app) { |
|
388 | + $this['eccube.router.extend'] = function($app) { |
|
389 | 389 | $resource = $app['config']['vendor_dir'].'/Controller'; |
390 | 390 | $cachePrefix = 'Extend'; |
391 | 391 | |
@@ -394,7 +394,7 @@ discard block |
||
394 | 394 | return $router; |
395 | 395 | }; |
396 | 396 | } |
397 | - $this->extend('request_matcher', function ($matcher, $app) { |
|
397 | + $this->extend('request_matcher', function($matcher, $app) { |
|
398 | 398 | $matchers = []; |
399 | 399 | if (isset($app['eccube.router.extend'])) { |
400 | 400 | $matchers[] = $app['eccube.router.extend']; |
@@ -408,7 +408,7 @@ discard block |
||
408 | 408 | return new ChainUrlMatcher($matchers, $app['request_context']); |
409 | 409 | }); |
410 | 410 | |
411 | - $this->extend('url_generator', function ($generator, $app) { |
|
411 | + $this->extend('url_generator', function($generator, $app) { |
|
412 | 412 | $generators = []; |
413 | 413 | if (isset($app['eccube.router.extend'])) { |
414 | 414 | $generators[] = $app['eccube.router.extend']; |
@@ -423,7 +423,7 @@ discard block |
||
423 | 423 | }); |
424 | 424 | |
425 | 425 | // Route CollectionにEC-CUBEで定義したルーティングを追加(debug tool barに出力するため) |
426 | - $this->extend('routes', function ($routes, $app) { |
|
426 | + $this->extend('routes', function($routes, $app) { |
|
427 | 427 | if (isset($app['eccube.router.extend'])) { |
428 | 428 | $routes->addCollection($app['eccube.router.extend']->getRouteCollection()); |
429 | 429 | } |
@@ -458,7 +458,7 @@ discard block |
||
458 | 458 | 'translator.cache_dir' => $this['debug'] ? null : $this['config']['root_dir'].'/app/cache/translator', |
459 | 459 | 'locale_fallbacks' => [$this['config']['locale'], 'en'], |
460 | 460 | )); |
461 | - $this->extend('translator', function ($translator, \Silex\Application $app) { |
|
461 | + $this->extend('translator', function($translator, \Silex\Application $app) { |
|
462 | 462 | $translator->addLoader('php', new \Symfony\Component\Translation\Loader\PhpFileLoader()); |
463 | 463 | |
464 | 464 | $file = __DIR__.'/Resource/locale/messages.'.$app['locale'].'.php'; |
@@ -501,14 +501,14 @@ discard block |
||
501 | 501 | $this->register(new \Silex\Provider\TwigServiceProvider(), array( |
502 | 502 | 'twig.form.templates' => array('Form/form_div_layout.twig'), |
503 | 503 | )); |
504 | - $this->extend('twig', function (\Twig_Environment $twig, \Silex\Application $app) { |
|
504 | + $this->extend('twig', function(\Twig_Environment $twig, \Silex\Application $app) { |
|
505 | 505 | $twig->addExtension(new \Eccube\Twig\Extension\EccubeExtension($app)); |
506 | 506 | $twig->addExtension(new \Twig_Extension_StringLoader()); |
507 | 507 | |
508 | 508 | return $twig; |
509 | 509 | }); |
510 | 510 | |
511 | - $this->before(function (Request $request, \Silex\Application $app) { |
|
511 | + $this->before(function(Request $request, \Silex\Application $app) { |
|
512 | 512 | $app['admin'] = $app['front'] = false; |
513 | 513 | $pathinfo = rawurldecode($request->getPathInfo()); |
514 | 514 | if (strpos($pathinfo, '/'.trim($app['config']['admin_route'], '/').'/') === 0) { |
@@ -524,7 +524,7 @@ discard block |
||
524 | 524 | } |
525 | 525 | $paths[] = $app['config']['template_admin_realdir']; |
526 | 526 | $paths[] = __DIR__.'/../../app/Plugin'; |
527 | - $cacheDir = __DIR__.'/../../app/cache/twig/admin'; |
|
527 | + $cacheDir = __DIR__.'/../../app/cache/twig/admin'; |
|
528 | 528 | } else { |
529 | 529 | // モバイル端末時、smartphoneディレクトリを探索パスに追加する. |
530 | 530 | if ($app['mobile_detect.device_type'] == \Eccube\Entity\Master\DeviceType::DEVICE_TYPE_SP) { |
@@ -539,7 +539,7 @@ discard block |
||
539 | 539 | } |
540 | 540 | $paths[] = $app['config']['template_default_realdir']; |
541 | 541 | $paths[] = __DIR__.'/../../app/Plugin'; |
542 | - $cacheDir = __DIR__.'/../../app/cache/twig/'.$app['config']['template_code']; |
|
542 | + $cacheDir = __DIR__.'/../../app/cache/twig/'.$app['config']['template_code']; |
|
543 | 543 | } |
544 | 544 | $app['twig']->setCache($app['debug'] ? null : $cacheDir); |
545 | 545 | $app['twig.loader']->addLoader(new \Twig_Loader_Filesystem($paths)); |
@@ -557,7 +557,7 @@ discard block |
||
557 | 557 | }, self::EARLY_EVENT); |
558 | 558 | |
559 | 559 | // twigのグローバル変数を定義. |
560 | - $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function (\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) { |
|
560 | + $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function(\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) { |
|
561 | 561 | // 未ログイン時にマイページや管理画面以下にアクセスするとSubRequestで実行されるため, |
562 | 562 | // $event->isMasterRequest()ではなく、グローバル変数が初期化済かどうかの判定を行う |
563 | 563 | if (isset($this['twig_global_initialized']) && $this['twig_global_initialized'] === true) { |
@@ -642,7 +642,7 @@ discard block |
||
642 | 642 | // メール送信時の文字エンコード指定(デフォルトはUTF-8) |
643 | 643 | if (isset($this['config']['mail']['charset_iso_2022_jp']) && is_bool($this['config']['mail']['charset_iso_2022_jp'])) { |
644 | 644 | if ($this['config']['mail']['charset_iso_2022_jp'] === true) { |
645 | - \Swift::init(function () { |
|
645 | + \Swift::init(function() { |
|
646 | 646 | \Swift_DependencyContainer::getInstance() |
647 | 647 | ->register('mime.qpheaderencoder') |
648 | 648 | ->asAliasOf('mime.base64headerencoder'); |
@@ -677,7 +677,7 @@ discard block |
||
677 | 677 | $this->register(new \Saxulum\DoctrineOrmManagerRegistry\Provider\DoctrineOrmManagerRegistryProvider()); |
678 | 678 | |
679 | 679 | $app = $this; |
680 | - $this->extend('db.event_manager', function ($evm) use ($app) { |
|
680 | + $this->extend('db.event_manager', function($evm) use ($app) { |
|
681 | 681 | $initSubscriber = new InitSubscriber($app); |
682 | 682 | $evm->addEventSubscriber($initSubscriber); |
683 | 683 | |
@@ -794,7 +794,7 @@ discard block |
||
794 | 794 | |
795 | 795 | $this->extend( |
796 | 796 | 'orm.em.config', |
797 | - function (\Doctrine\ORM\Configuration $config, \Silex\Application $app) { |
|
797 | + function(\Doctrine\ORM\Configuration $config, \Silex\Application $app) { |
|
798 | 798 | |
799 | 799 | /** @var $chain \Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain */ |
800 | 800 | $chain = $config->getMetadataDriverImpl(); |
@@ -816,7 +816,7 @@ discard block |
||
816 | 816 | } |
817 | 817 | ); |
818 | 818 | |
819 | - $this->extend('orm.em', function (\Doctrine\ORM\EntityManager $em, \Silex\Application $app) { |
|
819 | + $this->extend('orm.em', function(\Doctrine\ORM\EntityManager $em, \Silex\Application $app) { |
|
820 | 820 | // save |
821 | 821 | $saveEventSubscriber = new \Eccube\Doctrine\EventSubscriber\SaveEventSubscriber($app); |
822 | 822 | $em->getEventManager()->addEventSubscriber($saveEventSubscriber); |
@@ -841,7 +841,7 @@ discard block |
||
841 | 841 | // second level cacheの設定. |
842 | 842 | $this->extend( |
843 | 843 | 'orm.em.config', |
844 | - function (\Doctrine\ORM\Configuration $config, \Silex\Application $app) { |
|
844 | + function(\Doctrine\ORM\Configuration $config, \Silex\Application $app) { |
|
845 | 845 | $config->setSecondLevelCacheEnabled(); |
846 | 846 | $cacheConfig = $config->getSecondLevelCacheConfiguration(); |
847 | 847 | $regionConfig = $cacheConfig->getRegionsConfiguration(); |
@@ -930,31 +930,31 @@ discard block |
||
930 | 930 | array('^/mypage', 'ROLE_USER', $channel), |
931 | 931 | ); |
932 | 932 | |
933 | - $this['eccube.password_encoder'] = function ($app) { |
|
933 | + $this['eccube.password_encoder'] = function($app) { |
|
934 | 934 | return new \Eccube\Security\Core\Encoder\PasswordEncoder($app['config']); |
935 | 935 | }; |
936 | - $this['security.encoder_factory'] = function ($app) { |
|
936 | + $this['security.encoder_factory'] = function($app) { |
|
937 | 937 | return new \Symfony\Component\Security\Core\Encoder\EncoderFactory(array( |
938 | 938 | 'Eccube\Entity\Customer' => $app['eccube.password_encoder'], |
939 | 939 | 'Eccube\Entity\Member' => $app['eccube.password_encoder'], |
940 | 940 | )); |
941 | 941 | }; |
942 | - $this['eccube.event_listner.security'] = function ($app) { |
|
942 | + $this['eccube.event_listner.security'] = function($app) { |
|
943 | 943 | return new \Eccube\EventListener\SecurityEventListener($app['orm.em']); |
944 | 944 | }; |
945 | 945 | |
946 | 946 | // Voterの設定 |
947 | - $this['authority_voter'] = function ($app) { |
|
947 | + $this['authority_voter'] = function($app) { |
|
948 | 948 | return new \Eccube\Security\Voter\AuthorityVoter($app); |
949 | 949 | }; |
950 | 950 | |
951 | - $this->extend('security.voters', function ($voters, \Silex\Application $app) { |
|
951 | + $this->extend('security.voters', function($voters, \Silex\Application $app) { |
|
952 | 952 | $voters[] = $app['authority_voter']; |
953 | 953 | |
954 | 954 | return $voters; |
955 | 955 | }); |
956 | 956 | |
957 | - $this['security.access_manager'] = function ($app) { |
|
957 | + $this['security.access_manager'] = function($app) { |
|
958 | 958 | return new \Symfony\Component\Security\Core\Authorization\AccessDecisionManager($app['security.voters'], 'unanimous'); |
959 | 959 | }; |
960 | 960 | |
@@ -969,7 +969,7 @@ discard block |
||
969 | 969 | // ロードバランサやプロキシの設定をする |
970 | 970 | $config = $this['config']; |
971 | 971 | if (isset($config['trusted_proxies_connection_only']) && !empty($config['trusted_proxies_connection_only'])) { |
972 | - $this->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($config) { |
|
972 | + $this->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($config) { |
|
973 | 973 | // サブリクエストのREMOTE_ADDRも動的に設定を行う必要があるため、KernelEvents::REQUESTを使用する |
974 | 974 | Request::setTrustedProxies(array_merge(array($event->getRequest()->server->get('REMOTE_ADDR')), $config['trusted_proxies'])); |
975 | 975 | }, self::EARLY_EVENT); |
@@ -988,7 +988,7 @@ discard block |
||
988 | 988 | $this->register(new ServiceProvider\EccubePluginServiceProvider()); |
989 | 989 | |
990 | 990 | // TODO Acme\ServiceProvider の初期化はここで OK? |
991 | - if (array_key_exists('service',$this['config'])) { |
|
991 | + if (array_key_exists('service', $this['config'])) { |
|
992 | 992 | foreach ($this['config']['service'] as $service) { |
993 | 993 | $this->register(new $service); |
994 | 994 | } |
@@ -1110,7 +1110,7 @@ discard block |
||
1110 | 1110 | $app = $this; |
1111 | 1111 | |
1112 | 1112 | // Response Event(http cache対応、event実行は一番遅く設定) |
1113 | - $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) { |
|
1113 | + $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) { |
|
1114 | 1114 | |
1115 | 1115 | if (!$event->isMasterRequest()) { |
1116 | 1116 | return; |
@@ -112,7 +112,7 @@ |
||
112 | 112 | } |
113 | 113 | } |
114 | 114 | |
115 | - $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) use ($Product) { |
|
115 | + $builder->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event) use ($Product) { |
|
116 | 116 | $data = $event->getData(); |
117 | 117 | $form = $event->getForm(); |
118 | 118 | if (!is_null($Product->getClassName2())) { |
@@ -26,7 +26,6 @@ |
||
26 | 26 | |
27 | 27 | use Eccube\Annotation\FormType; |
28 | 28 | use Eccube\Annotation\Inject; |
29 | -use Eccube\Application; |
|
30 | 29 | use Symfony\Component\Form\AbstractType; |
31 | 30 | use Symfony\Component\Form\Extension\Core\Type\ChoiceType; |
32 | 31 | use Symfony\Component\Form\Extension\Core\Type\HiddenType; |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | )); |
62 | 62 | |
63 | 63 | $message = \Swift_Message::newInstance() |
64 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録のご確認') |
|
64 | + ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録のご確認') |
|
65 | 65 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
66 | 66 | ->setTo(array($Customer->getEmail())) |
67 | 67 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | )); |
103 | 103 | |
104 | 104 | $message = \Swift_Message::newInstance() |
105 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録が完了しました。') |
|
105 | + ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録が完了しました。') |
|
106 | 106 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
107 | 107 | ->setTo(array($Customer->getEmail())) |
108 | 108 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | )); |
145 | 145 | |
146 | 146 | $message = \Swift_Message::newInstance() |
147 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] 退会手続きのご完了') |
|
147 | + ->setSubject('['.$this->BaseInfo->getShopName().'] 退会手続きのご完了') |
|
148 | 148 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
149 | 149 | ->setTo(array($email)) |
150 | 150 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | |
188 | 188 | // 問い合わせ者にメール送信 |
189 | 189 | $message = \Swift_Message::newInstance() |
190 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] お問い合わせを受け付けました。') |
|
190 | + ->setSubject('['.$this->BaseInfo->getShopName().'] お問い合わせを受け付けました。') |
|
191 | 191 | ->setFrom(array($this->BaseInfo->getEmail02() => $this->BaseInfo->getShopName())) |
192 | 192 | ->setTo(array($formData['email'])) |
193 | 193 | ->setBcc($this->BaseInfo->getEmail02()) |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | )); |
245 | 245 | |
246 | 246 | $message = \Swift_Message::newInstance() |
247 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] ' . $MailTemplate->getSubject()) |
|
247 | + ->setSubject('['.$this->BaseInfo->getShopName().'] '.$MailTemplate->getSubject()) |
|
248 | 248 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
249 | 249 | ->setTo(array($Order->getEmail())) |
250 | 250 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | )); |
289 | 289 | |
290 | 290 | $message = \Swift_Message::newInstance() |
291 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] 会員登録のご確認') |
|
291 | + ->setSubject('['.$this->BaseInfo->getShopName().'] 会員登録のご確認') |
|
292 | 292 | ->setFrom(array($this->BaseInfo->getEmail03() => $this->BaseInfo->getShopName())) |
293 | 293 | ->setTo(array($Customer->getEmail())) |
294 | 294 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -332,7 +332,7 @@ discard block |
||
332 | 332 | )); |
333 | 333 | |
334 | 334 | $message = \Swift_Message::newInstance() |
335 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] ' . $formData['subject']) |
|
335 | + ->setSubject('['.$this->BaseInfo->getShopName().'] '.$formData['subject']) |
|
336 | 336 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
337 | 337 | ->setTo(array($Order->getEmail())) |
338 | 338 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -373,7 +373,7 @@ discard block |
||
373 | 373 | )); |
374 | 374 | |
375 | 375 | $message = \Swift_Message::newInstance() |
376 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] パスワード変更のご確認') |
|
376 | + ->setSubject('['.$this->BaseInfo->getShopName().'] パスワード変更のご確認') |
|
377 | 377 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
378 | 378 | ->setTo(array($Customer->getEmail())) |
379 | 379 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -414,7 +414,7 @@ discard block |
||
414 | 414 | )); |
415 | 415 | |
416 | 416 | $message = \Swift_Message::newInstance() |
417 | - ->setSubject('[' . $this->BaseInfo->getShopName() . '] パスワード変更のお知らせ') |
|
417 | + ->setSubject('['.$this->BaseInfo->getShopName().'] パスワード変更のお知らせ') |
|
418 | 418 | ->setFrom(array($this->BaseInfo->getEmail01() => $this->BaseInfo->getShopName())) |
419 | 419 | ->setTo(array($Customer->getEmail())) |
420 | 420 | ->setBcc($this->BaseInfo->getEmail01()) |
@@ -52,7 +52,7 @@ |
||
52 | 52 | |
53 | 53 | $this->app = $this->getSilexApplication(); |
54 | 54 | |
55 | - \Eccube\Util\Cache::clear($this->app,$input->getOption('all')); |
|
55 | + \Eccube\Util\Cache::clear($this->app, $input->getOption('all')); |
|
56 | 56 | $output->writeln(sprintf("%s <info>success</info>", 'cache:clear')); |
57 | 57 | |
58 | 58 | } |
@@ -24,7 +24,6 @@ |
||
24 | 24 | |
25 | 25 | namespace Eccube\Command; |
26 | 26 | |
27 | -use Symfony\Component\Console\Input\InputArgument; |
|
28 | 27 | use Symfony\Component\Console\Input\InputInterface; |
29 | 28 | use Symfony\Component\Console\Input\InputOption; |
30 | 29 | use Symfony\Component\Console\Output\OutputInterface; |
@@ -111,7 +111,7 @@ |
||
111 | 111 | $webProcessor = new WebProcessor(); |
112 | 112 | $uidProcessor = new UidProcessor(8); |
113 | 113 | |
114 | - $FingerCrossedHandler->pushProcessor(function ($record) use ($app, $uidProcessor, $webProcessor) { |
|
114 | + $FingerCrossedHandler->pushProcessor(function($record) use ($app, $uidProcessor, $webProcessor) { |
|
115 | 115 | // ログフォーマットに出力する値を独自に設定 |
116 | 116 | |
117 | 117 | $record['level_name'] = sprintf("%-5s", $record['level_name']); |
@@ -83,7 +83,7 @@ |
||
83 | 83 | return $log; |
84 | 84 | } |
85 | 85 | |
86 | - foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)) as $line) { |
|
86 | + foreach (array_reverse(file($logFile, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES)) as $line) { |
|
87 | 87 | // 上限に達した場合、処理を抜ける |
88 | 88 | if (count($log) >= $formData['line_max']) { |
89 | 89 | break; |
@@ -108,6 +108,9 @@ |
||
108 | 108 | ]; |
109 | 109 | } |
110 | 110 | |
111 | + /** |
|
112 | + * @param string $logFile |
|
113 | + */ |
|
111 | 114 | private function parseLogFile($logFile, $formData) |
112 | 115 | { |
113 | 116 | $log = array(); |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | $key = sprintf('keyword%s', $index); |
114 | 114 | $qb |
115 | 115 | ->andWhere(sprintf('NORMALIZE(p.name) LIKE NORMALIZE(:%s) OR NORMALIZE(p.search_word) LIKE NORMALIZE(:%s)', $key, $key)) |
116 | - ->setParameter($key, '%' . $keyword . '%'); |
|
116 | + ->setParameter($key, '%'.$keyword.'%'); |
|
117 | 117 | } |
118 | 118 | } |
119 | 119 | |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | $qb |
177 | 177 | ->andWhere('p.id = :id OR p.name LIKE :likeid OR pc.code LIKE :likeid') |
178 | 178 | ->setParameter('id', $id) |
179 | - ->setParameter('likeid', '%' . $searchData['id'] . '%'); |
|
179 | + ->setParameter('likeid', '%'.$searchData['id'].'%'); |
|
180 | 180 | } |
181 | 181 | |
182 | 182 | // code |
@@ -25,12 +25,10 @@ |
||
25 | 25 | namespace Eccube\Repository; |
26 | 26 | |
27 | 27 | use Doctrine\ORM\EntityManager; |
28 | -use Doctrine\ORM\NoResultException; |
|
29 | 28 | use Eccube\Annotation\Inject; |
30 | 29 | use Eccube\Annotation\Repository; |
31 | 30 | use Eccube\Doctrine\Query\Queries; |
32 | 31 | use Eccube\Util\Str; |
33 | -use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; |
|
34 | 32 | |
35 | 33 | /** |
36 | 34 | * ProductRepository |
@@ -60,7 +60,7 @@ |
||
60 | 60 | */ |
61 | 61 | protected $appConfig; |
62 | 62 | |
63 | - /** |
|
63 | + /** |
|
64 | 64 | * get query builder. |
65 | 65 | * |
66 | 66 | * @param array $searchData |
@@ -348,7 +348,7 @@ discard block |
||
348 | 348 | * @param array $metadatas |
349 | 349 | * @param array $fsList |
350 | 350 | * @param $pluginCode |
351 | - * @param $codePath |
|
351 | + * @param string $codePath |
|
352 | 352 | */ |
353 | 353 | protected function generateMigration(array $metadatas, array &$fsList = array(), $pluginCode, $codePath) |
354 | 354 | { |
@@ -373,7 +373,7 @@ discard block |
||
373 | 373 | * |
374 | 374 | * @param $pluginCode |
375 | 375 | * @param array $metadatas |
376 | - * @return mixed|string |
|
376 | + * @return string |
|
377 | 377 | */ |
378 | 378 | protected function makeMigration($pluginCode, array $metadatas) |
379 | 379 | { |
@@ -2,15 +2,9 @@ |
||
2 | 2 | |
3 | 3 | namespace Eccube\Application; |
4 | 4 | |
5 | -use Eccube\Event\TemplateEvent; |
|
6 | -use Monolog\Logger; |
|
7 | -use Symfony\Component\Form\FormBuilder; |
|
8 | 5 | use Symfony\Component\HttpFoundation\Request; |
9 | 6 | use Symfony\Component\HttpFoundation\Response; |
10 | -use Symfony\Component\HttpFoundation\StreamedResponse; |
|
11 | 7 | use Symfony\Component\HttpKernel\HttpKernelInterface; |
12 | -use Symfony\Component\Routing\Generator\UrlGeneratorInterface; |
|
13 | -use Symfony\Component\Security\Core\User\UserInterface; |
|
14 | 8 | |
15 | 9 | trait ApplicationTrait |
16 | 10 | { |
@@ -19,32 +19,32 @@ discard block |
||
19 | 19 | */ |
20 | 20 | public function addSuccess($message, $namespace = 'front') |
21 | 21 | { |
22 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.success', $message); |
|
22 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.success', $message); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | public function addError($message, $namespace = 'front') |
26 | 26 | { |
27 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.error', $message); |
|
27 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.error', $message); |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | public function addDanger($message, $namespace = 'front') |
31 | 31 | { |
32 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.danger', $message); |
|
32 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.danger', $message); |
|
33 | 33 | } |
34 | 34 | |
35 | 35 | public function addWarning($message, $namespace = 'front') |
36 | 36 | { |
37 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.warning', $message); |
|
37 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.warning', $message); |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | public function addInfo($message, $namespace = 'front') |
41 | 41 | { |
42 | - $this['session']->getFlashBag()->add('eccube.' . $namespace . '.info', $message); |
|
42 | + $this['session']->getFlashBag()->add('eccube.'.$namespace.'.info', $message); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | public function addRequestError($message, $namespace = 'front') |
46 | 46 | { |
47 | - $this['session']->getFlashBag()->set('eccube.' . $namespace . '.request.error', $message); |
|
47 | + $this['session']->getFlashBag()->set('eccube.'.$namespace.'.request.error', $message); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | public function clearMessage() |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | if (is_null($namespace)) { |
64 | 64 | $this['session']->getFlashBag()->set('eccube.login.target.path', $targetPath); |
65 | 65 | } else { |
66 | - $this['session']->getFlashBag()->set('eccube.' . $namespace . '.login.target.path', $targetPath); |
|
66 | + $this['session']->getFlashBag()->set('eccube.'.$namespace.'.login.target.path', $targetPath); |
|
67 | 67 | } |
68 | 68 | } |
69 | 69 | |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | * @param Response $response |
112 | 112 | * @return Application |
113 | 113 | */ |
114 | - public function forwardChain($path, array $requestParameters = [], Response &$response = null) |
|
114 | + public function forwardChain($path, array $requestParameters = [], Response&$response = null) |
|
115 | 115 | { |
116 | 116 | $response = $this->forward($path, $requestParameters); |
117 | 117 | return $this; |
@@ -16,6 +16,7 @@ discard block |
||
16 | 16 | { |
17 | 17 | /** |
18 | 18 | * Application Shortcut Methods |
19 | + * @param string $message |
|
19 | 20 | */ |
20 | 21 | public function addSuccess($message, $namespace = 'front') |
21 | 22 | { |
@@ -58,6 +59,9 @@ discard block |
||
58 | 59 | $this->addWarning('admin.delete.warning', 'admin'); |
59 | 60 | } |
60 | 61 | |
62 | + /** |
|
63 | + * @param string $targetPath |
|
64 | + */ |
|
61 | 65 | public function setLoginTargetPath($targetPath, $namespace = null) |
62 | 66 | { |
63 | 67 | if (is_null($namespace)) { |
@@ -109,7 +113,7 @@ discard block |
||
109 | 113 | * @param string $path フォワード先のパス |
110 | 114 | * @param array $requestParameters |
111 | 115 | * @param Response $response |
112 | - * @return Application |
|
116 | + * @return ApplicationTrait |
|
113 | 117 | */ |
114 | 118 | public function forwardChain($path, array $requestParameters = [], Response &$response = null) |
115 | 119 | { |
@@ -122,7 +126,7 @@ discard block |
||
122 | 126 | * Pimple標準では再登録を行うと, `RuntimeException: Cannot override frozen service`が投げられるため,一度unsetしてから再登録を行う. |
123 | 127 | * config系の変更程度に利用はとどめること |
124 | 128 | * |
125 | - * @param $key |
|
129 | + * @param string $key |
|
126 | 130 | * @param $service |
127 | 131 | * @throws \InvalidArgumentException keyが存在しない場合. |
128 | 132 | */ |