@@ -153,9 +153,9 @@ discard block |
||
153 | 153 | $qb |
154 | 154 | ->andWhere('c.id = :customer_id OR CONCAT(c.name01, c.name02) LIKE :name OR CONCAT(c.kana01, c.kana02) LIKE :kana OR c.email LIKE :email') |
155 | 155 | ->setParameter('customer_id', $id) |
156 | - ->setParameter('name', '%' . $clean_key_multi . '%') |
|
157 | - ->setParameter('kana', '%' . $clean_key_multi . '%') |
|
158 | - ->setParameter('email', '%' . $clean_key_multi . '%'); |
|
156 | + ->setParameter('name', '%'.$clean_key_multi.'%') |
|
157 | + ->setParameter('kana', '%'.$clean_key_multi.'%') |
|
158 | + ->setParameter('email', '%'.$clean_key_multi.'%'); |
|
159 | 159 | } |
160 | 160 | |
161 | 161 | // Pref |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | if (isset($searchData['tel']) && Str::isNotBlank($searchData['tel'])) { |
206 | 206 | $qb |
207 | 207 | ->andWhere('CONCAT(c.tel01, c.tel02, c.tel03) LIKE :tel') |
208 | - ->setParameter('tel', '%' . $searchData['tel'] . '%'); |
|
208 | + ->setParameter('tel', '%'.$searchData['tel'].'%'); |
|
209 | 209 | } |
210 | 210 | |
211 | 211 | // buy_total |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | ->leftJoin('c.Orders', 'o') |
300 | 300 | ->leftJoin('o.OrderDetails', 'od') |
301 | 301 | ->andWhere('od.product_name LIKE :buy_product_name OR od.product_code LIKE :buy_product_name') |
302 | - ->setParameter('buy_product_name', '%' . $searchData['buy_product_code'] . '%'); |
|
302 | + ->setParameter('buy_product_name', '%'.$searchData['buy_product_code'].'%'); |
|
303 | 303 | } |
304 | 304 | |
305 | 305 | // Order By |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | |
323 | 323 | /** |
324 | 324 | * ユニークなシークレットキーを返す |
325 | - * @param $app |
|
325 | + * @param \Eccube\Application $app |
|
326 | 326 | * @return string |
327 | 327 | */ |
328 | 328 | public function getUniqueSecretKey($app) |
@@ -340,7 +340,7 @@ discard block |
||
340 | 340 | |
341 | 341 | /** |
342 | 342 | * ユニークなパスワードリセットキーを返す |
343 | - * @param $app |
|
343 | + * @param \Eccube\Application $app |
|
344 | 344 | * @return string |
345 | 345 | */ |
346 | 346 | public function getUniqueResetKey($app) |
@@ -359,7 +359,7 @@ discard block |
||
359 | 359 | /** |
360 | 360 | * saltを生成する |
361 | 361 | * |
362 | - * @param $byte |
|
362 | + * @param integer $byte |
|
363 | 363 | * @return string |
364 | 364 | */ |
365 | 365 | public function createSalt($byte) |
@@ -370,7 +370,7 @@ discard block |
||
370 | 370 | /** |
371 | 371 | * 入力されたパスワードをSaltと暗号化する |
372 | 372 | * |
373 | - * @param $app |
|
373 | + * @param \Eccube\Application $app |
|
374 | 374 | * @param Customer $Customer |
375 | 375 | * @return mixed |
376 | 376 | */ |
@@ -430,7 +430,7 @@ discard block |
||
430 | 430 | /** |
431 | 431 | * 会員の初回購入時間、購入時間、購入回数、購入金額を更新する |
432 | 432 | * |
433 | - * @param $app |
|
433 | + * @param \Eccube\Application $app |
|
434 | 434 | * @param Customer $Customer |
435 | 435 | * @param $orderStatusId |
436 | 436 | */ |
@@ -27,7 +27,6 @@ |
||
27 | 27 | use Doctrine\ORM\EntityManager; |
28 | 28 | use Eccube\Annotation\Inject; |
29 | 29 | use Eccube\Annotation\Repository; |
30 | -use Eccube\Common\Constant; |
|
31 | 30 | use Eccube\Doctrine\Query\Queries; |
32 | 31 | use Eccube\Entity\Customer; |
33 | 32 | use Eccube\Entity\Master\CustomerStatus; |
@@ -164,7 +164,7 @@ |
||
164 | 164 | $cmf->setEntityManager($em); |
165 | 165 | $metadatas = $cmf->getAllMetadata(); |
166 | 166 | |
167 | - $filters = array_map(function ($value) { |
|
167 | + $filters = array_map(function($value) { |
|
168 | 168 | return ucfirst(Inflector::camelize(str_replace('plg_', '', $value))); |
169 | 169 | }, $tableList); |
170 | 170 | $metadatas = MetadataFilter::filter($metadatas, $filters); |
@@ -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() |
@@ -543,13 +543,13 @@ |
||
543 | 543 | $pluginConfigs = PluginConfigManager::getPluginConfigAll($this['debug']); |
544 | 544 | $ormMappings = array(); |
545 | 545 | $ormMappings[] = array( |
546 | - 'type' => 'annotation', |
|
547 | - 'namespace' => 'Eccube\Entity', |
|
548 | - 'path' => array( |
|
549 | - __DIR__.'/Entity' |
|
550 | - ), |
|
551 | - 'use_simple_annotation_reader' => false, |
|
552 | - ); |
|
546 | + 'type' => 'annotation', |
|
547 | + 'namespace' => 'Eccube\Entity', |
|
548 | + 'path' => array( |
|
549 | + __DIR__.'/Entity' |
|
550 | + ), |
|
551 | + 'use_simple_annotation_reader' => false, |
|
552 | + ); |
|
553 | 553 | |
554 | 554 | // TODO namespace は暫定 |
555 | 555 | $ormMappings[] = array( |
@@ -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 | } |
@@ -279,14 +279,14 @@ discard block |
||
279 | 279 | return $router; |
280 | 280 | }); |
281 | 281 | |
282 | - $this['eccube.router.origin'] = function ($app) { |
|
282 | + $this['eccube.router.origin'] = function($app) { |
|
283 | 283 | $resource = __DIR__.'/Controller'; |
284 | 284 | $cachePrefix = 'Origin'; |
285 | 285 | |
286 | 286 | return $app['eccube.router']($resource, $cachePrefix); |
287 | 287 | }; |
288 | 288 | |
289 | - $this['eccube.routers.plugin'] = function ($app) { |
|
289 | + $this['eccube.routers.plugin'] = function($app) { |
|
290 | 290 | // TODO 有効なプラグインを対象とする必要がある. |
291 | 291 | $dirs = Finder::create() |
292 | 292 | ->in($app['config']['root_dir'].'/app/Plugin') |
@@ -303,7 +303,7 @@ discard block |
||
303 | 303 | return $routers; |
304 | 304 | }; |
305 | 305 | |
306 | - $this['eccube.router.extend'] = function ($app) { |
|
306 | + $this['eccube.router.extend'] = function($app) { |
|
307 | 307 | // TODO ディレクトリ名は暫定 |
308 | 308 | $resource = $app['config']['root_dir'].'/app/Acme/Controller'; |
309 | 309 | $cachePrefix = 'Extend'; |
@@ -313,7 +313,7 @@ discard block |
||
313 | 313 | return $router; |
314 | 314 | }; |
315 | 315 | |
316 | - $this->extend('request_matcher', function ($matcher, $app) { |
|
316 | + $this->extend('request_matcher', function($matcher, $app) { |
|
317 | 317 | $matchers = []; |
318 | 318 | $matchers[] = $app['eccube.router.extend']; |
319 | 319 | foreach ($app['eccube.routers.plugin'] as $router) { |
@@ -325,7 +325,7 @@ discard block |
||
325 | 325 | return new ChainUrlMatcher($matchers, $app['request_context']); |
326 | 326 | }); |
327 | 327 | |
328 | - $this->extend('url_generator', function ($generator, $app) { |
|
328 | + $this->extend('url_generator', function($generator, $app) { |
|
329 | 329 | $generators = []; |
330 | 330 | $generators[] = $app['eccube.router.extend']; |
331 | 331 | foreach ($app['eccube.routers.plugin'] as $router) { |
@@ -338,7 +338,7 @@ discard block |
||
338 | 338 | }); |
339 | 339 | |
340 | 340 | // Route CollectionにEC-CUBEで定義したルーティングを追加(debug tool barに出力するため) |
341 | - $this->extend('routes', function ($routes, $app) { |
|
341 | + $this->extend('routes', function($routes, $app) { |
|
342 | 342 | $routes->addCollection($app['eccube.router.extend']->getRouteCollection()); |
343 | 343 | foreach ($app['eccube.routers.plugin'] as $router) { |
344 | 344 | $routes->addCollection($router->getRouteCollection()); |
@@ -371,7 +371,7 @@ discard block |
||
371 | 371 | 'translator.cache_dir' => $this['debug'] ? null : $this['config']['root_dir'].'/app/cache/translator', |
372 | 372 | 'locale_fallbacks' => ['ja', 'en'], |
373 | 373 | )); |
374 | - $this->extend('translator', function ($translator, \Silex\Application $app) { |
|
374 | + $this->extend('translator', function($translator, \Silex\Application $app) { |
|
375 | 375 | $translator->addLoader('php', new \Symfony\Component\Translation\Loader\PhpFileLoader()); |
376 | 376 | |
377 | 377 | $file = __DIR__.'/Resource/locale/messages.'.$app['locale'].'.php'; |
@@ -414,14 +414,14 @@ discard block |
||
414 | 414 | $this->register(new \Silex\Provider\TwigServiceProvider(), array( |
415 | 415 | 'twig.form.templates' => array('Form/form_layout.twig'), |
416 | 416 | )); |
417 | - $this->extend('twig', function (\Twig_Environment $twig, \Silex\Application $app) { |
|
417 | + $this->extend('twig', function(\Twig_Environment $twig, \Silex\Application $app) { |
|
418 | 418 | $twig->addExtension(new \Eccube\Twig\Extension\EccubeExtension($app)); |
419 | 419 | $twig->addExtension(new \Twig_Extension_StringLoader()); |
420 | 420 | |
421 | 421 | return $twig; |
422 | 422 | }); |
423 | 423 | |
424 | - $this->before(function (Request $request, \Silex\Application $app) { |
|
424 | + $this->before(function(Request $request, \Silex\Application $app) { |
|
425 | 425 | $app['admin'] = $app['front'] = false; |
426 | 426 | $pathinfo = rawurldecode($request->getPathInfo()); |
427 | 427 | if (strpos($pathinfo, '/'.trim($app['config']['admin_route'], '/').'/') === 0) { |
@@ -437,7 +437,7 @@ discard block |
||
437 | 437 | } |
438 | 438 | $paths[] = $app['config']['template_admin_realdir']; |
439 | 439 | $paths[] = __DIR__.'/../../app/Plugin'; |
440 | - $cacheDir = __DIR__.'/../../app/cache/twig/admin'; |
|
440 | + $cacheDir = __DIR__.'/../../app/cache/twig/admin'; |
|
441 | 441 | } else { |
442 | 442 | // モバイル端末時、smartphoneディレクトリを探索パスに追加する. |
443 | 443 | if ($app['mobile_detect.device_type'] == \Eccube\Entity\Master\DeviceType::DEVICE_TYPE_SP) { |
@@ -452,7 +452,7 @@ discard block |
||
452 | 452 | } |
453 | 453 | $paths[] = $app['config']['template_default_realdir']; |
454 | 454 | $paths[] = __DIR__.'/../../app/Plugin'; |
455 | - $cacheDir = __DIR__.'/../../app/cache/twig/'.$app['config']['template_code']; |
|
455 | + $cacheDir = __DIR__.'/../../app/cache/twig/'.$app['config']['template_code']; |
|
456 | 456 | } |
457 | 457 | $app['twig']->setCache($app['debug'] ? null : $cacheDir); |
458 | 458 | $app['twig.loader']->addLoader(new \Twig_Loader_Filesystem($paths)); |
@@ -470,7 +470,7 @@ discard block |
||
470 | 470 | }, self::EARLY_EVENT); |
471 | 471 | |
472 | 472 | // twigのグローバル変数を定義. |
473 | - $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function (\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) { |
|
473 | + $this->on(\Symfony\Component\HttpKernel\KernelEvents::CONTROLLER, function(\Symfony\Component\HttpKernel\Event\FilterControllerEvent $event) { |
|
474 | 474 | // 未ログイン時にマイページや管理画面以下にアクセスするとSubRequestで実行されるため, |
475 | 475 | // $event->isMasterRequest()ではなく、グローバル変数が初期化済かどうかの判定を行う |
476 | 476 | if (isset($this['twig_global_initialized']) && $this['twig_global_initialized'] === true) { |
@@ -555,7 +555,7 @@ discard block |
||
555 | 555 | // メール送信時の文字エンコード指定(デフォルトはUTF-8) |
556 | 556 | if (isset($this['config']['mail']['charset_iso_2022_jp']) && is_bool($this['config']['mail']['charset_iso_2022_jp'])) { |
557 | 557 | if ($this['config']['mail']['charset_iso_2022_jp'] === true) { |
558 | - \Swift::init(function () { |
|
558 | + \Swift::init(function() { |
|
559 | 559 | \Swift_DependencyContainer::getInstance() |
560 | 560 | ->register('mime.qpheaderencoder') |
561 | 561 | ->asAliasOf('mime.base64headerencoder'); |
@@ -590,7 +590,7 @@ discard block |
||
590 | 590 | $this->register(new \Saxulum\DoctrineOrmManagerRegistry\Provider\DoctrineOrmManagerRegistryProvider()); |
591 | 591 | |
592 | 592 | $app = $this; |
593 | - $this->extend('db.event_manager', function ($evm) use ($app) { |
|
593 | + $this->extend('db.event_manager', function($evm) use ($app) { |
|
594 | 594 | $initSubscriber = new InitSubscriber($app); |
595 | 595 | $evm->addEventSubscriber($initSubscriber); |
596 | 596 | |
@@ -685,7 +685,7 @@ discard block |
||
685 | 685 | |
686 | 686 | $this->extend( |
687 | 687 | 'orm.em.config', |
688 | - function (\Doctrine\ORM\Configuration $config, \Silex\Application $app) { |
|
688 | + function(\Doctrine\ORM\Configuration $config, \Silex\Application $app) { |
|
689 | 689 | |
690 | 690 | /** @var $chain \Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain */ |
691 | 691 | $chain = $config->getMetadataDriverImpl(); |
@@ -707,7 +707,7 @@ discard block |
||
707 | 707 | } |
708 | 708 | ); |
709 | 709 | |
710 | - $this->extend('orm.em', function (\Doctrine\ORM\EntityManager $em, \Silex\Application $app) { |
|
710 | + $this->extend('orm.em', function(\Doctrine\ORM\EntityManager $em, \Silex\Application $app) { |
|
711 | 711 | // save |
712 | 712 | $saveEventSubscriber = new \Eccube\Doctrine\EventSubscriber\SaveEventSubscriber($app); |
713 | 713 | $em->getEventManager()->addEventSubscriber($saveEventSubscriber); |
@@ -730,7 +730,7 @@ discard block |
||
730 | 730 | // second level cacheの設定. |
731 | 731 | $this->extend( |
732 | 732 | 'orm.em.config', |
733 | - function (\Doctrine\ORM\Configuration $config, \Silex\Application $app) { |
|
733 | + function(\Doctrine\ORM\Configuration $config, \Silex\Application $app) { |
|
734 | 734 | $config->setSecondLevelCacheEnabled(); |
735 | 735 | $cacheConfig = $config->getSecondLevelCacheConfiguration(); |
736 | 736 | $regionConfig = $cacheConfig->getRegionsConfiguration(); |
@@ -819,31 +819,31 @@ discard block |
||
819 | 819 | array('^/mypage', 'ROLE_USER', $channel), |
820 | 820 | ); |
821 | 821 | |
822 | - $this['eccube.password_encoder'] = function ($app) { |
|
822 | + $this['eccube.password_encoder'] = function($app) { |
|
823 | 823 | return new \Eccube\Security\Core\Encoder\PasswordEncoder($app['config']); |
824 | 824 | }; |
825 | - $this['security.encoder_factory'] = function ($app) { |
|
825 | + $this['security.encoder_factory'] = function($app) { |
|
826 | 826 | return new \Symfony\Component\Security\Core\Encoder\EncoderFactory(array( |
827 | 827 | 'Eccube\Entity\Customer' => $app['eccube.password_encoder'], |
828 | 828 | 'Eccube\Entity\Member' => $app['eccube.password_encoder'], |
829 | 829 | )); |
830 | 830 | }; |
831 | - $this['eccube.event_listner.security'] = function ($app) { |
|
831 | + $this['eccube.event_listner.security'] = function($app) { |
|
832 | 832 | return new \Eccube\EventListener\SecurityEventListener($app['orm.em']); |
833 | 833 | }; |
834 | 834 | |
835 | 835 | // Voterの設定 |
836 | - $this['authority_voter'] = function ($app) { |
|
836 | + $this['authority_voter'] = function($app) { |
|
837 | 837 | return new \Eccube\Security\Voter\AuthorityVoter($app); |
838 | 838 | }; |
839 | 839 | |
840 | - $this->extend('security.voters', function ($voters, \Silex\Application $app) { |
|
840 | + $this->extend('security.voters', function($voters, \Silex\Application $app) { |
|
841 | 841 | $voters[] = $app['authority_voter']; |
842 | 842 | |
843 | 843 | return $voters; |
844 | 844 | }); |
845 | 845 | |
846 | - $this['security.access_manager'] = function ($app) { |
|
846 | + $this['security.access_manager'] = function($app) { |
|
847 | 847 | return new \Symfony\Component\Security\Core\Authorization\AccessDecisionManager($app['security.voters'], 'unanimous'); |
848 | 848 | }; |
849 | 849 | |
@@ -857,7 +857,7 @@ discard block |
||
857 | 857 | { |
858 | 858 | $config = $this['config']; |
859 | 859 | if (isset($config['trusted_proxies_connection_only']) && !empty($config['trusted_proxies_connection_only'])) { |
860 | - $this->on(KernelEvents::REQUEST, function (GetResponseEvent $event) use ($config) { |
|
860 | + $this->on(KernelEvents::REQUEST, function(GetResponseEvent $event) use ($config) { |
|
861 | 861 | // サブリクエストのREMOTE_ADDRも動的に設定を行う必要があるため、KernelEvents::REQUESTを使用する |
862 | 862 | Request::setTrustedProxies(array_merge(array($event->getRequest()->server->get('REMOTE_ADDR')), $config['trusted_proxies'])); |
863 | 863 | }, self::EARLY_EVENT); |
@@ -874,7 +874,7 @@ discard block |
||
874 | 874 | $this->register(new ServiceProvider\EccubePluginServiceProvider()); |
875 | 875 | |
876 | 876 | // TODO Acme\ServiceProvider の初期化はここで OK? |
877 | - if (array_key_exists('service',$this['config'])) { |
|
877 | + if (array_key_exists('service', $this['config'])) { |
|
878 | 878 | foreach ($this['config']['service'] as $service) { |
879 | 879 | $this->register(new $service); |
880 | 880 | } |
@@ -1030,7 +1030,7 @@ discard block |
||
1030 | 1030 | $app = $this; |
1031 | 1031 | |
1032 | 1032 | // Response Event(http cache対応、event実行は一番遅く設定) |
1033 | - $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function (\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) { |
|
1033 | + $this->on(\Symfony\Component\HttpKernel\KernelEvents::RESPONSE, function(\Symfony\Component\HttpKernel\Event\FilterResponseEvent $event) use ($app) { |
|
1034 | 1034 | |
1035 | 1035 | if (!$event->isMasterRequest()) { |
1036 | 1036 | 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 |