@@ -87,7 +87,7 @@ |
||
87 | 87 | 'label' => '手数料', |
88 | 88 | )) |
89 | 89 | ->add('fixed', HiddenType::class) |
90 | - ->addEventListener(FormEvents::POST_SUBMIT, function ($event) { |
|
90 | + ->addEventListener(FormEvents::POST_SUBMIT, function($event) { |
|
91 | 91 | $form = $event->getForm(); |
92 | 92 | $ruleMax = $form['rule_max']->getData(); |
93 | 93 | $ruleMin = $form['rule_min']->getData(); |
@@ -171,7 +171,7 @@ discard block |
||
171 | 171 | // ファイル生成・更新 |
172 | 172 | $tplDir = $this->appConfig['block_realdir']; |
173 | 173 | |
174 | - $filePath = $tplDir . '/' . $Block->getFileName() . '.twig'; |
|
174 | + $filePath = $tplDir.'/'.$Block->getFileName().'.twig'; |
|
175 | 175 | |
176 | 176 | $fs = new Filesystem(); |
177 | 177 | $blockData = $form->get('block_html')->getData(); |
@@ -179,7 +179,7 @@ discard block |
||
179 | 179 | $fs->dumpFile($filePath, $blockData); |
180 | 180 | // 更新でファイル名を変更した場合、以前のファイルを削除 |
181 | 181 | if ($Block->getFileName() != $previous_filename && !is_null($previous_filename)) { |
182 | - $oldFilePath = $tplDir . '/' . $previous_filename . '.twig'; |
|
182 | + $oldFilePath = $tplDir.'/'.$previous_filename.'.twig'; |
|
183 | 183 | if ($fs->exists($oldFilePath)) { |
184 | 184 | $fs->remove($oldFilePath); |
185 | 185 | } |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | // テンプレートが変更されていた場合、DBからはブロック削除されるがtwigファイルは残る |
237 | 237 | if ($Block->isDeletable()) { |
238 | 238 | $tplDir = $this->appConfig['block_realdir']; |
239 | - $file = $tplDir . '/' . $Block->getFileName() . '.twig'; |
|
239 | + $file = $tplDir.'/'.$Block->getFileName().'.twig'; |
|
240 | 240 | $fs = new Filesystem(); |
241 | 241 | if ($fs->exists($file)) { |
242 | 242 | $fs->remove($file); |
@@ -58,9 +58,9 @@ |
||
58 | 58 | |
59 | 59 | // 同じパッケージのEntityがあれば返す |
60 | 60 | if (count($partsOfFqcn) > 2) { |
61 | - $parentNamespace = implode('\\', array_slice($partsOfFqcn, 0, count($partsOfFqcn)-2)); |
|
62 | - $entityName = preg_replace('/(.*)Repository/', '$1', $partsOfFqcn[count($partsOfFqcn) -1]); |
|
63 | - $result = $parentNamespace . '\\Entity\\' . $entityName; |
|
61 | + $parentNamespace = implode('\\', array_slice($partsOfFqcn, 0, count($partsOfFqcn) - 2)); |
|
62 | + $entityName = preg_replace('/(.*)Repository/', '$1', $partsOfFqcn[count($partsOfFqcn) - 1]); |
|
63 | + $result = $parentNamespace.'\\Entity\\'.$entityName; |
|
64 | 64 | if (class_exists($result)) { |
65 | 65 | return $result; |
66 | 66 | } |
@@ -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; |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output)); |
40 | 40 | $installedLogs = array_filter( |
41 | 41 | array_map( |
42 | - function ($line) { |
|
42 | + function($line) { |
|
43 | 43 | $matches = array(); |
44 | 44 | preg_match('/^ - Installing (.*?) \((.*?)\) .*/', $line, $matches); |
45 | 45 | |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | public static function parseInfo($output) |
63 | 63 | { |
64 | 64 | $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output)); |
65 | - $infoLogs = array_filter(array_map(function ($line) { |
|
65 | + $infoLogs = array_filter(array_map(function($line) { |
|
66 | 66 | $matches = array(); |
67 | 67 | preg_match('/^(name|descrip.|keywords|versions|type|license|source|dist|names)\s*:\s*(.*)$/', $line, $matches); |
68 | 68 | |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | public static function parseConfig($output) |
87 | 87 | { |
88 | 88 | $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output)); |
89 | - $rowArray = array_filter($rowArray, function ($line) { |
|
89 | + $rowArray = array_filter($rowArray, function($line) { |
|
90 | 90 | return !preg_match('/^<warning>.*/', $line); |
91 | 91 | }); |
92 | 92 | |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | public static function parseList($output) |
103 | 103 | { |
104 | 104 | $rowArray = explode(PHP_EOL, str_replace('\r\n', PHP_EOL, $output)); |
105 | - $rawConfig = array_map(function ($line) { |
|
105 | + $rawConfig = array_map(function($line) { |
|
106 | 106 | $matches = array(); |
107 | 107 | preg_match('/^\[(.*?)\]\s?(.*)$/', $line, $matches); |
108 | 108 |
@@ -11,163 +11,163 @@ |
||
11 | 11 | public function register(Container $app) |
12 | 12 | { |
13 | 13 | // Repository |
14 | - $app['eccube.repository.master.authority'] = function () use ($app) { |
|
14 | + $app['eccube.repository.master.authority'] = function() use ($app) { |
|
15 | 15 | return $app['Eccube\Repository\Master\AuthorityRepository']; |
16 | 16 | }; |
17 | - $app['eccube.repository.master.tag'] = function () use ($app) { |
|
17 | + $app['eccube.repository.master.tag'] = function() use ($app) { |
|
18 | 18 | return $app['Eccube\Repository\Master\TagRepository']; |
19 | 19 | }; |
20 | - $app['eccube.repository.master.pref'] = function () use ($app) { |
|
20 | + $app['eccube.repository.master.pref'] = function() use ($app) { |
|
21 | 21 | return $app['Eccube\Repository\Master\PrefRepository']; |
22 | 22 | }; |
23 | - $app['eccube.repository.master.sex'] = function () use ($app) { |
|
23 | + $app['eccube.repository.master.sex'] = function() use ($app) { |
|
24 | 24 | return $app['Eccube\Repository\Master\SexRepository']; |
25 | 25 | }; |
26 | - $app['eccube.repository.master.product_status'] = function () use ($app) { |
|
26 | + $app['eccube.repository.master.product_status'] = function() use ($app) { |
|
27 | 27 | return $app['Eccube\Repository\Master\ProductStatusRepository']; |
28 | 28 | }; |
29 | - $app['eccube.repository.master.sale_type'] = function () use ($app) { |
|
29 | + $app['eccube.repository.master.sale_type'] = function() use ($app) { |
|
30 | 30 | return $app['Eccube\Repository\Master\SaleTypeRepository']; |
31 | 31 | }; |
32 | - $app['eccube.repository.master.page_max'] = function () use ($app) { |
|
32 | + $app['eccube.repository.master.page_max'] = function() use ($app) { |
|
33 | 33 | return $app['Eccube\Repository\Master\PageMaxRepository']; |
34 | 34 | }; |
35 | - $app['eccube.repository.master.order_status'] = function () use ($app) { |
|
35 | + $app['eccube.repository.master.order_status'] = function() use ($app) { |
|
36 | 36 | return $app['Eccube\Repository\Master\OrderStatusRepository']; |
37 | 37 | }; |
38 | - $app['eccube.repository.master.product_list_max'] = function () use ($app) { |
|
38 | + $app['eccube.repository.master.product_list_max'] = function() use ($app) { |
|
39 | 39 | return $app['Eccube\Repository\Master\ProductListMaxRepository']; |
40 | 40 | }; |
41 | - $app['eccube.repository.master.product_list_order_by'] = function () use ($app) { |
|
41 | + $app['eccube.repository.master.product_list_order_by'] = function() use ($app) { |
|
42 | 42 | return $app['Eccube\Repository\Master\ProductListOrderByRepository']; |
43 | 43 | }; |
44 | - $app['eccube.repository.master.device_type'] = function () use ($app) { |
|
44 | + $app['eccube.repository.master.device_type'] = function() use ($app) { |
|
45 | 45 | return $app['Eccube\Repository\Master\DeviceTypeRepository']; |
46 | 46 | }; |
47 | - $app['eccube.repository.master.csv_type'] = function () use ($app) { |
|
47 | + $app['eccube.repository.master.csv_type'] = function() use ($app) { |
|
48 | 48 | return $app['Eccube\Repository\Master\CsvTypeRepository']; |
49 | 49 | }; |
50 | - $app['eccube.repository.master.order_item_type'] = function () use ($app) { |
|
50 | + $app['eccube.repository.master.order_item_type'] = function() use ($app) { |
|
51 | 51 | return $app['Eccube\Repository\Master\OrderItemTypeRepository']; |
52 | 52 | }; |
53 | - $app['eccube.repository.base_info'] = function () use ($app) { |
|
53 | + $app['eccube.repository.base_info'] = function() use ($app) { |
|
54 | 54 | return $app['Eccube\Repository\BaseInfoRepository']; |
55 | 55 | }; |
56 | - $app['eccube.repository.delivery'] = function () use ($app) { |
|
56 | + $app['eccube.repository.delivery'] = function() use ($app) { |
|
57 | 57 | return $app['Eccube\Repository\DeliveryRepository']; |
58 | 58 | }; |
59 | - $app['eccube.repository.delivery_date'] = function () use ($app) { |
|
59 | + $app['eccube.repository.delivery_date'] = function() use ($app) { |
|
60 | 60 | return $app['Eccube\Repository\DeliveryDateRepository']; |
61 | 61 | }; |
62 | - $app['eccube.repository.delivery_fee'] = function () use ($app) { |
|
62 | + $app['eccube.repository.delivery_fee'] = function() use ($app) { |
|
63 | 63 | return $app['Eccube\Repository\DeliveryFeeRepository']; |
64 | 64 | }; |
65 | - $app['eccube.repository.delivery_time'] = function () use ($app) { |
|
65 | + $app['eccube.repository.delivery_time'] = function() use ($app) { |
|
66 | 66 | return $app['Eccube\Repository\DeliveryTimeRepository']; |
67 | 67 | }; |
68 | - $app['eccube.repository.payment'] = function () use ($app) { |
|
68 | + $app['eccube.repository.payment'] = function() use ($app) { |
|
69 | 69 | return $app['Eccube\Repository\PaymentRepository']; |
70 | 70 | }; |
71 | - $app['eccube.repository.payment_option'] = function () use ($app) { |
|
71 | + $app['eccube.repository.payment_option'] = function() use ($app) { |
|
72 | 72 | return $app['Eccube\Repository\PaymentOptionRepository']; |
73 | 73 | }; |
74 | - $app['eccube.repository.customer'] = function () use ($app) { |
|
74 | + $app['eccube.repository.customer'] = function() use ($app) { |
|
75 | 75 | return $app['Eccube\Repository\CustomerRepository']; |
76 | 76 | }; |
77 | - $app['eccube.repository.news'] = function () use ($app) { |
|
77 | + $app['eccube.repository.news'] = function() use ($app) { |
|
78 | 78 | return $app['Eccube\Repository\NewsRepository']; |
79 | 79 | }; |
80 | - $app['eccube.repository.mail_history'] = function () use ($app) { |
|
80 | + $app['eccube.repository.mail_history'] = function() use ($app) { |
|
81 | 81 | return $app['Eccube\Repository\MailHistoryRepository']; |
82 | 82 | }; |
83 | - $app['eccube.repository.member'] = function () use ($app) { |
|
83 | + $app['eccube.repository.member'] = function() use ($app) { |
|
84 | 84 | return $app['Eccube\Repository\MemberRepository']; |
85 | 85 | }; |
86 | - $app['eccube.repository.order'] = function () use ($app) { |
|
86 | + $app['eccube.repository.order'] = function() use ($app) { |
|
87 | 87 | return $app['Eccube\Repository\OrderRepository']; |
88 | 88 | }; |
89 | - $app['eccube.repository.product'] = function () use ($app) { |
|
89 | + $app['eccube.repository.product'] = function() use ($app) { |
|
90 | 90 | return $app['Eccube\Repository\ProductRepository']; |
91 | 91 | }; |
92 | - $app['eccube.repository.product_image'] = function () use ($app) { |
|
92 | + $app['eccube.repository.product_image'] = function() use ($app) { |
|
93 | 93 | return $app['Eccube\Repository\ProductImageRepository']; |
94 | 94 | }; |
95 | - $app['eccube.repository.product_class'] = function () use ($app) { |
|
95 | + $app['eccube.repository.product_class'] = function() use ($app) { |
|
96 | 96 | return $app['Eccube\Repository\ProductClassRepository']; |
97 | 97 | }; |
98 | - $app['eccube.repository.product_stock'] = function () use ($app) { |
|
98 | + $app['eccube.repository.product_stock'] = function() use ($app) { |
|
99 | 99 | return $app['Eccube\Repository\ProductStockRepository']; |
100 | 100 | }; |
101 | - $app['eccube.repository.product_tag'] = function () use ($app) { |
|
101 | + $app['eccube.repository.product_tag'] = function() use ($app) { |
|
102 | 102 | return $app['Eccube\Repository\ProductTagRepository']; |
103 | 103 | }; |
104 | - $app['eccube.repository.class_name'] = function () use ($app) { |
|
104 | + $app['eccube.repository.class_name'] = function() use ($app) { |
|
105 | 105 | return $app['Eccube\Repository\ClassNameRepository']; |
106 | 106 | }; |
107 | - $app['eccube.repository.class_category'] = function () use ($app) { |
|
107 | + $app['eccube.repository.class_category'] = function() use ($app) { |
|
108 | 108 | return $app['Eccube\Repository\ClassCategoryRepository']; |
109 | 109 | }; |
110 | - $app['eccube.repository.customer_favorite_product'] = function () use ($app) { |
|
110 | + $app['eccube.repository.customer_favorite_product'] = function() use ($app) { |
|
111 | 111 | return $app['Eccube\Repository\CustomerFavoriteProductRepository']; |
112 | 112 | }; |
113 | - $app['eccube.repository.tax_rule'] = function () use ($app) { |
|
113 | + $app['eccube.repository.tax_rule'] = function() use ($app) { |
|
114 | 114 | return $app['Eccube\Repository\TaxRuleRepository']; |
115 | 115 | }; |
116 | - $app['eccube.repository.page'] = function () use ($app) { |
|
116 | + $app['eccube.repository.page'] = function() use ($app) { |
|
117 | 117 | return $app['Eccube\Repository\PageRepository']; |
118 | 118 | }; |
119 | - $app['eccube.repository.block'] = function () use ($app) { |
|
119 | + $app['eccube.repository.block'] = function() use ($app) { |
|
120 | 120 | return $app['Eccube\Repository\BlockRepository']; |
121 | 121 | }; |
122 | - $app['eccube.repository.order'] = function () use ($app) { |
|
122 | + $app['eccube.repository.order'] = function() use ($app) { |
|
123 | 123 | return $app['Eccube\Repository\OrderRepository']; |
124 | 124 | }; |
125 | - $app['eccube.repository.customer_address'] = function () use ($app) { |
|
125 | + $app['eccube.repository.customer_address'] = function() use ($app) { |
|
126 | 126 | return $app['Eccube\Repository\CustomerAddressRepository']; |
127 | 127 | }; |
128 | - $app['eccube.repository.shipping'] = function () use ($app) { |
|
128 | + $app['eccube.repository.shipping'] = function() use ($app) { |
|
129 | 129 | return $app['Eccube\Repository\ShippingRepository']; |
130 | 130 | }; |
131 | - $app['eccube.repository.order_item'] = function () use ($app) { |
|
131 | + $app['eccube.repository.order_item'] = function() use ($app) { |
|
132 | 132 | return $app['Eccube\Repository\OrderItemRepository']; |
133 | 133 | }; |
134 | - $app['eccube.repository.master.customer_status'] = function () use ($app) { |
|
134 | + $app['eccube.repository.master.customer_status'] = function() use ($app) { |
|
135 | 135 | return $app['Eccube\Repository\Master\CustomerStatusRepository']; |
136 | 136 | }; |
137 | 137 | |
138 | - $app['eccube.repository.mail_template'] = function () use ($app) { |
|
138 | + $app['eccube.repository.mail_template'] = function() use ($app) { |
|
139 | 139 | return $app['Eccube\Repository\MailTemplateRepository']; |
140 | 140 | }; |
141 | - $app['eccube.repository.csv'] = function () use ($app) { |
|
141 | + $app['eccube.repository.csv'] = function() use ($app) { |
|
142 | 142 | return $app['Eccube\Repository\CsvRepository']; |
143 | 143 | }; |
144 | - $app['eccube.repository.template'] = function () use ($app) { |
|
144 | + $app['eccube.repository.template'] = function() use ($app) { |
|
145 | 145 | return $app['Eccube\Repository\TemplateRepository']; |
146 | 146 | }; |
147 | - $app['eccube.repository.authority_role'] = function () use ($app) { |
|
147 | + $app['eccube.repository.authority_role'] = function() use ($app) { |
|
148 | 148 | return $app['Eccube\Repository\AuthorityRoleRepository']; |
149 | 149 | }; |
150 | - $app['eccube.repository.category'] = function () use ($app) { |
|
150 | + $app['eccube.repository.category'] = function() use ($app) { |
|
151 | 151 | return $app['Eccube\Repository\CategoryRepository']; |
152 | 152 | }; |
153 | - $app['eccube.repository.help'] = function () use ($app) { |
|
153 | + $app['eccube.repository.help'] = function() use ($app) { |
|
154 | 154 | return $app['Eccube\Repository\HelpRepository']; |
155 | 155 | }; |
156 | - $app['eccube.repository.plugin'] = function () use ($app) { |
|
156 | + $app['eccube.repository.plugin'] = function() use ($app) { |
|
157 | 157 | return $app['Eccube\Repository\PluginRepository']; |
158 | 158 | }; |
159 | - $app['eccube.repository.plugin_event_handler'] = function () use ($app) { |
|
159 | + $app['eccube.repository.plugin_event_handler'] = function() use ($app) { |
|
160 | 160 | return $app['Eccube\Repository\PluginEventHandlerRepository']; |
161 | 161 | }; |
162 | - $app['eccube.repository.layout'] = function () use ($app) { |
|
162 | + $app['eccube.repository.layout'] = function() use ($app) { |
|
163 | 163 | return $app['Eccube\Repository\LayoutRepository']; |
164 | 164 | }; |
165 | 165 | |
166 | 166 | // alias |
167 | - $app['eccube.repository.order_status'] = function () use ($app) { |
|
167 | + $app['eccube.repository.order_status'] = function() use ($app) { |
|
168 | 168 | return $app['Eccube\Repository\Master\OrderStatusRepository']; |
169 | 169 | }; |
170 | - $app['eccube.repository.customer_status'] = function () use ($app) { |
|
170 | + $app['eccube.repository.customer_status'] = function() use ($app) { |
|
171 | 171 | return $app['Eccube\Repository\Master\CustomerStatusRepository']; |
172 | 172 | }; |
173 | 173 | } |
@@ -52,7 +52,7 @@ |
||
52 | 52 | |
53 | 53 | $this->app = $this->getSilexApplication(); |
54 | 54 | |
55 | - \Eccube\Util\CacheUtil::clear($this->app,$input->getOption('all')); |
|
55 | + \Eccube\Util\CacheUtil::clear($this->app, $input->getOption('all')); |
|
56 | 56 | $output->writeln(sprintf("%s <info>success</info>", 'cache:clear')); |
57 | 57 | |
58 | 58 | } |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | } |
73 | 73 | |
74 | 74 | foreach ($this->paths as $path) { |
75 | - if ( ! is_dir($path)) { |
|
75 | + if (!is_dir($path)) { |
|
76 | 76 | throw MappingException::fileMappingDriversRequireConfiguredDirectoryPath($path); |
77 | 77 | } |
78 | 78 | |
@@ -81,14 +81,14 @@ discard block |
||
81 | 81 | new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS), |
82 | 82 | \RecursiveIteratorIterator::LEAVES_ONLY |
83 | 83 | ), |
84 | - '/^.+' . preg_quote($this->fileExtension) . '$/i', |
|
84 | + '/^.+'.preg_quote($this->fileExtension).'$/i', |
|
85 | 85 | \RecursiveRegexIterator::GET_MATCH |
86 | 86 | ); |
87 | 87 | |
88 | 88 | foreach ($iterator as $file) { |
89 | 89 | $sourceFile = $file[0]; |
90 | 90 | |
91 | - if ( ! preg_match('(^phar:)i', $sourceFile)) { |
|
91 | + if (!preg_match('(^phar:)i', $sourceFile)) { |
|
92 | 92 | $sourceFile = realpath($sourceFile); |
93 | 93 | } |
94 | 94 | |
@@ -133,15 +133,15 @@ discard block |
||
133 | 133 | $namespaceEndIndex = $tokens->getNextTokenOfKind($namespaceIndex, [';']); |
134 | 134 | $namespace = $tokens->generatePartialCode($tokens->getNextMeaningfulToken($namespaceIndex), $tokens->getPrevMeaningfulToken($namespaceEndIndex)); |
135 | 135 | $className = $tokens[$classNameTokenIndex]->getContent(); |
136 | - $fqcn = $namespace . '\\' . $className; |
|
137 | - if (class_exists($fqcn) && ! $this->isTransient($fqcn)) { |
|
136 | + $fqcn = $namespace.'\\'.$className; |
|
137 | + if (class_exists($fqcn) && !$this->isTransient($fqcn)) { |
|
138 | 138 | if (in_array($sourceFile, $this->newProxyFiles)) { |
139 | - $newClassName = $className . StringUtil::random(12); |
|
139 | + $newClassName = $className.StringUtil::random(12); |
|
140 | 140 | $tokens[$classNameTokenIndex] = new Token([T_STRING, $newClassName]); |
141 | 141 | $newFilePath = $this->outputDir."${newClassName}.php"; |
142 | 142 | file_put_contents($newFilePath, $tokens->generateCode()); |
143 | 143 | require_once $newFilePath; |
144 | - $results[] = $namespace . "\\${newClassName}"; |
|
144 | + $results[] = $namespace."\\${newClassName}"; |
|
145 | 145 | } else { |
146 | 146 | $results[] = $fqcn; |
147 | 147 | } |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | } else { |
94 | 94 | // httpから変更されたらfalseのまま |
95 | 95 | $config['force_ssl'] = Constant::DISABLED; |
96 | - $data['force_ssl'] = (bool)Constant::DISABLED; |
|
96 | + $data['force_ssl'] = (bool) Constant::DISABLED; |
|
97 | 97 | } |
98 | 98 | } else { |
99 | 99 | $config['force_ssl'] = Constant::DISABLED; |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | if (count($allowHost) > 0) { |
139 | 139 | $form->get('admin_allow_hosts')->setData(StringUtil::convertLineFeed(implode("\n", $allowHost))); |
140 | 140 | } |
141 | - $form->get('force_ssl')->setData((bool)$this->appConfig['force_ssl']); |
|
141 | + $form->get('force_ssl')->setData((bool) $this->appConfig['force_ssl']); |
|
142 | 142 | } |
143 | 143 | |
144 | 144 | return [ |