diff --git a/src/Eccube/Common/Constant.php b/src/Eccube/Common/Constant.php index 0409575c718..33ffc5c5b07 100644 --- a/src/Eccube/Common/Constant.php +++ b/src/Eccube/Common/Constant.php @@ -18,20 +18,20 @@ class Constant /** * EC-CUBE VERSION. */ - const VERSION = '4.2.0-beta'; + public const VERSION = '4.2.0-beta'; /** * Enable value. */ - const ENABLED = 1; + public const ENABLED = 1; /** * Disable value. */ - const DISABLED = 0; + public const DISABLED = 0; /** * Csrf Token Name. */ - const TOKEN_NAME = '_token'; + public const TOKEN_NAME = '_token'; } diff --git a/src/Eccube/Controller/Admin/Content/FileController.php b/src/Eccube/Controller/Admin/Content/FileController.php index 71207ed632d..14be60141d4 100644 --- a/src/Eccube/Controller/Admin/Content/FileController.php +++ b/src/Eccube/Controller/Admin/Content/FileController.php @@ -27,7 +27,6 @@ use Symfony\Component\HttpFoundation\File\UploadedFile; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\ResponseHeaderBag; -use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\UnsupportedMediaTypeHttpException; use Symfony\Component\Routing\Annotation\Route; @@ -35,8 +34,8 @@ class FileController extends AbstractController { - const SJIS = 'sjis-win'; - const UTF = 'UTF-8'; + public const SJIS = 'sjis-win'; + public const UTF = 'UTF-8'; private $errors = []; private $encode = ''; diff --git a/src/Eccube/Controller/Admin/Content/LayoutController.php b/src/Eccube/Controller/Admin/Content/LayoutController.php index 83731f566fe..5b1eac2c085 100644 --- a/src/Eccube/Controller/Admin/Content/LayoutController.php +++ b/src/Eccube/Controller/Admin/Content/LayoutController.php @@ -37,7 +37,7 @@ class LayoutController extends AbstractController { - const DUMMY_BLOCK_ID = 9999999999; + public const DUMMY_BLOCK_ID = 9999999999; /** * @var BlockRepository diff --git a/src/Eccube/Controller/Admin/Content/MaintenanceController.php b/src/Eccube/Controller/Admin/Content/MaintenanceController.php index 83e1013d8d4..04cbf68c535 100644 --- a/src/Eccube/Controller/Admin/Content/MaintenanceController.php +++ b/src/Eccube/Controller/Admin/Content/MaintenanceController.php @@ -96,7 +96,7 @@ public function disableMaintenance(Request $request, $mode, SystemService $syste } else { $maintenanceMode = [ 'auto_maintenance' => SystemService::AUTO_MAINTENANCE, - 'auto_maintenance_update' => SystemService::AUTO_MAINTENANCE_UPDATE + 'auto_maintenance_update' => SystemService::AUTO_MAINTENANCE_UPDATE, ]; $systemService->disableMaintenance($maintenanceMode[$mode]); } diff --git a/src/Eccube/Controller/Admin/Customer/CustomerController.php b/src/Eccube/Controller/Admin/Customer/CustomerController.php index 8b8f0520f6c..1d47574eaad 100644 --- a/src/Eccube/Controller/Admin/Customer/CustomerController.php +++ b/src/Eccube/Controller/Admin/Customer/CustomerController.php @@ -324,7 +324,7 @@ public function export(Request $request) $ExportCsvRow->pushData(); } - //$row[] = number_format(memory_get_usage(true)); + // $row[] = number_format(memory_get_usage(true)); // 出力. $csvService->fputcsv($ExportCsvRow->getRow()); }); diff --git a/src/Eccube/Controller/Admin/Order/MailController.php b/src/Eccube/Controller/Admin/Order/MailController.php index f8fa794e173..45e20c69921 100644 --- a/src/Eccube/Controller/Admin/Order/MailController.php +++ b/src/Eccube/Controller/Admin/Order/MailController.php @@ -24,8 +24,6 @@ use Eccube\Service\MailService; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpKernel\Exception\BadRequestHttpException; -use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\Routing\Annotation\Route; use Twig\Environment; diff --git a/src/Eccube/Controller/Admin/Order/OrderController.php b/src/Eccube/Controller/Admin/Order/OrderController.php index d4714456f15..a704d8830a8 100644 --- a/src/Eccube/Controller/Admin/Order/OrderController.php +++ b/src/Eccube/Controller/Admin/Order/OrderController.php @@ -453,7 +453,7 @@ protected function exportCsv(Request $request, $csvTypeId, $fileName) $ExportCsvRow->pushData(); } - //$row[] = number_format(memory_get_usage(true)); + // $row[] = number_format(memory_get_usage(true)); // 出力. $csvService->fputcsv($ExportCsvRow->getRow()); } diff --git a/src/Eccube/Controller/Admin/Product/CategoryController.php b/src/Eccube/Controller/Admin/Product/CategoryController.php index 8c151fb851d..56abb930573 100644 --- a/src/Eccube/Controller/Admin/Product/CategoryController.php +++ b/src/Eccube/Controller/Admin/Product/CategoryController.php @@ -341,7 +341,7 @@ public function export(Request $request) $ExportCsvRow->pushData(); } - //$row[] = number_format(memory_get_usage(true)); + // $row[] = number_format(memory_get_usage(true)); // 出力. $csvService->fputcsv($ExportCsvRow->getRow()); }); diff --git a/src/Eccube/Controller/Admin/Product/CsvImportController.php b/src/Eccube/Controller/Admin/Product/CsvImportController.php index b38f3a7abc5..f35cd7342af 100644 --- a/src/Eccube/Controller/Admin/Product/CsvImportController.php +++ b/src/Eccube/Controller/Admin/Product/CsvImportController.php @@ -357,7 +357,7 @@ public function csvProduct(Request $request, CacheUtil $cacheUtil) // 商品カテゴリ登録 $this->createProductCategory($row, $Product, $data, $headerByKey); - //タグ登録 + // タグ登録 $this->createProductTag($row, $Product, $data, $headerByKey); // 商品規格が存在しなければ新規登録 @@ -1359,7 +1359,7 @@ protected function updateProductClass($row, Product $Product, ProductClass $Prod if (isset($row[$headerByKey['price01']])) { if ($row[$headerByKey['price01']] != '') { $price01 = str_replace(',', '', $row[$headerByKey['price01']]); - $errors = $this->validator->validate($price01, new GreaterThanOrEqual(['value' => 0])); + $errors = $this->validator->validate($price01, new GreaterThanOrEqual(['value' => 0])); if ($errors->count() === 0) { $ProductClass->setPrice01($price01); } else { @@ -1639,7 +1639,7 @@ public function splitCsv(Request $request) // stream filter を適用して文字エンコーディングと改行コードの変換を行う // see https://github.com/EC-CUBE/ec-cube/issues/5252 $filters = [ - ConvertLineFeedFilter::class + ConvertLineFeedFilter::class, ]; if (!\mb_check_encoding($file->current(), 'UTF-8')) { diff --git a/src/Eccube/Controller/Admin/Product/ProductController.php b/src/Eccube/Controller/Admin/Product/ProductController.php index 6bc44afabe0..77d2ec9a906 100644 --- a/src/Eccube/Controller/Admin/Product/ProductController.php +++ b/src/Eccube/Controller/Admin/Product/ProductController.php @@ -46,7 +46,6 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; use Symfony\Component\Filesystem\Filesystem; -use Symfony\Component\HttpFoundation\BinaryFileResponse; use Symfony\Component\HttpFoundation\File\File; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; @@ -332,7 +331,7 @@ public function imageProcess(Request $request) if (count($images) > 0) { foreach ($images as $img) { foreach ($img as $image) { - //ファイルフォーマット検証 + // ファイルフォーマット検証 $mimeType = $image->getMimeType(); if (0 !== strpos($mimeType, 'image')) { throw new UnsupportedMediaTypeHttpException(); @@ -378,7 +377,7 @@ public function imageLoad(Request $request) $dirs = [ $this->eccubeConfig['eccube_save_image_dir'], - $this->eccubeConfig['eccube_temp_image_dir'] + $this->eccubeConfig['eccube_temp_image_dir'], ]; foreach ($dirs as $dir) { diff --git a/src/Eccube/Controller/Admin/Setting/Shop/PaymentController.php b/src/Eccube/Controller/Admin/Setting/Shop/PaymentController.php index c6851d1543e..01ddac1ee32 100644 --- a/src/Eccube/Controller/Admin/Setting/Shop/PaymentController.php +++ b/src/Eccube/Controller/Admin/Setting/Shop/PaymentController.php @@ -179,7 +179,7 @@ public function imageProcess(Request $request) if (isset($images['payment_image_file'])) { $image = $images['payment_image_file']; - //ファイルフォーマット検証 + // ファイルフォーマット検証 $mimeType = $image->getMimeType(); if (0 !== strpos($mimeType, 'image')) { throw new UnsupportedMediaTypeHttpException(); @@ -221,7 +221,7 @@ public function imageLoad(Request $request) $dirs = [ $this->eccubeConfig['eccube_save_image_dir'], - $this->eccubeConfig['eccube_temp_image_dir'] + $this->eccubeConfig['eccube_temp_image_dir'], ]; foreach ($dirs as $dir) { diff --git a/src/Eccube/Controller/Admin/Setting/Shop/TradeLawController.php b/src/Eccube/Controller/Admin/Setting/Shop/TradeLawController.php index 30a4855e61e..158b3dc9b9d 100644 --- a/src/Eccube/Controller/Admin/Setting/Shop/TradeLawController.php +++ b/src/Eccube/Controller/Admin/Setting/Shop/TradeLawController.php @@ -1,18 +1,27 @@ getForm(); $form->handleRequest($request); @@ -80,7 +88,7 @@ public function index(Request $request) return [ 'form' => $form->createView(), - 'tradeLawDetails' => $tradeLawDetails + 'tradeLawDetails' => $tradeLawDetails, ]; } } diff --git a/src/Eccube/Controller/Admin/Setting/System/MemberController.php b/src/Eccube/Controller/Admin/Setting/System/MemberController.php index 572a48f2457..2a2a0507cf9 100644 --- a/src/Eccube/Controller/Admin/Setting/System/MemberController.php +++ b/src/Eccube/Controller/Admin/Setting/System/MemberController.php @@ -54,8 +54,7 @@ public function __construct( EncoderFactoryInterface $encoderFactory, MemberRepository $memberRepository, TokenStorageInterface $tokenStorage - ) - { + ) { $this->encoderFactory = $encoderFactory; $this->memberRepository = $memberRepository; $this->tokenStorage = $tokenStorage; diff --git a/src/Eccube/Controller/Admin/Setting/System/SecurityController.php b/src/Eccube/Controller/Admin/Setting/System/SecurityController.php index 33a3553a9be..ee37c53760e 100644 --- a/src/Eccube/Controller/Admin/Setting/System/SecurityController.php +++ b/src/Eccube/Controller/Admin/Setting/System/SecurityController.php @@ -50,7 +50,7 @@ public function index(Request $request, CacheUtil $cacheUtil) $form->handleRequest($request); if ($form->isSubmitted() && $form->isValid()) { - //.envファイルが存在しないときに設定は失敗する + // .envファイルが存在しないときに設定は失敗する if (file_exists($this->getParameter('kernel.project_dir').'/.env') === false) { $this->addError('admin.common.save_error', 'admin'); @@ -75,7 +75,7 @@ public function index(Request $request, CacheUtil $cacheUtil) $env = StringUtil::replaceOrAddEnv($env, [ 'ECCUBE_ADMIN_ALLOW_HOSTS' => "'{$adminAllowHosts}'", 'ECCUBE_ADMIN_DENY_HOSTS' => "'{$adminDenyHosts}'", - 'ECCUBE_FORCE_SSL' => $data['force_ssl'] ? '1' : '0', + 'ECCUBE_FORCE_SSL' => $data['force_ssl'] ? '1' : '0', 'TRUSTED_HOSTS' => $data['trusted_hosts'], ]); diff --git a/src/Eccube/Controller/Admin/Store/PluginController.php b/src/Eccube/Controller/Admin/Store/PluginController.php index 28a83858ede..15f61421fc7 100644 --- a/src/Eccube/Controller/Admin/Store/PluginController.php +++ b/src/Eccube/Controller/Admin/Store/PluginController.php @@ -609,7 +609,7 @@ protected function getUnregisteredPlugins(array $plugins) try { $this->pluginService->checkPluginArchiveContent($dir->getRealPath()); } catch (PluginException $e) { - //config.yamlに不備があった際は全てスキップ + // config.yamlに不備があった際は全てスキップ log_warning($e->getMessage()); continue; } diff --git a/src/Eccube/Controller/EntryController.php b/src/Eccube/Controller/EntryController.php index b8d0c2752fd..46e0057704a 100644 --- a/src/Eccube/Controller/EntryController.php +++ b/src/Eccube/Controller/EntryController.php @@ -174,7 +174,7 @@ public function index(Request $request) 'Status' => [ CustomerStatus::PROVISIONAL, CustomerStatus::REGULAR, - ] + ], ]); if ($existCustomer) { @@ -350,6 +350,7 @@ private function getQuantityInCart(): int * * @param Customer $Customer * @param Request $request + * * @return void */ private function doLogin(Customer $Customer, Request $request): void @@ -363,6 +364,7 @@ private function doLogin(Customer $Customer, Request $request): void * 本会員へ更新する. * * @param Customer $Customer + * * @return void */ private function updateRegularCustomer(Customer $Customer): void diff --git a/src/Eccube/Controller/Install/InstallController.php b/src/Eccube/Controller/Install/InstallController.php index 843f2689e5b..5a56a6de3c5 100644 --- a/src/Eccube/Controller/Install/InstallController.php +++ b/src/Eccube/Controller/Install/InstallController.php @@ -14,8 +14,6 @@ namespace Eccube\Controller\Install; use Doctrine\Common\Annotations\AnnotationReader; -use Doctrine\Common\Annotations\CachedReader; -use Doctrine\Common\Cache\ArrayCache; use Doctrine\DBAL\Connection; use Doctrine\DBAL\DriverManager; use Doctrine\DBAL\Types\Type; @@ -48,10 +46,10 @@ class InstallController extends AbstractController /** * default value of auth magic */ - const DEFAULT_AUTH_MAGIC = ''; + public const DEFAULT_AUTH_MAGIC = ''; /** @var string */ - const TRANSACTION_CHECK_FILE = '/var/.httransaction'; + public const TRANSACTION_CHECK_FILE = '/var/.httransaction'; protected $requiredModules = [ 'pdo', diff --git a/src/Eccube/Controller/ProductController.php b/src/Eccube/Controller/ProductController.php index 8038490964e..1f8446a978d 100644 --- a/src/Eccube/Controller/ProductController.php +++ b/src/Eccube/Controller/ProductController.php @@ -19,8 +19,6 @@ use Eccube\Event\EccubeEvents; use Eccube\Event\EventArgs; use Eccube\Form\Type\AddCartType; -use Eccube\Form\Type\Master\ProductListMaxType; -use Eccube\Form\Type\Master\ProductListOrderByType; use Eccube\Form\Type\SearchProductType; use Eccube\Repository\BaseInfoRepository; use Eccube\Repository\CustomerFavoriteProductRepository; diff --git a/src/Eccube/Controller/ShoppingController.php b/src/Eccube/Controller/ShoppingController.php index 87d0a878d13..ca0eb326791 100644 --- a/src/Eccube/Controller/ShoppingController.php +++ b/src/Eccube/Controller/ShoppingController.php @@ -160,7 +160,7 @@ public function index(PurchaseFlow $cartPurchaseFlow) return [ 'form' => $form->createView(), 'Order' => $Order, - 'activeTradeLaws' => $activeTradeLaws + 'activeTradeLaws' => $activeTradeLaws, ]; } @@ -248,7 +248,7 @@ public function redirectTo(Request $request, RouterInterface $router) return [ 'form' => $form->createView(), 'Order' => $Order, - 'activeTradeLaws' => $activeTradeLaws + 'activeTradeLaws' => $activeTradeLaws, ]; } @@ -326,7 +326,7 @@ public function confirm(Request $request) return [ 'form' => $form->createView(), 'Order' => $Order, - 'activeTradeLaws' => $activeTradeLaws + 'activeTradeLaws' => $activeTradeLaws, ]; } @@ -334,14 +334,14 @@ public function confirm(Request $request) $template = new Template([ 'owner' => [$this, 'confirm'], - 'template' => 'Shopping/index.twig' + 'template' => 'Shopping/index.twig', ]); $request->attributes->set('_template', $template); return [ 'form' => $form->createView(), 'Order' => $Order, - 'activeTradeLaws' => $activeTradeLaws + 'activeTradeLaws' => $activeTradeLaws, ]; } diff --git a/src/Eccube/Controller/SitemapController.php b/src/Eccube/Controller/SitemapController.php index b73b073f8d1..5b46695629a 100644 --- a/src/Eccube/Controller/SitemapController.php +++ b/src/Eccube/Controller/SitemapController.php @@ -215,7 +215,7 @@ public function page() private function outputXml(array $data, $template_name = 'sitemap.xml.twig') { $response = new Response(); - $response->headers->set('Content-Type', 'application/xml'); //Content-Typeを設定 + $response->headers->set('Content-Type', 'application/xml'); // Content-Typeを設定 return $this->render( $template_name, diff --git a/src/Eccube/Controller/TradeLawController.php b/src/Eccube/Controller/TradeLawController.php index 44d9effaf8b..0aa43f8fb5b 100644 --- a/src/Eccube/Controller/TradeLawController.php +++ b/src/Eccube/Controller/TradeLawController.php @@ -40,7 +40,7 @@ public function index() $tradelaws = $this->tradeLawRepository->findBy([], ['sortNo' => 'ASC']); return [ - 'tradelaws' => $tradelaws + 'tradelaws' => $tradelaws, ]; } } diff --git a/src/Eccube/DependencyInjection/Compiler/NavCompilerPass.php b/src/Eccube/DependencyInjection/Compiler/NavCompilerPass.php index fd74c4bae2a..21735f296d4 100644 --- a/src/Eccube/DependencyInjection/Compiler/NavCompilerPass.php +++ b/src/Eccube/DependencyInjection/Compiler/NavCompilerPass.php @@ -19,7 +19,7 @@ class NavCompilerPass implements CompilerPassInterface { - const NAV_TAG = 'eccube.nav'; + public const NAV_TAG = 'eccube.nav'; public function process(ContainerBuilder $container) { diff --git a/src/Eccube/DependencyInjection/Compiler/PaymentMethodPass.php b/src/Eccube/DependencyInjection/Compiler/PaymentMethodPass.php index 66be29c75e3..396ac41618c 100644 --- a/src/Eccube/DependencyInjection/Compiler/PaymentMethodPass.php +++ b/src/Eccube/DependencyInjection/Compiler/PaymentMethodPass.php @@ -19,7 +19,7 @@ class PaymentMethodPass implements CompilerPassInterface { - const PAYMENT_METHOD_TAG = 'eccube.payment.method'; + public const PAYMENT_METHOD_TAG = 'eccube.payment.method'; public function process(ContainerBuilder $container) { diff --git a/src/Eccube/DependencyInjection/Compiler/PurchaseFlowPass.php b/src/Eccube/DependencyInjection/Compiler/PurchaseFlowPass.php index 57fa472d45d..ebc166ed48f 100644 --- a/src/Eccube/DependencyInjection/Compiler/PurchaseFlowPass.php +++ b/src/Eccube/DependencyInjection/Compiler/PurchaseFlowPass.php @@ -24,13 +24,13 @@ class PurchaseFlowPass implements CompilerPassInterface { - const ITEM_PREPROCESSOR_TAG = 'eccube.item.preprocessor'; - const ITEM_VALIDATOR_TAG = 'eccube.item.validator'; - const ITEM_HOLDER_PREPROCESSOR_TAG = 'eccube.item.holder.preprocessor'; - const ITEM_HOLDER_VALIDATOR_TAG = 'eccube.item.holder.validator'; - const ITEM_HOLDER_POST_VALIDATOR_TAG = 'eccube.item.holder.post.validator'; - const DISCOUNT_PROCESSOR_TAG = 'eccube.discount.processor'; - const PURCHASE_PROCESSOR_TAG = 'eccube.purchase.processor'; + public const ITEM_PREPROCESSOR_TAG = 'eccube.item.preprocessor'; + public const ITEM_VALIDATOR_TAG = 'eccube.item.validator'; + public const ITEM_HOLDER_PREPROCESSOR_TAG = 'eccube.item.holder.preprocessor'; + public const ITEM_HOLDER_VALIDATOR_TAG = 'eccube.item.holder.validator'; + public const ITEM_HOLDER_POST_VALIDATOR_TAG = 'eccube.item.holder.post.validator'; + public const DISCOUNT_PROCESSOR_TAG = 'eccube.discount.processor'; + public const PURCHASE_PROCESSOR_TAG = 'eccube.purchase.processor'; public function process(ContainerBuilder $container) { diff --git a/src/Eccube/DependencyInjection/Compiler/QueryCustomizerPass.php b/src/Eccube/DependencyInjection/Compiler/QueryCustomizerPass.php index b6a966eac09..88de3a28ba0 100644 --- a/src/Eccube/DependencyInjection/Compiler/QueryCustomizerPass.php +++ b/src/Eccube/DependencyInjection/Compiler/QueryCustomizerPass.php @@ -21,7 +21,7 @@ class QueryCustomizerPass implements CompilerPassInterface { - const QUERY_CUSTOMIZER_TAG = 'eccube.query_customizer'; + public const QUERY_CUSTOMIZER_TAG = 'eccube.query_customizer'; public function process(ContainerBuilder $container) { diff --git a/src/Eccube/DependencyInjection/Compiler/TwigBlockPass.php b/src/Eccube/DependencyInjection/Compiler/TwigBlockPass.php index 8867ddca0ad..54705e28270 100644 --- a/src/Eccube/DependencyInjection/Compiler/TwigBlockPass.php +++ b/src/Eccube/DependencyInjection/Compiler/TwigBlockPass.php @@ -19,7 +19,7 @@ class TwigBlockPass implements CompilerPassInterface { - const TWIG_BLOCK_TAG = 'eccube.twig_block'; + public const TWIG_BLOCK_TAG = 'eccube.twig_block'; public function process(ContainerBuilder $container) { diff --git a/src/Eccube/DependencyInjection/Facade/AnnotationReaderFacade.php b/src/Eccube/DependencyInjection/Facade/AnnotationReaderFacade.php index 23a1b6e7399..4655bd54641 100644 --- a/src/Eccube/DependencyInjection/Facade/AnnotationReaderFacade.php +++ b/src/Eccube/DependencyInjection/Facade/AnnotationReaderFacade.php @@ -14,7 +14,6 @@ namespace Eccube\DependencyInjection\Facade; use Doctrine\Common\Annotations\Reader; -use Symfony\Component\DependencyInjection\ContainerInterface; class AnnotationReaderFacade { diff --git a/src/Eccube/DependencyInjection/Facade/LoggerFacade.php b/src/Eccube/DependencyInjection/Facade/LoggerFacade.php index 4f135ddcba6..596b2fad965 100644 --- a/src/Eccube/DependencyInjection/Facade/LoggerFacade.php +++ b/src/Eccube/DependencyInjection/Facade/LoggerFacade.php @@ -66,6 +66,7 @@ public static function create() /** * @param string $channel + * * @return \Symfony\Bridge\Monolog\Logger */ public static function getLoggerBy($channel) diff --git a/src/Eccube/DependencyInjection/Facade/TranslatorFacade.php b/src/Eccube/DependencyInjection/Facade/TranslatorFacade.php index 736dd9ef193..f478e8a7657 100644 --- a/src/Eccube/DependencyInjection/Facade/TranslatorFacade.php +++ b/src/Eccube/DependencyInjection/Facade/TranslatorFacade.php @@ -13,7 +13,6 @@ namespace Eccube\DependencyInjection\Facade; -use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Contracts\Translation\TranslatorInterface; class TranslatorFacade diff --git a/src/Eccube/Doctrine/EventSubscriber/SaveEventSubscriber.php b/src/Eccube/Doctrine/EventSubscriber/SaveEventSubscriber.php index 395f7457849..44485727d05 100644 --- a/src/Eccube/Doctrine/EventSubscriber/SaveEventSubscriber.php +++ b/src/Eccube/Doctrine/EventSubscriber/SaveEventSubscriber.php @@ -14,8 +14,8 @@ namespace Eccube\Doctrine\EventSubscriber; use Doctrine\Common\EventSubscriber; -use Doctrine\ORM\Events; use Doctrine\ORM\Event\LifecycleEventArgs; +use Doctrine\ORM\Events; use Eccube\Common\EccubeConfig; use Eccube\Entity\Member; use Eccube\Request\Context; diff --git a/src/Eccube/Doctrine/ORM/Query/Normalize.php b/src/Eccube/Doctrine/ORM/Query/Normalize.php index 3447f8af526..b7a341e0afa 100644 --- a/src/Eccube/Doctrine/ORM/Query/Normalize.php +++ b/src/Eccube/Doctrine/ORM/Query/Normalize.php @@ -21,8 +21,8 @@ class Normalize extends FunctionNode { protected $string; - const FROM = 'あいうえおかきくけこさしすせそたちつてとなにぬねのはひふへほまみむめもやゆよらりるれろわをんがぎぐげござじずぜぞだぢづでどばびぶべぼぱぴぷぺぽぁぃぅぇぉっゃゅょわいえー'; - const TO = 'アイウエオカキクケコサシスセソタチツテトナニヌネノハヒフヘホマミムメモヤユヨラリルレロワヲンガギグゲゴザジズゼゾダヂヅデドバビブベボパピプペポァィゥェォッャュョヮヰヱー'; + public const FROM = 'あいうえおかきくけこさしすせそたちつてとなにぬねのはひふへほまみむめもやゆよらりるれろわをんがぎぐげござじずぜぞだぢづでどばびぶべぼぱぴぷぺぽぁぃぅぇぉっゃゅょわいえー'; + public const TO = 'アイウエオカキクケコサシスセソタチツテトナニヌネノハヒフヘホマミムメモヤユヨラリルレロワヲンガギグゲゴザジズゼゾダヂヅデドバビブベボパピプペポァィゥェォッャュョヮヰヱー'; public function parse(Parser $parser) { diff --git a/src/Eccube/Entity/Block.php b/src/Eccube/Entity/Block.php index 6ccdc5ce281..ddb5098d455 100644 --- a/src/Eccube/Entity/Block.php +++ b/src/Eccube/Entity/Block.php @@ -30,7 +30,7 @@ class Block extends \Eccube\Entity\AbstractEntity /** * @var integer */ - const UNUSED_BLOCK_ID = 0; + public const UNUSED_BLOCK_ID = 0; /** * @var int diff --git a/src/Eccube/Entity/Calendar.php b/src/Eccube/Entity/Calendar.php index f4858f73bd4..d2587eef158 100644 --- a/src/Eccube/Entity/Calendar.php +++ b/src/Eccube/Entity/Calendar.php @@ -30,7 +30,7 @@ class Calendar extends \Eccube\Entity\AbstractEntity /** * @var int */ - const DEFAULT_CALENDAR_ID = 1; + public const DEFAULT_CALENDAR_ID = 1; /** * is default diff --git a/src/Eccube/Entity/Customer.php b/src/Eccube/Entity/Customer.php index 92130d9e47d..c1c0098d413 100644 --- a/src/Eccube/Entity/Customer.php +++ b/src/Eccube/Entity/Customer.php @@ -14,10 +14,8 @@ namespace Eccube\Entity; use Doctrine\ORM\Mapping as ORM; -use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; use Symfony\Component\Security\Core\User\UserInterface; use Symfony\Component\Validator\Constraints as Assert; -use Symfony\Component\Validator\Mapping\ClassMetadata; if (!class_exists('\Eccube\Entity\Customer')) { /** @@ -608,6 +606,7 @@ public function getBirth() /** * @param string|null $password + * * @return $this */ public function setPlainPassword(?string $password): self diff --git a/src/Eccube/Entity/Layout.php b/src/Eccube/Entity/Layout.php index 8681a232821..5450244c5b4 100644 --- a/src/Eccube/Entity/Layout.php +++ b/src/Eccube/Entity/Layout.php @@ -29,34 +29,34 @@ class Layout extends AbstractEntity { // 配置ID /** 配置ID: 未使用 */ - const TARGET_ID_UNUSED = 0; - const TARGET_ID_HEAD = 1; - const TARGET_ID_BODY_AFTER = 2; - const TARGET_ID_HEADER = 3; - const TARGET_ID_CONTENTS_TOP = 4; - const TARGET_ID_SIDE_LEFT = 5; - const TARGET_ID_MAIN_TOP = 6; - const TARGET_ID_MAIN_BOTTOM = 7; - const TARGET_ID_SIDE_RIGHT = 8; - const TARGET_ID_CONTENTS_BOTTOM = 9; - const TARGET_ID_FOOTER = 10; - const TARGET_ID_DRAWER = 11; - const TARGET_ID_CLOSE_BODY_BEFORE = 12; + public const TARGET_ID_UNUSED = 0; + public const TARGET_ID_HEAD = 1; + public const TARGET_ID_BODY_AFTER = 2; + public const TARGET_ID_HEADER = 3; + public const TARGET_ID_CONTENTS_TOP = 4; + public const TARGET_ID_SIDE_LEFT = 5; + public const TARGET_ID_MAIN_TOP = 6; + public const TARGET_ID_MAIN_BOTTOM = 7; + public const TARGET_ID_SIDE_RIGHT = 8; + public const TARGET_ID_CONTENTS_BOTTOM = 9; + public const TARGET_ID_FOOTER = 10; + public const TARGET_ID_DRAWER = 11; + public const TARGET_ID_CLOSE_BODY_BEFORE = 12; /** * プレビュー用レイアウト */ - const DEFAULT_LAYOUT_PREVIEW_PAGE = 0; + public const DEFAULT_LAYOUT_PREVIEW_PAGE = 0; /** * トップページ用レイアウト */ - const DEFAULT_LAYOUT_TOP_PAGE = 1; + public const DEFAULT_LAYOUT_TOP_PAGE = 1; /** * 下層ページ用レイアウト */ - const DEFAULT_LAYOUT_UNDERLAYER_PAGE = 2; + public const DEFAULT_LAYOUT_UNDERLAYER_PAGE = 2; /** * @return string diff --git a/src/Eccube/Entity/Master/Authority.php b/src/Eccube/Entity/Master/Authority.php index d3a7a1048f8..935fc99a05c 100644 --- a/src/Eccube/Entity/Master/Authority.php +++ b/src/Eccube/Entity/Master/Authority.php @@ -31,11 +31,11 @@ class Authority extends \Eccube\Entity\Master\AbstractMasterEntity /** * システム管理者 */ - const ADMIN = 0; + public const ADMIN = 0; /** * 店舗オーナー */ - const OWNER = 1; + public const OWNER = 1; } } diff --git a/src/Eccube/Entity/Master/CsvType.php b/src/Eccube/Entity/Master/CsvType.php index 07123a77f79..908c7f471c1 100644 --- a/src/Eccube/Entity/Master/CsvType.php +++ b/src/Eccube/Entity/Master/CsvType.php @@ -31,26 +31,26 @@ class CsvType extends \Eccube\Entity\Master\AbstractMasterEntity /** * @var integer */ - const CSV_TYPE_PRODUCT = 1; + public const CSV_TYPE_PRODUCT = 1; /** * @var integer */ - const CSV_TYPE_CUSTOMER = 2; + public const CSV_TYPE_CUSTOMER = 2; /** * @var integer */ - const CSV_TYPE_ORDER = 3; + public const CSV_TYPE_ORDER = 3; /** * @var integer */ - const CSV_TYPE_SHIPPING = 4; + public const CSV_TYPE_SHIPPING = 4; /** * @var integer */ - const CSV_TYPE_CATEGORY = 5; + public const CSV_TYPE_CATEGORY = 5; } } diff --git a/src/Eccube/Entity/Master/CustomerStatus.php b/src/Eccube/Entity/Master/CustomerStatus.php index 6aeb6f47d30..334ef44caf2 100644 --- a/src/Eccube/Entity/Master/CustomerStatus.php +++ b/src/Eccube/Entity/Master/CustomerStatus.php @@ -33,28 +33,28 @@ class CustomerStatus extends \Eccube\Entity\Master\AbstractMasterEntity * * @deprecated */ - const NONACTIVE = 1; + public const NONACTIVE = 1; /** * 本会員. * * @deprecated */ - const ACTIVE = 2; + public const ACTIVE = 2; /** * 仮会員. */ - const PROVISIONAL = 1; + public const PROVISIONAL = 1; /** * 本会員 */ - const REGULAR = 2; + public const REGULAR = 2; /** * 退会 */ - const WITHDRAWING = 3; + public const WITHDRAWING = 3; } } diff --git a/src/Eccube/Entity/Master/DeviceType.php b/src/Eccube/Entity/Master/DeviceType.php index f4b7d8b4d91..4ae95ae31ae 100644 --- a/src/Eccube/Entity/Master/DeviceType.php +++ b/src/Eccube/Entity/Master/DeviceType.php @@ -28,8 +28,8 @@ */ class DeviceType extends \Eccube\Entity\Master\AbstractMasterEntity { - const DEVICE_TYPE_MB = 2; + public const DEVICE_TYPE_MB = 2; // const DEVICE_TYPE_TABLET = 3; - const DEVICE_TYPE_PC = 10; + public const DEVICE_TYPE_PC = 10; } } diff --git a/src/Eccube/Entity/Master/LoginHistoryStatus.php b/src/Eccube/Entity/Master/LoginHistoryStatus.php index 19ee61f18b9..ea1b66b71b7 100644 --- a/src/Eccube/Entity/Master/LoginHistoryStatus.php +++ b/src/Eccube/Entity/Master/LoginHistoryStatus.php @@ -31,11 +31,11 @@ class LoginHistoryStatus extends \Eccube\Entity\Master\AbstractMasterEntity /** * 失敗 */ - const FAILURE = 0; + public const FAILURE = 0; /** * 成功 */ - const SUCCESS = 1; + public const SUCCESS = 1; } } diff --git a/src/Eccube/Entity/Master/OrderItemType.php b/src/Eccube/Entity/Master/OrderItemType.php index 1857bc6adae..586980c0de1 100644 --- a/src/Eccube/Entity/Master/OrderItemType.php +++ b/src/Eccube/Entity/Master/OrderItemType.php @@ -35,42 +35,42 @@ class OrderItemType extends \Eccube\Entity\Master\AbstractMasterEntity * * @var integer */ - const PRODUCT = 1; + public const PRODUCT = 1; /** * 送料. * * @var integer */ - const DELIVERY_FEE = 2; + public const DELIVERY_FEE = 2; /** * 手数料. * * @var integer */ - const CHARGE = 3; + public const CHARGE = 3; /** * 値引き. * * @var integer */ - const DISCOUNT = 4; + public const DISCOUNT = 4; /** * 税. * * @var integer */ - const TAX = 5; + public const TAX = 5; /** * ポイント. * * @var integer */ - const POINT = 6; + public const POINT = 6; /** * 商品かどうか diff --git a/src/Eccube/Entity/Master/OrderStatus.php b/src/Eccube/Entity/Master/OrderStatus.php index 51a58382c3e..a2bfa03cd35 100644 --- a/src/Eccube/Entity/Master/OrderStatus.php +++ b/src/Eccube/Entity/Master/OrderStatus.php @@ -29,21 +29,21 @@ class OrderStatus extends \Eccube\Entity\Master\AbstractMasterEntity { /** 新規受付. */ - const NEW = 1; + public const NEW = 1; /** 注文取消し. */ - const CANCEL = 3; + public const CANCEL = 3; /** 対応中. */ - const IN_PROGRESS = 4; + public const IN_PROGRESS = 4; /** 発送済み. */ - const DELIVERED = 5; + public const DELIVERED = 5; /** 入金済み. */ - const PAID = 6; + public const PAID = 6; /** 決済処理中. */ - const PENDING = 7; + public const PENDING = 7; /** 購入処理中. */ - const PROCESSING = 8; + public const PROCESSING = 8; /** 返品 */ - const RETURNED = 9; + public const RETURNED = 9; /** * 受注一覧画面で, ステータスごとの受注件数を表示するかどうか diff --git a/src/Eccube/Entity/Master/ProductStatus.php b/src/Eccube/Entity/Master/ProductStatus.php index a61eb2c2fd2..9887cfd228b 100644 --- a/src/Eccube/Entity/Master/ProductStatus.php +++ b/src/Eccube/Entity/Master/ProductStatus.php @@ -38,7 +38,7 @@ class ProductStatus extends \Eccube\Entity\Master\AbstractMasterEntity * * @var integer */ - const DISPLAY_SHOW = 1; + public const DISPLAY_SHOW = 1; /** * 非公開 @@ -48,7 +48,7 @@ class ProductStatus extends \Eccube\Entity\Master\AbstractMasterEntity * * @var integer */ - const DISPLAY_HIDE = 2; + public const DISPLAY_HIDE = 2; /** * 廃止 @@ -60,6 +60,6 @@ class ProductStatus extends \Eccube\Entity\Master\AbstractMasterEntity * * @var integer */ - const DISPLAY_ABOLISHED = 3; + public const DISPLAY_ABOLISHED = 3; } } diff --git a/src/Eccube/Entity/Master/RoundingType.php b/src/Eccube/Entity/Master/RoundingType.php index a02f1b2663a..2e138f7dffe 100644 --- a/src/Eccube/Entity/Master/RoundingType.php +++ b/src/Eccube/Entity/Master/RoundingType.php @@ -33,18 +33,18 @@ class RoundingType extends \Eccube\Entity\Master\AbstractMasterEntity * * @var integer */ - const ROUND = 1; + public const ROUND = 1; /** * 切り捨て. * * @var integer */ - const FLOOR = 2; + public const FLOOR = 2; /** * 切り上げ. * * @var integer */ - const CEIL = 3; + public const CEIL = 3; } } diff --git a/src/Eccube/Entity/Master/SaleType.php b/src/Eccube/Entity/Master/SaleType.php index a88a6a0e0ef..9425ea64250 100644 --- a/src/Eccube/Entity/Master/SaleType.php +++ b/src/Eccube/Entity/Master/SaleType.php @@ -31,6 +31,6 @@ class SaleType extends \Eccube\Entity\Master\AbstractMasterEntity /** * @var integer */ - const SALE_TYPE_NORMAL = 1; + public const SALE_TYPE_NORMAL = 1; } } diff --git a/src/Eccube/Entity/Master/TaxDisplayType.php b/src/Eccube/Entity/Master/TaxDisplayType.php index 04b9260a794..6a3e741c23b 100644 --- a/src/Eccube/Entity/Master/TaxDisplayType.php +++ b/src/Eccube/Entity/Master/TaxDisplayType.php @@ -35,13 +35,13 @@ class TaxDisplayType extends \Eccube\Entity\Master\AbstractMasterEntity * * @var integer */ - const EXCLUDED = 1; + public const EXCLUDED = 1; /** * 税込. * * @var integer */ - const INCLUDED = 2; + public const INCLUDED = 2; } } diff --git a/src/Eccube/Entity/Master/TaxType.php b/src/Eccube/Entity/Master/TaxType.php index d481f74da28..166ba44fc8c 100644 --- a/src/Eccube/Entity/Master/TaxType.php +++ b/src/Eccube/Entity/Master/TaxType.php @@ -39,7 +39,7 @@ class TaxType extends \Eccube\Entity\Master\AbstractMasterEntity * * @var integer */ - const TAXATION = 1; + public const TAXATION = 1; /** * 不課税. @@ -50,7 +50,7 @@ class TaxType extends \Eccube\Entity\Master\AbstractMasterEntity * * @var integer */ - const NON_TAXABLE = 2; + public const NON_TAXABLE = 2; /** * 非課税. @@ -61,6 +61,6 @@ class TaxType extends \Eccube\Entity\Master\AbstractMasterEntity * * @var integer */ - const TAX_EXEMPT = 3; + public const TAX_EXEMPT = 3; } } diff --git a/src/Eccube/Entity/Master/Work.php b/src/Eccube/Entity/Master/Work.php index a69724257ae..a2c594ae9b6 100644 --- a/src/Eccube/Entity/Master/Work.php +++ b/src/Eccube/Entity/Master/Work.php @@ -31,11 +31,11 @@ class Work extends \Eccube\Entity\Master\AbstractMasterEntity /** * 非稼働 */ - const NON_ACTIVE = 0; + public const NON_ACTIVE = 0; /** * 稼働 */ - const ACTIVE = 1; + public const ACTIVE = 1; } } diff --git a/src/Eccube/Entity/Order.php b/src/Eccube/Entity/Order.php index e1f8939048c..ccd7b5a9f10 100644 --- a/src/Eccube/Entity/Order.php +++ b/src/Eccube/Entity/Order.php @@ -120,6 +120,7 @@ public function getTotalByTaxRate() } ksort($total); + return $total; } @@ -142,6 +143,7 @@ public function getTaxByTaxRate() } ksort($tax); + return $tax; } diff --git a/src/Eccube/Entity/Page.php b/src/Eccube/Entity/Page.php index 808d605eb44..e054f6b223e 100644 --- a/src/Eccube/Entity/Page.php +++ b/src/Eccube/Entity/Page.php @@ -28,16 +28,16 @@ class Page extends \Eccube\Entity\AbstractEntity { // 編集可能フラグ - const EDIT_TYPE_USER = 0; - const EDIT_TYPE_PREVIEW = 1; - const EDIT_TYPE_DEFAULT = 2; - const EDIT_TYPE_DEFAULT_CONFIRM = 3; + public const EDIT_TYPE_USER = 0; + public const EDIT_TYPE_PREVIEW = 1; + public const EDIT_TYPE_DEFAULT = 2; + public const EDIT_TYPE_DEFAULT_CONFIRM = 3; // 特定商取引法ページID - const TRADELAW_PAGE_ID = 21; + public const TRADELAW_PAGE_ID = 21; // ご利用規約ページID - const AGREEMENT_PAGE_ID = 19; + public const AGREEMENT_PAGE_ID = 19; public function getLayouts() { diff --git a/src/Eccube/Entity/ProductStock.php b/src/Eccube/Entity/ProductStock.php index 848fcb7e313..13804ae466a 100644 --- a/src/Eccube/Entity/ProductStock.php +++ b/src/Eccube/Entity/ProductStock.php @@ -27,8 +27,8 @@ */ class ProductStock extends \Eccube\Entity\AbstractEntity { - const IN_STOCK = 1; - const OUT_OF_STOCK = 2; + public const IN_STOCK = 1; + public const OUT_OF_STOCK = 2; /** * @var integer diff --git a/src/Eccube/Entity/Shipping.php b/src/Eccube/Entity/Shipping.php index 4cd9d3c41f1..0f7d4b5c0b8 100644 --- a/src/Eccube/Entity/Shipping.php +++ b/src/Eccube/Entity/Shipping.php @@ -34,11 +34,11 @@ class Shipping extends \Eccube\Entity\AbstractEntity /** * 出荷メール未送信 */ - const SHIPPING_MAIL_UNSENT = 1; + public const SHIPPING_MAIL_UNSENT = 1; /** * 出荷メール送信済 */ - const SHIPPING_MAIL_SENT = 2; + public const SHIPPING_MAIL_SENT = 2; public function getShippingMultipleDefaultName() { diff --git a/src/Eccube/Entity/TaxRule.php b/src/Eccube/Entity/TaxRule.php index b3750ee4f54..006cb8e99fd 100644 --- a/src/Eccube/Entity/TaxRule.php +++ b/src/Eccube/Entity/TaxRule.php @@ -30,7 +30,7 @@ class TaxRule extends \Eccube\Entity\AbstractEntity /** * @var integer */ - const DEFAULT_TAX_RULE_ID = 1; + public const DEFAULT_TAX_RULE_ID = 1; /** * @var integer diff --git a/src/Eccube/Entity/Template.php b/src/Eccube/Entity/Template.php index b3f38abd0a7..2acae204336 100644 --- a/src/Eccube/Entity/Template.php +++ b/src/Eccube/Entity/Template.php @@ -30,7 +30,7 @@ class Template extends \Eccube\Entity\AbstractEntity /** * 初期テンプレートコード */ - const DEFAULT_TEMPLATE_CODE = 'default'; + public const DEFAULT_TEMPLATE_CODE = 'default'; /** * @return bool diff --git a/src/Eccube/Entity/TradeLaw.php b/src/Eccube/Entity/TradeLaw.php index 266fdbbe0a1..3bf365ce1ad 100644 --- a/src/Eccube/Entity/TradeLaw.php +++ b/src/Eccube/Entity/TradeLaw.php @@ -14,10 +14,6 @@ namespace Eccube\Entity; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Translation\TranslatableMessage; -use Symfony\Component\Validator\Context\ExecutionContextInterface; -use Symfony\Component\Validator\Mapping\ClassMetadata; -use Symfony\Component\Validator\Constraints as Assert; if (!class_exists('\Eccube\Entity\TradeLaw')) { /** @@ -78,11 +74,13 @@ public function __toString() /** * @param int $id + * * @return TradeLaw */ public function setId(int $id): TradeLaw { $this->id = $id; + return $this; } @@ -96,11 +94,13 @@ public function getId(): int /** * @param string $name + * * @return TradeLaw */ public function setName(?string $name): TradeLaw { - $this->name = $name ?: ""; + $this->name = $name ?: ''; + return $this; } @@ -114,11 +114,13 @@ public function getName(): ?string /** * @param string $description + * * @return TradeLaw */ public function setDescription(?string $description): TradeLaw { - $this->description = $description ?: ""; + $this->description = $description ?: ''; + return $this; } @@ -132,11 +134,13 @@ public function getDescription(): ?string /** * @param int $sortNo + * * @return TradeLaw */ public function setSortNo(int $sortNo): TradeLaw { $this->sortNo = $sortNo; + return $this; } @@ -150,11 +154,13 @@ public function getSortNo(): int /** * @param bool $displayOrderScreen + * * @return TradeLaw */ public function setDisplayOrderScreen(bool $displayOrderScreen): TradeLaw { $this->displayOrderScreen = $displayOrderScreen; + return $this; } diff --git a/src/Eccube/Event/EccubeEvents.php b/src/Eccube/Event/EccubeEvents.php index 124ae2c7b75..1cff1fab64e 100644 --- a/src/Eccube/Event/EccubeEvents.php +++ b/src/Eccube/Event/EccubeEvents.php @@ -19,32 +19,32 @@ final class EccubeEvents * Admin/AdminController */ // login - const ADMIN_ADMIM_LOGIN_INITIALIZE = 'admin.admin.login.initialize'; + public const ADMIN_ADMIM_LOGIN_INITIALIZE = 'admin.admin.login.initialize'; // index - const ADMIN_ADMIM_INDEX_INITIALIZE = 'admin.admin.index.initialize'; - const ADMIN_ADMIM_INDEX_ORDER = 'admin.admin.index.order'; - const ADMIN_ADMIM_INDEX_SALES = 'admin.admin.index.sales'; - const ADMIN_ADMIM_INDEX_COMPLETE = 'admin.admin.index.complete'; + public const ADMIN_ADMIM_INDEX_INITIALIZE = 'admin.admin.index.initialize'; + public const ADMIN_ADMIM_INDEX_ORDER = 'admin.admin.index.order'; + public const ADMIN_ADMIM_INDEX_SALES = 'admin.admin.index.sales'; + public const ADMIN_ADMIM_INDEX_COMPLETE = 'admin.admin.index.complete'; // searchNonStockProducts // changePassword - const ADMIN_ADMIM_CHANGE_PASSWORD_INITIALIZE = 'admin.admin.change_password.initialize'; - const ADMIN_ADMIN_CHANGE_PASSWORD_COMPLETE = 'admin.admin.change_password.complete'; + public const ADMIN_ADMIM_CHANGE_PASSWORD_INITIALIZE = 'admin.admin.change_password.initialize'; + public const ADMIN_ADMIN_CHANGE_PASSWORD_COMPLETE = 'admin.admin.change_password.complete'; /** * Admin/Content/BlockController */ // index - const ADMIN_CONTENT_BLOCK_INDEX_COMPLETE = 'admin.content.block.index.complete'; + public const ADMIN_CONTENT_BLOCK_INDEX_COMPLETE = 'admin.content.block.index.complete'; // edit - const ADMIN_CONTENT_BLOCK_EDIT_INITIALIZE = 'admin.content.block.edit.initialize'; - const ADMIN_CONTENT_BLOCK_EDIT_COMPLETE = 'admin.content.block.edit.complete'; + public const ADMIN_CONTENT_BLOCK_EDIT_INITIALIZE = 'admin.content.block.edit.initialize'; + public const ADMIN_CONTENT_BLOCK_EDIT_COMPLETE = 'admin.content.block.edit.complete'; // delete - const ADMIN_CONTENT_BLOCK_DELETE_COMPLETE = 'admin.content.block.delete.complete'; + public const ADMIN_CONTENT_BLOCK_DELETE_COMPLETE = 'admin.content.block.delete.complete'; /** * Admin/Content/FileController @@ -63,166 +63,166 @@ final class EccubeEvents * Admin/Content/LayoutController */ // index - const ADMIN_CONTENT_LAYOUT_INDEX_INITIALIZE = 'admin.content.layout.index.initialize'; - const ADMIN_CONTENT_LAYOUT_INDEX_COMPLETE = 'admin.content.layout.index.complete'; + public const ADMIN_CONTENT_LAYOUT_INDEX_INITIALIZE = 'admin.content.layout.index.initialize'; + public const ADMIN_CONTENT_LAYOUT_INDEX_COMPLETE = 'admin.content.layout.index.complete'; /** * Admin/Content/NewsController */ // index - const ADMIN_CONTENT_NEWS_INDEX_INITIALIZE = 'admin.content.news.index.initialize'; + public const ADMIN_CONTENT_NEWS_INDEX_INITIALIZE = 'admin.content.news.index.initialize'; // edit - const ADMIN_CONTENT_NEWS_EDIT_INITIALIZE = 'admin.content.news.edit.initialize'; - const ADMIN_CONTENT_NEWS_EDIT_COMPLETE = 'admin.content.news.edit.complete'; + public const ADMIN_CONTENT_NEWS_EDIT_INITIALIZE = 'admin.content.news.edit.initialize'; + public const ADMIN_CONTENT_NEWS_EDIT_COMPLETE = 'admin.content.news.edit.complete'; // delete - const ADMIN_CONTENT_NEWS_DELETE_COMPLETE = 'admin.content.news.delete.complete'; + public const ADMIN_CONTENT_NEWS_DELETE_COMPLETE = 'admin.content.news.delete.complete'; /** * Admin/Content/PageController */ // index - const ADMIN_CONTENT_PAGE_INDEX_COMPLETE = 'admin.content.page.index.initialize'; + public const ADMIN_CONTENT_PAGE_INDEX_COMPLETE = 'admin.content.page.index.initialize'; // edit - const ADMIN_CONTENT_PAGE_EDIT_INITIALIZE = 'admin.content.page.edit.initialize'; - const ADMIN_CONTENT_PAGE_EDIT_COMPLETE = 'admin.content.page.edit.complete'; + public const ADMIN_CONTENT_PAGE_EDIT_INITIALIZE = 'admin.content.page.edit.initialize'; + public const ADMIN_CONTENT_PAGE_EDIT_COMPLETE = 'admin.content.page.edit.complete'; // delete - const ADMIN_CONTENT_PAGE_DELETE_COMPLETE = 'admin.content.page.delete.complete'; + public const ADMIN_CONTENT_PAGE_DELETE_COMPLETE = 'admin.content.page.delete.complete'; /** * Admin/Customer/CustomerController */ // index - const ADMIN_CUSTOMER_INDEX_INITIALIZE = 'admin.customer.index.initialize'; - const ADMIN_CUSTOMER_INDEX_SEARCH = 'admin.customer.index.search'; + public const ADMIN_CUSTOMER_INDEX_INITIALIZE = 'admin.customer.index.initialize'; + public const ADMIN_CUSTOMER_INDEX_SEARCH = 'admin.customer.index.search'; // resend - const ADMIN_CUSTOMER_RESEND_COMPLETE = 'admin.customer.resend.complete'; + public const ADMIN_CUSTOMER_RESEND_COMPLETE = 'admin.customer.resend.complete'; // delete - const ADMIN_CUSTOMER_DELETE_COMPLETE = 'admin.customer.delete.complete'; + public const ADMIN_CUSTOMER_DELETE_COMPLETE = 'admin.customer.delete.complete'; - const ADMIN_CUSTOMER_DELIVERY_DELETE_COMPLETE = 'admin.customer.delivery.delete.complete'; + public const ADMIN_CUSTOMER_DELIVERY_DELETE_COMPLETE = 'admin.customer.delivery.delete.complete'; // export - const ADMIN_CUSTOMER_CSV_EXPORT = 'admin.customer.csv.export'; + public const ADMIN_CUSTOMER_CSV_EXPORT = 'admin.customer.csv.export'; /** * Admin/Customer/CustomerEditController */ // index - const ADMIN_CUSTOMER_EDIT_INDEX_INITIALIZE = 'admin.customer.edit.index.initialize'; - const ADMIN_CUSTOMER_EDIT_INDEX_COMPLETE = 'admin.customer.edit.index.complete'; + public const ADMIN_CUSTOMER_EDIT_INDEX_INITIALIZE = 'admin.customer.edit.index.initialize'; + public const ADMIN_CUSTOMER_EDIT_INDEX_COMPLETE = 'admin.customer.edit.index.complete'; // index - const ADMIN_CUSTOMER_DELIVERY_EDIT_INDEX_INITIALIZE = 'admin.customer.delivery.edit.index.initialize'; - const ADMIN_CUSTOMER_DELIVERY_EDIT_INDEX_COMPLETE = 'admin.customer.delivery.edit.index.complete'; + public const ADMIN_CUSTOMER_DELIVERY_EDIT_INDEX_INITIALIZE = 'admin.customer.delivery.edit.index.initialize'; + public const ADMIN_CUSTOMER_DELIVERY_EDIT_INDEX_COMPLETE = 'admin.customer.delivery.edit.index.complete'; /** * Admin/Order/EditController */ // index - const ADMIN_ORDER_EDIT_INDEX_INITIALIZE = 'admin.order.edit.index.initialize'; - const ADMIN_ORDER_EDIT_INDEX_PROGRESS = 'admin.order.edit.index.progress'; - const ADMIN_ORDER_EDIT_INDEX_COMPLETE = 'admin.order.edit.index.complete'; + public const ADMIN_ORDER_EDIT_INDEX_INITIALIZE = 'admin.order.edit.index.initialize'; + public const ADMIN_ORDER_EDIT_INDEX_PROGRESS = 'admin.order.edit.index.progress'; + public const ADMIN_ORDER_EDIT_INDEX_COMPLETE = 'admin.order.edit.index.complete'; // searchCustomer - const ADMIN_ORDER_EDIT_SEARCH_CUSTOMER_INITIALIZE = 'admin.order.edit.search.customer.initialize'; - const ADMIN_ORDER_EDIT_SEARCH_CUSTOMER_SEARCH = 'admin.order.edit.search.customer.search'; - const ADMIN_ORDER_EDIT_SEARCH_CUSTOMER_COMPLETE = 'admin.order.edit.search.customer.complete'; + public const ADMIN_ORDER_EDIT_SEARCH_CUSTOMER_INITIALIZE = 'admin.order.edit.search.customer.initialize'; + public const ADMIN_ORDER_EDIT_SEARCH_CUSTOMER_SEARCH = 'admin.order.edit.search.customer.search'; + public const ADMIN_ORDER_EDIT_SEARCH_CUSTOMER_COMPLETE = 'admin.order.edit.search.customer.complete'; // searchCustomerById - const ADMIN_ORDER_EDIT_SEARCH_CUSTOMER_BY_ID_INITIALIZE = 'admin.order.edit.search.customer.by.id.initialize'; - const ADMIN_ORDER_EDIT_SEARCH_CUSTOMER_BY_ID_COMPLETE = 'admin.order.edit.search.customer.by.id.complete'; + public const ADMIN_ORDER_EDIT_SEARCH_CUSTOMER_BY_ID_INITIALIZE = 'admin.order.edit.search.customer.by.id.initialize'; + public const ADMIN_ORDER_EDIT_SEARCH_CUSTOMER_BY_ID_COMPLETE = 'admin.order.edit.search.customer.by.id.complete'; // searchProduct - const ADMIN_ORDER_EDIT_SEARCH_PRODUCT_INITIALIZE = 'admin.order.edit.search.product.initialize'; - const ADMIN_ORDER_EDIT_SEARCH_PRODUCT_SEARCH = 'admin.order.edit.search.product.search'; - const ADMIN_ORDER_EDIT_SEARCH_PRODUCT_COMPLETE = 'admin.order.edit.search.product.complete'; + public const ADMIN_ORDER_EDIT_SEARCH_PRODUCT_INITIALIZE = 'admin.order.edit.search.product.initialize'; + public const ADMIN_ORDER_EDIT_SEARCH_PRODUCT_SEARCH = 'admin.order.edit.search.product.search'; + public const ADMIN_ORDER_EDIT_SEARCH_PRODUCT_COMPLETE = 'admin.order.edit.search.product.complete'; /** * Admin/Order/MailController */ // index - const ADMIN_ORDER_MAIL_INDEX_INITIALIZE = 'admin.order.mail.index.initialize'; - const ADMIN_ORDER_MAIL_INDEX_CHANGE = 'admin.order.mail.index.change'; - const ADMIN_ORDER_MAIL_INDEX_CONFIRM = 'admin.order.mail.index.confirm'; - const ADMIN_ORDER_MAIL_INDEX_COMPLETE = 'admin.order.mail.index.complete'; + public const ADMIN_ORDER_MAIL_INDEX_INITIALIZE = 'admin.order.mail.index.initialize'; + public const ADMIN_ORDER_MAIL_INDEX_CHANGE = 'admin.order.mail.index.change'; + public const ADMIN_ORDER_MAIL_INDEX_CONFIRM = 'admin.order.mail.index.confirm'; + public const ADMIN_ORDER_MAIL_INDEX_COMPLETE = 'admin.order.mail.index.complete'; // mailAll - const ADMIN_ORDER_MAIL_MAIL_ALL_INITIALIZE = 'admin.order.mail.mail.all.initialize'; - const ADMIN_ORDER_MAIL_MAIL_ALL_CHANGE = 'admin.order.mail.mail.all.change'; - const ADMIN_ORDER_MAIL_MAIL_ALL_CONFIRM = 'admin.order.mail.mail.all.confirm'; - const ADMIN_ORDER_MAIL_MAIL_ALL_COMPLETE = 'admin.order.mail.mail.all.complete'; + public const ADMIN_ORDER_MAIL_MAIL_ALL_INITIALIZE = 'admin.order.mail.mail.all.initialize'; + public const ADMIN_ORDER_MAIL_MAIL_ALL_CHANGE = 'admin.order.mail.mail.all.change'; + public const ADMIN_ORDER_MAIL_MAIL_ALL_CONFIRM = 'admin.order.mail.mail.all.confirm'; + public const ADMIN_ORDER_MAIL_MAIL_ALL_COMPLETE = 'admin.order.mail.mail.all.complete'; /** * Admin/Order/OrderController */ // index - const ADMIN_ORDER_INDEX_INITIALIZE = 'admin.order.index.initialize'; - const ADMIN_ORDER_INDEX_SEARCH = 'admin.order.index.search'; + public const ADMIN_ORDER_INDEX_INITIALIZE = 'admin.order.index.initialize'; + public const ADMIN_ORDER_INDEX_SEARCH = 'admin.order.index.search'; // delete - const ADMIN_ORDER_DELETE_COMPLETE = 'admin.order.delete.complete'; + public const ADMIN_ORDER_DELETE_COMPLETE = 'admin.order.delete.complete'; // exportOrder - const ADMIN_ORDER_CSV_EXPORT_ORDER = 'admin.order.csv.export.order'; + public const ADMIN_ORDER_CSV_EXPORT_ORDER = 'admin.order.csv.export.order'; // exportShipping - const ADMIN_ORDER_CSV_EXPORT_SHIPPING = 'admin.order.csv.export.shipping'; + public const ADMIN_ORDER_CSV_EXPORT_SHIPPING = 'admin.order.csv.export.shipping'; /** * Admin/Shipping/ShippingController */ // index - const ADMIN_SHIPPING_INDEX_INITIALIZE = 'admin.shipping.index.initialize'; - const ADMIN_SHIPPING_INDEX_SEARCH = 'admin.shipping.index.search'; + public const ADMIN_SHIPPING_INDEX_INITIALIZE = 'admin.shipping.index.initialize'; + public const ADMIN_SHIPPING_INDEX_SEARCH = 'admin.shipping.index.search'; /** * Admin/Product/CategoryController */ // index - const ADMIN_PRODUCT_CATEGORY_INDEX_INITIALIZE = 'admin.product.category.index.initialize'; - const ADMIN_PRODUCT_CATEGORY_INDEX_COMPLETE = 'admin.product.category.index.complete'; + public const ADMIN_PRODUCT_CATEGORY_INDEX_INITIALIZE = 'admin.product.category.index.initialize'; + public const ADMIN_PRODUCT_CATEGORY_INDEX_COMPLETE = 'admin.product.category.index.complete'; // delete - const ADMIN_PRODUCT_CATEGORY_DELETE_COMPLETE = 'admin.product.category.delete.complete'; + public const ADMIN_PRODUCT_CATEGORY_DELETE_COMPLETE = 'admin.product.category.delete.complete'; // export - const ADMIN_PRODUCT_CATEGORY_CSV_EXPORT = 'admin.product.category.csv.export'; + public const ADMIN_PRODUCT_CATEGORY_CSV_EXPORT = 'admin.product.category.csv.export'; /** * Admin/Product/TagController */ // index - const ADMIN_PRODUCT_TAG_INDEX_INITIALIZE = 'admin.product.tag.index.initialize'; - const ADMIN_PRODUCT_TAG_INDEX_COMPLETE = 'admin.product.tag.index.complete'; + public const ADMIN_PRODUCT_TAG_INDEX_INITIALIZE = 'admin.product.tag.index.initialize'; + public const ADMIN_PRODUCT_TAG_INDEX_COMPLETE = 'admin.product.tag.index.complete'; // delete - const ADMIN_PRODUCT_TAG_DELETE_COMPLETE = 'admin.product.tag.delete.complete'; + public const ADMIN_PRODUCT_TAG_DELETE_COMPLETE = 'admin.product.tag.delete.complete'; /** * Admin/Product/ClassCategoryController */ // index - const ADMIN_PRODUCT_CLASS_CATEGORY_INDEX_INITIALIZE = 'admin.product.class.category.index.initialize'; - const ADMIN_PRODUCT_CLASS_CATEGORY_INDEX_COMPLETE = 'admin.product.class.category.index.complete'; + public const ADMIN_PRODUCT_CLASS_CATEGORY_INDEX_INITIALIZE = 'admin.product.class.category.index.initialize'; + public const ADMIN_PRODUCT_CLASS_CATEGORY_INDEX_COMPLETE = 'admin.product.class.category.index.complete'; // delete - const ADMIN_PRODUCT_CLASS_CATEGORY_DELETE_COMPLETE = 'admin.product.class.category.delete.complete'; + public const ADMIN_PRODUCT_CLASS_CATEGORY_DELETE_COMPLETE = 'admin.product.class.category.delete.complete'; /** * Admin/Product/ClassNameController */ // index - const ADMIN_PRODUCT_CLASS_NAME_INDEX_INITIALIZE = 'admin.product.class.name.index.initialize'; - const ADMIN_PRODUCT_CLASS_NAME_INDEX_COMPLETE = 'admin.product.class.name.index.complete'; + public const ADMIN_PRODUCT_CLASS_NAME_INDEX_INITIALIZE = 'admin.product.class.name.index.initialize'; + public const ADMIN_PRODUCT_CLASS_NAME_INDEX_COMPLETE = 'admin.product.class.name.index.complete'; // delete - const ADMIN_PRODUCT_CLASS_NAME_DELETE_COMPLETE = 'admin.product.class.name.delete.complete'; + public const ADMIN_PRODUCT_CLASS_NAME_DELETE_COMPLETE = 'admin.product.class.name.delete.complete'; /** * Admin/Product/CsvImportController @@ -237,350 +237,350 @@ final class EccubeEvents * Admin/Product/ProductClassController */ // index - const ADMIN_PRODUCT_PRODUCT_CLASS_INDEX_INITIALIZE = 'admin.product.product.class.index.initialize'; - const ADMIN_PRODUCT_PRODUCT_CLASS_INDEX_CLASSES = 'admin.product.product.class.index.classes'; + public const ADMIN_PRODUCT_PRODUCT_CLASS_INDEX_INITIALIZE = 'admin.product.product.class.index.initialize'; + public const ADMIN_PRODUCT_PRODUCT_CLASS_INDEX_CLASSES = 'admin.product.product.class.index.classes'; // edit - const ADMIN_PRODUCT_PRODUCT_CLASS_EDIT_INITIALIZE = 'admin.product.product.class.edit.initialize'; - const ADMIN_PRODUCT_PRODUCT_CLASS_EDIT_COMPLETE = 'admin.product.product.class.edit.complete'; - const ADMIN_PRODUCT_PRODUCT_CLASS_EDIT_UPDATE = 'admin.product.product.class.edit.update'; - const ADMIN_PRODUCT_PRODUCT_CLASS_EDIT_DELETE = 'admin.product.product.class.edit.delete'; + public const ADMIN_PRODUCT_PRODUCT_CLASS_EDIT_INITIALIZE = 'admin.product.product.class.edit.initialize'; + public const ADMIN_PRODUCT_PRODUCT_CLASS_EDIT_COMPLETE = 'admin.product.product.class.edit.complete'; + public const ADMIN_PRODUCT_PRODUCT_CLASS_EDIT_UPDATE = 'admin.product.product.class.edit.update'; + public const ADMIN_PRODUCT_PRODUCT_CLASS_EDIT_DELETE = 'admin.product.product.class.edit.delete'; /** * Admin/Product/ProductController */ // index - const ADMIN_PRODUCT_INDEX_INITIALIZE = 'admin.product.index.initialize'; - const ADMIN_PRODUCT_INDEX_SEARCH = 'admin.product.index.search'; + public const ADMIN_PRODUCT_INDEX_INITIALIZE = 'admin.product.index.initialize'; + public const ADMIN_PRODUCT_INDEX_SEARCH = 'admin.product.index.search'; // addImage - const ADMIN_PRODUCT_ADD_IMAGE_COMPLETE = 'admin.product.add.image.complete'; + public const ADMIN_PRODUCT_ADD_IMAGE_COMPLETE = 'admin.product.add.image.complete'; // edit - const ADMIN_PRODUCT_EDIT_INITIALIZE = 'admin.product.edit.initialize'; - const ADMIN_PRODUCT_EDIT_SEARCH = 'admin.product.edit.search'; - const ADMIN_PRODUCT_EDIT_COMPLETE = 'admin.product.edit.complete'; + public const ADMIN_PRODUCT_EDIT_INITIALIZE = 'admin.product.edit.initialize'; + public const ADMIN_PRODUCT_EDIT_SEARCH = 'admin.product.edit.search'; + public const ADMIN_PRODUCT_EDIT_COMPLETE = 'admin.product.edit.complete'; // delete - const ADMIN_PRODUCT_DELETE_COMPLETE = 'admin.product.delete.complete'; + public const ADMIN_PRODUCT_DELETE_COMPLETE = 'admin.product.delete.complete'; // copy - const ADMIN_PRODUCT_COPY_COMPLETE = 'admin.product.copy.complete'; + public const ADMIN_PRODUCT_COPY_COMPLETE = 'admin.product.copy.complete'; // display - const ADMIN_PRODUCT_DISPLAY_COMPLETE = 'admin.product.display.complete'; + public const ADMIN_PRODUCT_DISPLAY_COMPLETE = 'admin.product.display.complete'; // export - const ADMIN_PRODUCT_CSV_EXPORT = 'admin.product.csv.export'; + public const ADMIN_PRODUCT_CSV_EXPORT = 'admin.product.csv.export'; /** * Admin/Setting/Shop/CsvController */ // index - const ADMIN_SETTING_SHOP_CSV_INDEX_INITIALIZE = 'admin.setting.shop.csv.index.initialize'; - const ADMIN_SETTING_SHOP_CSV_INDEX_COMPLETE = 'admin.setting.shop.csv.index.complete'; + public const ADMIN_SETTING_SHOP_CSV_INDEX_INITIALIZE = 'admin.setting.shop.csv.index.initialize'; + public const ADMIN_SETTING_SHOP_CSV_INDEX_COMPLETE = 'admin.setting.shop.csv.index.complete'; /** * Admin/Setting/Shop/DeliveryController */ // index - const ADMIN_SETTING_SHOP_DELIVERY_INDEX_COMPLETE = 'admin.setting.shop.delivery.index.complete'; + public const ADMIN_SETTING_SHOP_DELIVERY_INDEX_COMPLETE = 'admin.setting.shop.delivery.index.complete'; // edit - const ADMIN_SETTING_SHOP_DELIVERY_EDIT_INITIALIZE = 'admin.setting.shop.delivery.edit.initialize'; - const ADMIN_SETTING_SHOP_DELIVERY_EDIT_COMPLETE = 'admin.setting.shop.delivery.edit.complete'; + public const ADMIN_SETTING_SHOP_DELIVERY_EDIT_INITIALIZE = 'admin.setting.shop.delivery.edit.initialize'; + public const ADMIN_SETTING_SHOP_DELIVERY_EDIT_COMPLETE = 'admin.setting.shop.delivery.edit.complete'; // delete - const ADMIN_SETTING_SHOP_DELIVERY_DELETE_COMPLETE = 'admin.setting.shop.delivery.delete.complete'; + public const ADMIN_SETTING_SHOP_DELIVERY_DELETE_COMPLETE = 'admin.setting.shop.delivery.delete.complete'; // visibility - const ADMIN_SETTING_SHOP_DELIVERY_VISIBILITY_COMPLETE = 'admin.setting.shop.delivery.visibility.complete'; + public const ADMIN_SETTING_SHOP_DELIVERY_VISIBILITY_COMPLETE = 'admin.setting.shop.delivery.visibility.complete'; /** * Admin/Setting/Shop/MailController */ // index - const ADMIN_SETTING_SHOP_MAIL_INDEX_INITIALIZE = 'admin.setting.shop.mail.index.initialize'; - const ADMIN_SETTING_SHOP_MAIL_INDEX_COMPLETE = 'admin.setting.shop.mail.index.complete'; + public const ADMIN_SETTING_SHOP_MAIL_INDEX_INITIALIZE = 'admin.setting.shop.mail.index.initialize'; + public const ADMIN_SETTING_SHOP_MAIL_INDEX_COMPLETE = 'admin.setting.shop.mail.index.complete'; // preview - const ADMIN_SETTING_SHOP_MAIL_PREVIEW_COMPLETE = 'admin.setting.shop.mail.preview.complete'; + public const ADMIN_SETTING_SHOP_MAIL_PREVIEW_COMPLETE = 'admin.setting.shop.mail.preview.complete'; /** * Admin/Setting/Shop/PaymentController */ // index - const ADMIN_SETTING_SHOP_PAYMENT_INDEX_COMPLETE = 'admin.setting.shop.payment.index.complete'; + public const ADMIN_SETTING_SHOP_PAYMENT_INDEX_COMPLETE = 'admin.setting.shop.payment.index.complete'; // edit - const ADMIN_SETTING_SHOP_PAYMENT_EDIT_INITIALIZE = 'admin.setting.shop.payment.edit.initialize'; - const ADMIN_SETTING_SHOP_PAYMENT_EDIT_COMPLETE = 'admin.setting.shop.payment.edit.complete'; + public const ADMIN_SETTING_SHOP_PAYMENT_EDIT_INITIALIZE = 'admin.setting.shop.payment.edit.initialize'; + public const ADMIN_SETTING_SHOP_PAYMENT_EDIT_COMPLETE = 'admin.setting.shop.payment.edit.complete'; // imageAdd - const ADMIN_SETTING_SHOP_PAYMENT_IMAGE_ADD_COMPLETE = 'admin.setting.shop.payment.image.add.complete'; + public const ADMIN_SETTING_SHOP_PAYMENT_IMAGE_ADD_COMPLETE = 'admin.setting.shop.payment.image.add.complete'; // delete - const ADMIN_SETTING_SHOP_PAYMENT_DELETE_COMPLETE = 'admin.setting.shop.payment.delete.complete'; + public const ADMIN_SETTING_SHOP_PAYMENT_DELETE_COMPLETE = 'admin.setting.shop.payment.delete.complete'; - const ADMIN_SETTING_SHOP_TRADE_LAW_INDEX_COMPLETE = 'admin.setting.shop.trade.law.index.complete'; - const ADMIN_SETTING_SHOP_TRADE_LAW_POST_COMPLETE = 'admin.setting.shop.trade.law.post.complete'; + public const ADMIN_SETTING_SHOP_TRADE_LAW_INDEX_COMPLETE = 'admin.setting.shop.trade.law.index.complete'; + public const ADMIN_SETTING_SHOP_TRADE_LAW_POST_COMPLETE = 'admin.setting.shop.trade.law.post.complete'; /** * Admin/Setting/Shop/ShopController */ // index - const ADMIN_SETTING_SHOP_SHOP_INDEX_INITIALIZE = 'admin.setting.shop.shop.index.initialize'; - const ADMIN_SETTING_SHOP_SHOP_INDEX_COMPLETE = 'admin.setting.shop.shop.index.complete'; + public const ADMIN_SETTING_SHOP_SHOP_INDEX_INITIALIZE = 'admin.setting.shop.shop.index.initialize'; + public const ADMIN_SETTING_SHOP_SHOP_INDEX_COMPLETE = 'admin.setting.shop.shop.index.complete'; /** * Admin/Setting/Shop/TaxRuleController */ // index - const ADMIN_SETTING_SHOP_TAX_RULE_INDEX_INITIALIZE = 'admin.setting.shop.tax.rule.index.initialize'; - const ADMIN_SETTING_SHOP_TAX_RULE_INDEX_COMPLETE = 'admin.setting.shop.tax.rule.index.complete'; + public const ADMIN_SETTING_SHOP_TAX_RULE_INDEX_INITIALIZE = 'admin.setting.shop.tax.rule.index.initialize'; + public const ADMIN_SETTING_SHOP_TAX_RULE_INDEX_COMPLETE = 'admin.setting.shop.tax.rule.index.complete'; // delete - const ADMIN_SETTING_SHOP_TAX_RULE_DELETE_COMPLETE = 'admin.setting.shop.tax.rule.delete.complete'; + public const ADMIN_SETTING_SHOP_TAX_RULE_DELETE_COMPLETE = 'admin.setting.shop.tax.rule.delete.complete'; // editParameter - const ADMIN_SETTING_SHOP_TAX_RULE_EDIT_PARAMETER_INITIALIZE = 'admin.setting.shop.tax.rule.edit.parameter.initialize'; - const ADMIN_SETTING_SHOP_TAX_RULE_EDIT_PARAMETER_COMPLETE = 'admin.setting.shop.tax.rule.edit.parameter.complete'; + public const ADMIN_SETTING_SHOP_TAX_RULE_EDIT_PARAMETER_INITIALIZE = 'admin.setting.shop.tax.rule.edit.parameter.initialize'; + public const ADMIN_SETTING_SHOP_TAX_RULE_EDIT_PARAMETER_COMPLETE = 'admin.setting.shop.tax.rule.edit.parameter.complete'; /** * Admin/Setting/System/AuthorityController */ // index - const ADMIN_SETTING_SYSTEM_AUTHORITY_INDEX_INITIALIZE = 'admin.setting.system.authority.index.initialize'; - const ADMIN_SETTING_SYSTEM_AUTHORITY_INDEX_COMPLETE = 'admin.setting.system.authority.index.complete'; + public const ADMIN_SETTING_SYSTEM_AUTHORITY_INDEX_INITIALIZE = 'admin.setting.system.authority.index.initialize'; + public const ADMIN_SETTING_SYSTEM_AUTHORITY_INDEX_COMPLETE = 'admin.setting.system.authority.index.complete'; /** * Admin/Setting/System/LogController */ // index - const ADMIN_SETTING_SYSTEM_LOG_INDEX_INITIALIZE = 'admin.setting.system.log.index.initialize'; - const ADMIN_SETTING_SYSTEM_LOG_INDEX_COMPLETE = 'admin.setting.system.log.index.complete'; + public const ADMIN_SETTING_SYSTEM_LOG_INDEX_INITIALIZE = 'admin.setting.system.log.index.initialize'; + public const ADMIN_SETTING_SYSTEM_LOG_INDEX_COMPLETE = 'admin.setting.system.log.index.complete'; /** * Admin/Setting/System/MasterdataController */ // index - const ADMIN_SETTING_SYSTEM_MASTERDATA_INDEX_INITIALIZE = 'admin.setting.system.masterdata.index.initialize'; - const ADMIN_SETTING_SYSTEM_MASTERDATA_INDEX_FORM2_INITIALIZE = 'admin.setting.system.masterdata.index.form2.initialize'; - const ADMIN_SETTING_SYSTEM_MASTERDATA_INDEX_COMPLETE = 'admin.setting.system.masterdata.index.complete'; + public const ADMIN_SETTING_SYSTEM_MASTERDATA_INDEX_INITIALIZE = 'admin.setting.system.masterdata.index.initialize'; + public const ADMIN_SETTING_SYSTEM_MASTERDATA_INDEX_FORM2_INITIALIZE = 'admin.setting.system.masterdata.index.form2.initialize'; + public const ADMIN_SETTING_SYSTEM_MASTERDATA_INDEX_COMPLETE = 'admin.setting.system.masterdata.index.complete'; // edit - const ADMIN_SETTING_SYSTEM_MASTERDATA_EDIT_INITIALIZE = 'admin.setting.system.masterdata.edit.initialize'; - const ADMIN_SETTING_SYSTEM_MASTERDATA_EDIT_FORM_INITIALIZE = 'admin.setting.system.masterdata.edit.form.initialize'; - const ADMIN_SETTING_SYSTEM_MASTERDATA_EDIT_COMPLETE = 'admin.setting.system.masterdata.edit.complete'; + public const ADMIN_SETTING_SYSTEM_MASTERDATA_EDIT_INITIALIZE = 'admin.setting.system.masterdata.edit.initialize'; + public const ADMIN_SETTING_SYSTEM_MASTERDATA_EDIT_FORM_INITIALIZE = 'admin.setting.system.masterdata.edit.form.initialize'; + public const ADMIN_SETTING_SYSTEM_MASTERDATA_EDIT_COMPLETE = 'admin.setting.system.masterdata.edit.complete'; /** * Admin/Setting/System/MemberController */ // index - const ADMIN_SETTING_SYSTEM_MEMBER_INDEX_INITIALIZE = 'admin.setting.system.member.index.initialize'; + public const ADMIN_SETTING_SYSTEM_MEMBER_INDEX_INITIALIZE = 'admin.setting.system.member.index.initialize'; // edit - const ADMIN_SETTING_SYSTEM_MEMBER_EDIT_INITIALIZE = 'admin.setting.system.member.edit.initialize'; - const ADMIN_SETTING_SYSTEM_MEMBER_EDIT_COMPLETE = 'admin.setting.system.member.edit.complete'; + public const ADMIN_SETTING_SYSTEM_MEMBER_EDIT_INITIALIZE = 'admin.setting.system.member.edit.initialize'; + public const ADMIN_SETTING_SYSTEM_MEMBER_EDIT_COMPLETE = 'admin.setting.system.member.edit.complete'; // delete - const ADMIN_SETTING_SYSTEM_MEMBER_DELETE_INITIALIZE = 'admin.setting.system.member.delete.initialize'; - const ADMIN_SETTING_SYSTEM_MEMBER_DELETE_COMPLETE = 'admin.setting.system.member.delete.complete'; + public const ADMIN_SETTING_SYSTEM_MEMBER_DELETE_INITIALIZE = 'admin.setting.system.member.delete.initialize'; + public const ADMIN_SETTING_SYSTEM_MEMBER_DELETE_COMPLETE = 'admin.setting.system.member.delete.complete'; /** * Block/SearchProductController */ // index - const FRONT_BLOCK_SEARCH_PRODUCT_INDEX_INITIALIZE = 'front.block.search.product.index.initialize'; + public const FRONT_BLOCK_SEARCH_PRODUCT_INDEX_INITIALIZE = 'front.block.search.product.index.initialize'; /** * Mypage/ChangeController */ // index - const FRONT_MYPAGE_CHANGE_INDEX_INITIALIZE = 'front.mypage.change.index.initialize'; - const FRONT_MYPAGE_CHANGE_INDEX_COMPLETE = 'front.mypage.change.index.complete'; + public const FRONT_MYPAGE_CHANGE_INDEX_INITIALIZE = 'front.mypage.change.index.initialize'; + public const FRONT_MYPAGE_CHANGE_INDEX_COMPLETE = 'front.mypage.change.index.complete'; /** * Mypage/DeliveryController */ // edit - const FRONT_MYPAGE_DELIVERY_EDIT_INITIALIZE = 'front.mypage.delivery.edit.initialize'; - const FRONT_MYPAGE_DELIVERY_EDIT_COMPLETE = 'front.mypage.delivery.edit.complete'; + public const FRONT_MYPAGE_DELIVERY_EDIT_INITIALIZE = 'front.mypage.delivery.edit.initialize'; + public const FRONT_MYPAGE_DELIVERY_EDIT_COMPLETE = 'front.mypage.delivery.edit.complete'; // delete - const FRONT_MYPAGE_DELIVERY_DELETE_COMPLETE = 'front.mypage.delete.complete'; + public const FRONT_MYPAGE_DELIVERY_DELETE_COMPLETE = 'front.mypage.delete.complete'; /** * Mypage/MypageController */ // login - const FRONT_MYPAGE_MYPAGE_LOGIN_INITIALIZE = 'front.mypage.mypage.login.initialize'; + public const FRONT_MYPAGE_MYPAGE_LOGIN_INITIALIZE = 'front.mypage.mypage.login.initialize'; // index - const FRONT_MYPAGE_MYPAGE_INDEX_SEARCH = 'front.mypage.mypage.index.search'; + public const FRONT_MYPAGE_MYPAGE_INDEX_SEARCH = 'front.mypage.mypage.index.search'; // history - const FRONT_MYPAGE_MYPAGE_HISTORY_INITIALIZE = 'front.mypage.mypage.history.initialize'; + public const FRONT_MYPAGE_MYPAGE_HISTORY_INITIALIZE = 'front.mypage.mypage.history.initialize'; // order - const FRONT_MYPAGE_MYPAGE_ORDER_INITIALIZE = 'front.mypage.mypage.order.initialize'; - const FRONT_MYPAGE_MYPAGE_ORDER_COMPLETE = 'front.mypage.mypage.order.complete'; + public const FRONT_MYPAGE_MYPAGE_ORDER_INITIALIZE = 'front.mypage.mypage.order.initialize'; + public const FRONT_MYPAGE_MYPAGE_ORDER_COMPLETE = 'front.mypage.mypage.order.complete'; // favorite - const FRONT_MYPAGE_MYPAGE_FAVORITE_SEARCH = 'front.mypage.mypage.favorite.search'; + public const FRONT_MYPAGE_MYPAGE_FAVORITE_SEARCH = 'front.mypage.mypage.favorite.search'; // delete - const FRONT_MYPAGE_MYPAGE_DELETE_INITIALIZE = 'front.mypage.mypage.delete.initialize'; - const FRONT_MYPAGE_MYPAGE_DELETE_COMPLETE = 'front.mypage.mypage.delete.complete'; + public const FRONT_MYPAGE_MYPAGE_DELETE_INITIALIZE = 'front.mypage.mypage.delete.initialize'; + public const FRONT_MYPAGE_MYPAGE_DELETE_COMPLETE = 'front.mypage.mypage.delete.complete'; /** * Mypage/WithdrawController */ // index - const FRONT_MYPAGE_WITHDRAW_INDEX_INITIALIZE = 'front.mypage.withdraw.index.initialize'; - const FRONT_MYPAGE_WITHDRAW_INDEX_COMPLETE = 'front.mypage.withdraw.index.complete'; + public const FRONT_MYPAGE_WITHDRAW_INDEX_INITIALIZE = 'front.mypage.withdraw.index.initialize'; + public const FRONT_MYPAGE_WITHDRAW_INDEX_COMPLETE = 'front.mypage.withdraw.index.complete'; /** * CartController */ // index - const FRONT_CART_INDEX_INITIALIZE = 'front.cart.index.initialize'; - const FRONT_CART_INDEX_COMPLETE = 'front.cart.index.complete'; + public const FRONT_CART_INDEX_INITIALIZE = 'front.cart.index.initialize'; + public const FRONT_CART_INDEX_COMPLETE = 'front.cart.index.complete'; // add - const FRONT_CART_ADD_INITIALIZE = 'front.cart.add.initialize'; - const FRONT_CART_ADD_COMPLETE = 'front.cart.add.complete'; - const FRONT_CART_ADD_EXCEPTION = 'front.cart.add.exception'; + public const FRONT_CART_ADD_INITIALIZE = 'front.cart.add.initialize'; + public const FRONT_CART_ADD_COMPLETE = 'front.cart.add.complete'; + public const FRONT_CART_ADD_EXCEPTION = 'front.cart.add.exception'; // up - const FRONT_CART_UP_INITIALIZE = 'front.cart.up.initialize'; - const FRONT_CART_UP_COMPLETE = 'front.cart.up.complete'; - const FRONT_CART_UP_EXCEPTION = 'front.cart.up.exception'; + public const FRONT_CART_UP_INITIALIZE = 'front.cart.up.initialize'; + public const FRONT_CART_UP_COMPLETE = 'front.cart.up.complete'; + public const FRONT_CART_UP_EXCEPTION = 'front.cart.up.exception'; // down - const FRONT_CART_DOWN_INITIALIZE = 'front.cart.down.initialize'; - const FRONT_CART_DOWN_COMPLETE = 'front.cart.down.complete'; - const FRONT_CART_DOWN_EXCEPTION = 'front.cart.down.exception'; + public const FRONT_CART_DOWN_INITIALIZE = 'front.cart.down.initialize'; + public const FRONT_CART_DOWN_COMPLETE = 'front.cart.down.complete'; + public const FRONT_CART_DOWN_EXCEPTION = 'front.cart.down.exception'; // remove - const FRONT_CART_REMOVE_INITIALIZE = 'front.cart.remove.initialize'; - const FRONT_CART_REMOVE_COMPLETE = 'front.cart.remove.complete'; + public const FRONT_CART_REMOVE_INITIALIZE = 'front.cart.remove.initialize'; + public const FRONT_CART_REMOVE_COMPLETE = 'front.cart.remove.complete'; // buystep - const FRONT_CART_BUYSTEP_INITIALIZE = 'front.cart.buystep.initialize'; - const FRONT_CART_BUYSTEP_COMPLETE = 'front.cart.buystep.complete'; + public const FRONT_CART_BUYSTEP_INITIALIZE = 'front.cart.buystep.initialize'; + public const FRONT_CART_BUYSTEP_COMPLETE = 'front.cart.buystep.complete'; /** * ContactController */ // index - const FRONT_CONTACT_INDEX_INITIALIZE = 'front.contact.index.initialize'; - const FRONT_CONTACT_INDEX_COMPLETE = 'front.contact.index.complete'; + public const FRONT_CONTACT_INDEX_INITIALIZE = 'front.contact.index.initialize'; + public const FRONT_CONTACT_INDEX_COMPLETE = 'front.contact.index.complete'; /** * EntryController */ // index - const FRONT_ENTRY_INDEX_INITIALIZE = 'front.entry.index.initialize'; - const FRONT_ENTRY_INDEX_COMPLETE = 'front.entry.index.complete'; + public const FRONT_ENTRY_INDEX_INITIALIZE = 'front.entry.index.initialize'; + public const FRONT_ENTRY_INDEX_COMPLETE = 'front.entry.index.complete'; // activate - const FRONT_ENTRY_ACTIVATE_COMPLETE = 'front.entry.activate.complete'; + public const FRONT_ENTRY_ACTIVATE_COMPLETE = 'front.entry.activate.complete'; /** * ForgotController */ // index - const FRONT_FORGOT_INDEX_INITIALIZE = 'front.forgot.index.initialize'; - const FRONT_FORGOT_INDEX_COMPLETE = 'front.forgot.index.complete'; + public const FRONT_FORGOT_INDEX_INITIALIZE = 'front.forgot.index.initialize'; + public const FRONT_FORGOT_INDEX_COMPLETE = 'front.forgot.index.complete'; // reset - const FRONT_FORGOT_RESET_COMPLETE = 'front.reset.index.complete'; + public const FRONT_FORGOT_RESET_COMPLETE = 'front.reset.index.complete'; /** * ProductController */ // index - const FRONT_PRODUCT_INDEX_INITIALIZE = 'front.product.index.initialize'; - const FRONT_PRODUCT_INDEX_SEARCH = 'front.product.index.search'; - const FRONT_PRODUCT_INDEX_COMPLETE = 'front.product.index.complete'; - const FRONT_PRODUCT_INDEX_DISP = 'front.product.index.disp'; - const FRONT_PRODUCT_INDEX_ORDER = 'front.product.index.order'; + public const FRONT_PRODUCT_INDEX_INITIALIZE = 'front.product.index.initialize'; + public const FRONT_PRODUCT_INDEX_SEARCH = 'front.product.index.search'; + public const FRONT_PRODUCT_INDEX_COMPLETE = 'front.product.index.complete'; + public const FRONT_PRODUCT_INDEX_DISP = 'front.product.index.disp'; + public const FRONT_PRODUCT_INDEX_ORDER = 'front.product.index.order'; // detail - const FRONT_PRODUCT_DETAIL_INITIALIZE = 'front.product.detail.initialize'; - const FRONT_PRODUCT_DETAIL_FAVORITE = 'front.product.detail.favorite'; - const FRONT_PRODUCT_DETAIL_COMPLETE = 'front.product.detail.complete'; + public const FRONT_PRODUCT_DETAIL_INITIALIZE = 'front.product.detail.initialize'; + public const FRONT_PRODUCT_DETAIL_FAVORITE = 'front.product.detail.favorite'; + public const FRONT_PRODUCT_DETAIL_COMPLETE = 'front.product.detail.complete'; - const FRONT_PRODUCT_CART_ADD_INITIALIZE = 'front.product.cart.add.initialize'; - const FRONT_PRODUCT_CART_ADD_COMPLETE = 'front.product.cart.add.complete'; + public const FRONT_PRODUCT_CART_ADD_INITIALIZE = 'front.product.cart.add.initialize'; + public const FRONT_PRODUCT_CART_ADD_COMPLETE = 'front.product.cart.add.complete'; - const FRONT_PRODUCT_FAVORITE_ADD_INITIALIZE = 'front.product.favorite.add.initialize'; - const FRONT_PRODUCT_FAVORITE_ADD_COMPLETE = 'front.product.favorite.add.complete'; + public const FRONT_PRODUCT_FAVORITE_ADD_INITIALIZE = 'front.product.favorite.add.initialize'; + public const FRONT_PRODUCT_FAVORITE_ADD_COMPLETE = 'front.product.favorite.add.complete'; /** * ShoppingController */ // index - const FRONT_SHOPPING_INDEX_INITIALIZE = 'front.shopping.index.initialize'; + public const FRONT_SHOPPING_INDEX_INITIALIZE = 'front.shopping.index.initialize'; // confirm - const FRONT_SHOPPING_CONFIRM_INITIALIZE = 'front.shopping.confirm.initialize'; - const FRONT_SHOPPING_CONFIRM_PROCESSING = 'front.shopping.confirm.processing'; - const FRONT_SHOPPING_CONFIRM_COMPLETE = 'front.shopping.confirm.complete'; + public const FRONT_SHOPPING_CONFIRM_INITIALIZE = 'front.shopping.confirm.initialize'; + public const FRONT_SHOPPING_CONFIRM_PROCESSING = 'front.shopping.confirm.processing'; + public const FRONT_SHOPPING_CONFIRM_COMPLETE = 'front.shopping.confirm.complete'; // complete - const FRONT_SHOPPING_COMPLETE_INITIALIZE = 'front.shopping.complete.initialize'; + public const FRONT_SHOPPING_COMPLETE_INITIALIZE = 'front.shopping.complete.initialize'; // delivery - const FRONT_SHOPPING_DELIVERY_INITIALIZE = 'front.shopping.delivery.initialize'; - const FRONT_SHOPPING_DELIVERY_COMPLETE = 'front.shopping.delivery.complete'; + public const FRONT_SHOPPING_DELIVERY_INITIALIZE = 'front.shopping.delivery.initialize'; + public const FRONT_SHOPPING_DELIVERY_COMPLETE = 'front.shopping.delivery.complete'; // payment - const FRONT_SHOPPING_PAYMENT_INITIALIZE = 'front.shopping.payment.initialize'; - const FRONT_SHOPPING_PAYMENT_COMPLETE = 'front.shopping.payment.complete'; + public const FRONT_SHOPPING_PAYMENT_INITIALIZE = 'front.shopping.payment.initialize'; + public const FRONT_SHOPPING_PAYMENT_COMPLETE = 'front.shopping.payment.complete'; // shippingChange - const FRONT_SHOPPING_SHIPPING_CHANGE_INITIALIZE = 'front.shopping.shipping.change.initialize'; + public const FRONT_SHOPPING_SHIPPING_CHANGE_INITIALIZE = 'front.shopping.shipping.change.initialize'; // shipping - const FRONT_SHOPPING_SHIPPING_COMPLETE = 'front.shopping.shipping.complete'; + public const FRONT_SHOPPING_SHIPPING_COMPLETE = 'front.shopping.shipping.complete'; // shippingEditChange - const FRONT_SHOPPING_SHIPPING_EDIT_CHANGE_INITIALIZE = 'front.shopping.shipping.edit.change.initialize'; + public const FRONT_SHOPPING_SHIPPING_EDIT_CHANGE_INITIALIZE = 'front.shopping.shipping.edit.change.initialize'; // shippingEdit - const FRONT_SHOPPING_SHIPPING_EDIT_INITIALIZE = 'front.shopping.shipping.edit.initialize'; - const FRONT_SHOPPING_SHIPPING_EDIT_COMPLETE = 'front.shopping.shipping.edit.complete'; + public const FRONT_SHOPPING_SHIPPING_EDIT_INITIALIZE = 'front.shopping.shipping.edit.initialize'; + public const FRONT_SHOPPING_SHIPPING_EDIT_COMPLETE = 'front.shopping.shipping.edit.complete'; // customer - const FRONT_SHOPPING_CUSTOMER_INITIALIZE = 'front.shopping.customer.initialize'; + public const FRONT_SHOPPING_CUSTOMER_INITIALIZE = 'front.shopping.customer.initialize'; // login - const FRONT_SHOPPING_LOGIN_INITIALIZE = 'front.shopping.login.initialize'; + public const FRONT_SHOPPING_LOGIN_INITIALIZE = 'front.shopping.login.initialize'; // nonmember - const FRONT_SHOPPING_NONMEMBER_INITIALIZE = 'front.shopping.nonmember.initialize'; - const FRONT_SHOPPING_NONMEMBER_COMPLETE = 'front.shopping.nonmember.complete'; + public const FRONT_SHOPPING_NONMEMBER_INITIALIZE = 'front.shopping.nonmember.initialize'; + public const FRONT_SHOPPING_NONMEMBER_COMPLETE = 'front.shopping.nonmember.complete'; // shippingMultipleChange - const FRONT_SHOPPING_SHIPPING_MULTIPLE_CHANGE_INITIALIZE = 'front.shopping.shipping.multiple.change.initialize'; + public const FRONT_SHOPPING_SHIPPING_MULTIPLE_CHANGE_INITIALIZE = 'front.shopping.shipping.multiple.change.initialize'; // shippingMultiple - const FRONT_SHOPPING_SHIPPING_MULTIPLE_INITIALIZE = 'front.shopping.shipping.multiple.initialize'; - const FRONT_SHOPPING_SHIPPING_MULTIPLE_COMPLETE = 'front.shopping.shipping.multiple.complete'; + public const FRONT_SHOPPING_SHIPPING_MULTIPLE_INITIALIZE = 'front.shopping.shipping.multiple.initialize'; + public const FRONT_SHOPPING_SHIPPING_MULTIPLE_COMPLETE = 'front.shopping.shipping.multiple.complete'; // shippingMultipleEdit - const FRONT_SHOPPING_SHIPPING_MULTIPLE_EDIT_INITIALIZE = 'front.shopping.shipping.multiple.edit.initialize'; - const FRONT_SHOPPING_SHIPPING_MULTIPLE_EDIT_COMPLETE = 'front.shopping.shipping.multiple.edit.complete'; + public const FRONT_SHOPPING_SHIPPING_MULTIPLE_EDIT_INITIALIZE = 'front.shopping.shipping.multiple.edit.initialize'; + public const FRONT_SHOPPING_SHIPPING_MULTIPLE_EDIT_COMPLETE = 'front.shopping.shipping.multiple.edit.complete'; // shippingError - const FRONT_SHOPPING_SHIPPING_ERROR_COMPLETE = 'front.shopping.shipping.error.complete'; + public const FRONT_SHOPPING_SHIPPING_ERROR_COMPLETE = 'front.shopping.shipping.error.complete'; /** * UserDataController */ // index - const FRONT_USER_DATA_INDEX_INITIALIZE = 'front.user.data.index.initialize'; + public const FRONT_USER_DATA_INDEX_INITIALIZE = 'front.user.data.index.initialize'; /** * MailService */ - const MAIL_CUSTOMER_CONFIRM = 'mail.customer.confirm'; - const MAIL_CUSTOMER_COMPLETE = 'mail.customer.complete'; - const MAIL_CUSTOMER_WITHDRAW = 'mail.customer.withdraw'; - const MAIL_CONTACT = 'mail.contact'; - const MAIL_ORDER = 'mail.order'; - const MAIL_ADMIN_CUSTOMER_CONFIRM = 'mail.admin.customer.confirm'; - const MAIL_ADMIN_ORDER = 'mail.admin.order'; - const MAIL_PASSWORD_RESET = 'mail.password.reset'; - const MAIL_PASSWORD_RESET_COMPLETE = 'mail.password.reset.complete'; + public const MAIL_CUSTOMER_CONFIRM = 'mail.customer.confirm'; + public const MAIL_CUSTOMER_COMPLETE = 'mail.customer.complete'; + public const MAIL_CUSTOMER_WITHDRAW = 'mail.customer.withdraw'; + public const MAIL_CONTACT = 'mail.contact'; + public const MAIL_ORDER = 'mail.order'; + public const MAIL_ADMIN_CUSTOMER_CONFIRM = 'mail.admin.customer.confirm'; + public const MAIL_ADMIN_ORDER = 'mail.admin.order'; + public const MAIL_PASSWORD_RESET = 'mail.password.reset'; + public const MAIL_PASSWORD_RESET_COMPLETE = 'mail.password.reset.complete'; } diff --git a/src/Eccube/Event/TemplateEvent.php b/src/Eccube/Event/TemplateEvent.php index 6413b1c6fb9..a0ca66f99df 100644 --- a/src/Eccube/Event/TemplateEvent.php +++ b/src/Eccube/Event/TemplateEvent.php @@ -13,8 +13,8 @@ namespace Eccube\Event; -use Symfony\Contracts\EventDispatcher\Event; use Symfony\Component\HttpFoundation\Response; +use Symfony\Contracts\EventDispatcher\Event; /** * Class TemplateEvent diff --git a/src/Eccube/EventListener/ExceptionListener.php b/src/Eccube/EventListener/ExceptionListener.php index 76538e8c99e..cfaccff8a1f 100644 --- a/src/Eccube/EventListener/ExceptionListener.php +++ b/src/Eccube/EventListener/ExceptionListener.php @@ -16,8 +16,8 @@ use Eccube\Request\Context; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface; use Symfony\Component\HttpKernel\Event\ExceptionEvent; +use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface; use Symfony\Component\HttpKernel\KernelEvents; class ExceptionListener implements EventSubscriberInterface diff --git a/src/Eccube/EventListener/LogListener.php b/src/Eccube/EventListener/LogListener.php index 3bfd40425ea..25fdfb552c2 100644 --- a/src/Eccube/EventListener/LogListener.php +++ b/src/Eccube/EventListener/LogListener.php @@ -17,9 +17,9 @@ use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpKernel\Event\ControllerEvent; use Symfony\Component\HttpKernel\Event\ExceptionEvent; -use Symfony\Component\HttpKernel\Event\TerminateEvent; -use Symfony\Component\HttpKernel\Event\ResponseEvent; use Symfony\Component\HttpKernel\Event\RequestEvent; +use Symfony\Component\HttpKernel\Event\ResponseEvent; +use Symfony\Component\HttpKernel\Event\TerminateEvent; use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface; use Symfony\Component\HttpKernel\KernelEvents; diff --git a/src/Eccube/EventListener/MaintenanceListener.php b/src/Eccube/EventListener/MaintenanceListener.php index 20305a1952e..33df2c9a2a3 100644 --- a/src/Eccube/EventListener/MaintenanceListener.php +++ b/src/Eccube/EventListener/MaintenanceListener.php @@ -23,7 +23,6 @@ class MaintenanceListener implements EventSubscriberInterface { - /** @var Context */ protected $requestContext; @@ -49,6 +48,7 @@ public function onResponse(ResponseEvent $event) if (!$this->systemService->isMaintenanceMode()) { $response->headers->clearCookie(SystemService::MAINTENANCE_TOKEN_KEY); + return; } diff --git a/src/Eccube/EventListener/RestrictFileUploadListener.php b/src/Eccube/EventListener/RestrictFileUploadListener.php index 641f1b5bf74..14a9f960a61 100644 --- a/src/Eccube/EventListener/RestrictFileUploadListener.php +++ b/src/Eccube/EventListener/RestrictFileUploadListener.php @@ -16,7 +16,6 @@ use Eccube\Common\EccubeConfig; use Eccube\Request\Context; use Symfony\Component\EventDispatcher\EventSubscriberInterface; -use Symfony\Component\HttpKernel\Event\ControllerEvent; use Symfony\Component\HttpKernel\Event\RequestEvent; use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; @@ -58,7 +57,7 @@ public function onKernelRequest(RequestEvent $event) public static function getSubscribedEvents() { return [ - 'kernel.request' => ['onKernelRequest', 7] // RouterListener より必ず後で実行する + 'kernel.request' => ['onKernelRequest', 7], // RouterListener より必ず後で実行する ]; } } diff --git a/src/Eccube/EventListener/TwoFactorAuthListener.php b/src/Eccube/EventListener/TwoFactorAuthListener.php index 86b77692ca8..454f8cdc518 100644 --- a/src/Eccube/EventListener/TwoFactorAuthListener.php +++ b/src/Eccube/EventListener/TwoFactorAuthListener.php @@ -28,7 +28,7 @@ class TwoFactorAuthListener implements EventSubscriberInterface /** * @var array 2段階認証のチェックを除外するroute */ - const ROUTE_EXCLUDE = ['admin_two_factor_auth', 'admin_two_factor_auth_set']; + public const ROUTE_EXCLUDE = ['admin_two_factor_auth', 'admin_two_factor_auth_set']; /** * @var EccubeConfig diff --git a/src/Eccube/Form/Type/AddCartType.php b/src/Eccube/Form/Type/AddCartType.php index 6c78a04e674..c91c5ebfd41 100644 --- a/src/Eccube/Form/Type/AddCartType.php +++ b/src/Eccube/Form/Type/AddCartType.php @@ -13,8 +13,8 @@ namespace Eccube\Form\Type; -use Doctrine\Persistence\ManagerRegistry; use Doctrine\ORM\EntityManager; +use Doctrine\Persistence\ManagerRegistry; use Eccube\Common\EccubeConfig; use Eccube\Entity\CartItem; use Eccube\Entity\ProductClass; @@ -209,7 +209,7 @@ public function validate($data, ExecutionContext $context) ]), ], '[classcategory_id1]'); } - //商品規格2初期状態(未選択)の場合の返却値は「NULL」で「__unselected」ではない + // 商品規格2初期状態(未選択)の場合の返却値は「NULL」で「__unselected」ではない if ($this->Product->getClassName2()) { $context->getValidator()->validate($data['classcategory_id2'], [ new Assert\NotBlank(), diff --git a/src/Eccube/Form/Type/Admin/MainEditType.php b/src/Eccube/Form/Type/Admin/MainEditType.php index cda994ee623..8255527a7f4 100644 --- a/src/Eccube/Form/Type/Admin/MainEditType.php +++ b/src/Eccube/Form/Type/Admin/MainEditType.php @@ -221,7 +221,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) ->setParameter('page_id', $Page->getId()); } - //確認ページの編集ページ存在している場合 + // 確認ページの編集ページ存在している場合 if ($Page->getEditType() == Page::EDIT_TYPE_DEFAULT_CONFIRM && $Page->getMasterPage()) { $qb ->andWhere('p.id <> :master_page_id') diff --git a/src/Eccube/Form/Type/Admin/MemberType.php b/src/Eccube/Form/Type/Admin/MemberType.php index d4e0bb29394..bd2386384d7 100755 --- a/src/Eccube/Form/Type/Admin/MemberType.php +++ b/src/Eccube/Form/Type/Admin/MemberType.php @@ -127,7 +127,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $options['required'] = false; $options['mapped'] = false; $options['attr'] = [ - 'disabled' => 'disabled' + 'disabled' => 'disabled', ]; $options['data'] = $data->getLoginId(); } diff --git a/src/Eccube/Form/Type/Admin/OrderPdfType.php b/src/Eccube/Form/Type/Admin/OrderPdfType.php index 5746308043c..97ffb6c4a84 100644 --- a/src/Eccube/Form/Type/Admin/OrderPdfType.php +++ b/src/Eccube/Form/Type/Admin/OrderPdfType.php @@ -73,7 +73,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'placeholder' => ['year' => '----', 'month' => '--', 'day' => '--'], 'data' => new \DateTime(), 'constraints' => [ - new Assert\NotBlank() + new Assert\NotBlank(), ], 'attr' => [ 'data-target' => '#'.$this->getBlockPrefix().'_issue_date', diff --git a/src/Eccube/Form/Type/Admin/SearchCustomerType.php b/src/Eccube/Form/Type/Admin/SearchCustomerType.php index f38824b5475..5dbb923722a 100644 --- a/src/Eccube/Form/Type/Admin/SearchCustomerType.php +++ b/src/Eccube/Form/Type/Admin/SearchCustomerType.php @@ -25,9 +25,9 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\DateTimeType; use Symfony\Component\Form\Extension\Core\Type\DateType; +use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\Extension\Core\Type\IntegerType; use Symfony\Component\Form\Extension\Core\Type\TextType; -use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Validator\Constraints as Assert; diff --git a/src/Eccube/Form/Type/Admin/SearchOrderType.php b/src/Eccube/Form/Type/Admin/SearchOrderType.php index 7195632301c..6fca5139bc5 100644 --- a/src/Eccube/Form/Type/Admin/SearchOrderType.php +++ b/src/Eccube/Form/Type/Admin/SearchOrderType.php @@ -22,8 +22,8 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\DateTimeType; use Symfony\Component\Form\Extension\Core\Type\DateType; -use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\Extension\Core\Type\HiddenType; +use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Validator\Constraints as Assert; @@ -322,7 +322,6 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'label' => 'admin.list.sort.type', 'required' => false, ]); - ; } /** diff --git a/src/Eccube/Form/Type/Admin/SearchProductType.php b/src/Eccube/Form/Type/Admin/SearchProductType.php index 846958f8b0d..c4494da0ea2 100644 --- a/src/Eccube/Form/Type/Admin/SearchProductType.php +++ b/src/Eccube/Form/Type/Admin/SearchProductType.php @@ -27,9 +27,9 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\DateTimeType; use Symfony\Component\Form\Extension\Core\Type\DateType; +use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\Form\Extension\Core\Type\HiddenType; class SearchProductType extends AbstractType { diff --git a/src/Eccube/Form/Type/Admin/ShippingType.php b/src/Eccube/Form/Type/Admin/ShippingType.php index f3d998a68ef..f3f1035de49 100644 --- a/src/Eccube/Form/Type/Admin/ShippingType.php +++ b/src/Eccube/Form/Type/Admin/ShippingType.php @@ -188,7 +188,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'max' => $this->eccubeConfig['eccube_mtext_len'], ]), new Assert\Regex([ - 'pattern' => "/^[0-9a-zA-Z-]+$/u", + 'pattern' => '/^[0-9a-zA-Z-]+$/u', 'message' => 'form_error.graph_and_hyphen_only', ]), ], diff --git a/src/Eccube/Form/Type/Admin/TradeLawType.php b/src/Eccube/Form/Type/Admin/TradeLawType.php index 8e43f8d0afd..a43186308e1 100644 --- a/src/Eccube/Form/Type/Admin/TradeLawType.php +++ b/src/Eccube/Form/Type/Admin/TradeLawType.php @@ -1,18 +1,27 @@ addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) { $options = $event->getForm()->getConfig()->getOptions(); if ($event->getData() === null) { - $event->setData((string)$options['choices'][0]->getId()); + $event->setData((string) $options['choices'][0]->getId()); } }); } diff --git a/src/Eccube/Form/Type/Master/ProductListOrderByType.php b/src/Eccube/Form/Type/Master/ProductListOrderByType.php index 7674d409f14..dd91cf327bf 100644 --- a/src/Eccube/Form/Type/Master/ProductListOrderByType.php +++ b/src/Eccube/Form/Type/Master/ProductListOrderByType.php @@ -31,7 +31,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $event) { $options = $event->getForm()->getConfig()->getOptions(); if ($event->getData() === null) { - $event->setData((string)$options['choices'][0]->getId()); + $event->setData((string) $options['choices'][0]->getId()); } }); } diff --git a/src/Eccube/Form/Type/SearchProductType.php b/src/Eccube/Form/Type/SearchProductType.php index 3e0bddcf5be..6c5548e3f57 100644 --- a/src/Eccube/Form/Type/SearchProductType.php +++ b/src/Eccube/Form/Type/SearchProductType.php @@ -14,8 +14,8 @@ namespace Eccube\Form\Type; use Doctrine\ORM\EntityManagerInterface; -use Eccube\Entity\Master\ProductListOrderBy; use Eccube\Entity\Master\ProductListMax; +use Eccube\Entity\Master\ProductListOrderBy; use Eccube\Form\Type\Master\ProductListMaxType; use Eccube\Form\Type\Master\ProductListOrderByType; use Eccube\Repository\CategoryRepository; @@ -76,11 +76,11 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder->add('pageno', HiddenType::class, []); $builder->add('disp_number', ProductListMaxType::class, [ 'label' => false, - 'choices' => $this->entityManager->getRepository(ProductListMax::class)->findBy([], ['sort_no' => 'ASC']) + 'choices' => $this->entityManager->getRepository(ProductListMax::class)->findBy([], ['sort_no' => 'ASC']), ]); $builder->add('orderby', ProductListOrderByType::class, [ 'label' => false, - 'choices' => $this->entityManager->getRepository(ProductListOrderBy::class)->findBy([], ['sort_no' => 'ASC']) + 'choices' => $this->entityManager->getRepository(ProductListOrderBy::class)->findBy([], ['sort_no' => 'ASC']), ]); } diff --git a/src/Eccube/Kernel.php b/src/Eccube/Kernel.php index a7e0f2d5ee3..617a5bd5ba5 100644 --- a/src/Eccube/Kernel.php +++ b/src/Eccube/Kernel.php @@ -41,7 +41,6 @@ use Eccube\Service\PurchaseFlow\ItemPreprocessor; use Eccube\Service\PurchaseFlow\ItemValidator; use Eccube\Service\PurchaseFlow\PurchaseProcessor; -use Eccube\Validator\EmailValidator\NoRFCEmailValidator; use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait; use Symfony\Component\Config\Loader\LoaderInterface; use Symfony\Component\DependencyInjection\Compiler\PassConfig; @@ -56,7 +55,7 @@ class Kernel extends BaseKernel { use MicroKernelTrait; - const CONFIG_EXTS = '.{php,xml,yaml,yml}'; + public const CONFIG_EXTS = '.{php,xml,yaml,yml}'; public function __construct(string $environment, bool $debug) { @@ -115,7 +114,7 @@ public function registerBundles() public function boot() { // Symfonyがsrc/Eccube/Entity以下を読み込む前にapp/proxy/entity以下をロードする - //$this->loadEntityProxies(); + // $this->loadEntityProxies(); parent::boot(); diff --git a/src/Eccube/Plugin/AbstractPluginManager.php b/src/Eccube/Plugin/AbstractPluginManager.php index 387d4d2fbd6..f42b26d31d9 100644 --- a/src/Eccube/Plugin/AbstractPluginManager.php +++ b/src/Eccube/Plugin/AbstractPluginManager.php @@ -24,7 +24,7 @@ abstract class AbstractPluginManager { - const MIGRATION_TABLE_PREFIX = 'migration_'; + public const MIGRATION_TABLE_PREFIX = 'migration_'; /** * プラグインのマイグレーションを実行する. diff --git a/src/Eccube/Repository/CalendarRepository.php b/src/Eccube/Repository/CalendarRepository.php index 97de1583fd9..8fabcb3599f 100644 --- a/src/Eccube/Repository/CalendarRepository.php +++ b/src/Eccube/Repository/CalendarRepository.php @@ -40,6 +40,7 @@ public function __construct(RegistryInterface $registry) * @param int $id * * @return Calendar + * * @throws \Exception */ public function get($id = 1) diff --git a/src/Eccube/Repository/CustomerRepository.php b/src/Eccube/Repository/CustomerRepository.php index 551e6bb51c7..7d8f0ae83d3 100644 --- a/src/Eccube/Repository/CustomerRepository.php +++ b/src/Eccube/Repository/CustomerRepository.php @@ -57,8 +57,7 @@ class CustomerRepository extends AbstractRepository protected $encoderFactory; public const COLUMNS = [ - 'customer_id' => 'c.id' - ,'name'=> 'c.name01' + 'customer_id' => 'c.id', 'name' => 'c.name01', ]; /** @@ -106,7 +105,7 @@ public function getQueryBuilderBySearchData($searchData) ->select('c'); if (isset($searchData['multi']) && StringUtil::isNotBlank($searchData['multi'])) { - //スペース除去 + // スペース除去 $clean_key_multi = preg_replace('/\s+|[　]+/u', '', $searchData['multi']); $id = preg_match('/^\d{0,10}$/', $clean_key_multi) ? $clean_key_multi : null; if ($id && $id > '2147483647' && $this->isPostgreSQL()) { diff --git a/src/Eccube/Repository/LoginHistoryRepository.php b/src/Eccube/Repository/LoginHistoryRepository.php index 50673adf0e1..2817e98dc9e 100644 --- a/src/Eccube/Repository/LoginHistoryRepository.php +++ b/src/Eccube/Repository/LoginHistoryRepository.php @@ -53,7 +53,7 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) ->select('lh'); if (isset($searchData['multi']) && StringUtil::isNotBlank($searchData['multi'])) { - //スペース除去 + // スペース除去 $clean_key_multi = preg_replace('/\s+|[　]+/u', '', $searchData['multi']); $qb ->andWhere('lh.user_name LIKE :multi_key OR lh.client_ip LIKE :multi_key') diff --git a/src/Eccube/Repository/OrderRepository.php b/src/Eccube/Repository/OrderRepository.php index 755cb21f0a7..8c9cbfcdd81 100644 --- a/src/Eccube/Repository/OrderRepository.php +++ b/src/Eccube/Repository/OrderRepository.php @@ -37,17 +37,7 @@ class OrderRepository extends AbstractRepository protected $queries; public const COLUMNS = [ - 'order' => 'o.name01' - ,'orderer'=> 'o.id' - ,'shipping_id'=> 's.id' - ,'purchase_product' => 'oi.product_name' - ,'quantity' => 'oi.quantity' - ,'payment_method' => 'o.payment_method' - ,'order_status' => 'o.OrderStatus' - ,'purchase_price' => 'o.total' - ,'shipping_status' => 's.shipping_date' - ,'tracking_number' => 's.tracking_number' - ,'delivery' => 's.name01' + 'order' => 'o.name01', 'orderer' => 'o.id', 'shipping_id' => 's.id', 'purchase_product' => 'oi.product_name', 'quantity' => 'oi.quantity', 'payment_method' => 'o.payment_method', 'order_status' => 'o.OrderStatus', 'purchase_price' => 'o.total', 'shipping_status' => 's.shipping_date', 'tracking_number' => 's.tracking_number', 'delivery' => 's.name01', ]; /** @@ -120,7 +110,7 @@ public function getQueryBuilderBySearchDataForAdmin($searchData) } // multi if (isset($searchData['multi']) && StringUtil::isNotBlank($searchData['multi'])) { - //スペース除去 + // スペース除去 $clean_key_multi = preg_replace('/\s+|[　]+/u', '', $searchData['multi']); $multi = preg_match('/^\d{0,10}$/', $clean_key_multi) ? $clean_key_multi : null; if ($multi && $multi > '2147483647' && $this->isPostgreSQL()) { diff --git a/src/Eccube/Repository/ProductRepository.php b/src/Eccube/Repository/ProductRepository.php index d1548899725..709a663d236 100644 --- a/src/Eccube/Repository/ProductRepository.php +++ b/src/Eccube/Repository/ProductRepository.php @@ -40,13 +40,7 @@ class ProductRepository extends AbstractRepository protected $eccubeConfig; public const COLUMNS = [ - 'product_id' => 'p.id' - ,'name' => 'p.name' - ,'product_code' => 'pc.code' - ,'stock' => 'pc.stock' - ,'status' => 'p.Status' - ,'create_date' => 'p.create_date' - ,'update_date' => 'p.update_date' + 'product_id' => 'p.id', 'name' => 'p.name', 'product_code' => 'pc.code', 'stock' => 'pc.stock', 'status' => 'p.Status', 'create_date' => 'p.create_date', 'update_date' => 'p.update_date', ]; /** @@ -178,7 +172,7 @@ public function getQueryBuilderBySearchData($searchData) // 価格低い順 $config = $this->eccubeConfig; if (!empty($searchData['orderby']) && $searchData['orderby']->getId() == $config['eccube_product_order_price_lower']) { - //@see http://doctrine-orm.readthedocs.org/en/latest/reference/dql-doctrine-query-language.html + // @see http://doctrine-orm.readthedocs.org/en/latest/reference/dql-doctrine-query-language.html $qb->addSelect('MIN(pc.price02) as HIDDEN price02_min'); $qb->innerJoin('p.ProductClasses', 'pc'); $qb->andWhere('pc.visible = true'); diff --git a/src/Eccube/Repository/QueryKey.php b/src/Eccube/Repository/QueryKey.php index c60bcd91aab..74d934ac7a9 100644 --- a/src/Eccube/Repository/QueryKey.php +++ b/src/Eccube/Repository/QueryKey.php @@ -15,13 +15,13 @@ final class QueryKey { - const PRODUCT_SEARCH = 'Product.getQueryBuilderBySearchData'; - const PRODUCT_SEARCH_ADMIN = 'Product.getQueryBuilderBySearchDataForAdmin'; + public const PRODUCT_SEARCH = 'Product.getQueryBuilderBySearchData'; + public const PRODUCT_SEARCH_ADMIN = 'Product.getQueryBuilderBySearchDataForAdmin'; - const CUSTOMER_SEARCH = 'Customer.getQueryBuilderBySearchData'; + public const CUSTOMER_SEARCH = 'Customer.getQueryBuilderBySearchData'; - const ORDER_SEARCH_ADMIN = 'Order.getQueryBuilderBySearchDataForAdmin'; - const ORDER_SEARCH_BY_CUSTOMER = 'Order.getQueryBuilderByCustomer'; + public const ORDER_SEARCH_ADMIN = 'Order.getQueryBuilderBySearchDataForAdmin'; + public const ORDER_SEARCH_BY_CUSTOMER = 'Order.getQueryBuilderByCustomer'; - const LOGIN_HISTORY_SEARCH_ADMIN = 'LoginHistory.getQueryBuilderBySearchDataForAdmin'; + public const LOGIN_HISTORY_SEARCH_ADMIN = 'LoginHistory.getQueryBuilderBySearchDataForAdmin'; } diff --git a/src/Eccube/Repository/TradeLawRepository.php b/src/Eccube/Repository/TradeLawRepository.php index d11be099a06..88d5fc0282a 100644 --- a/src/Eccube/Repository/TradeLawRepository.php +++ b/src/Eccube/Repository/TradeLawRepository.php @@ -1,5 +1,16 @@ execConfig('allow-plugins.symfony/flex', ['true']); } - } /** diff --git a/src/Eccube/Service/CsvImportService.php b/src/Eccube/Service/CsvImportService.php index cb26b050d8c..fee2a35af85 100644 --- a/src/Eccube/Service/CsvImportService.php +++ b/src/Eccube/Service/CsvImportService.php @@ -39,8 +39,8 @@ */ class CsvImportService implements \Iterator, \SeekableIterator, \Countable { - const DUPLICATE_HEADERS_INCREMENT = 1; - const DUPLICATE_HEADERS_MERGE = 2; + public const DUPLICATE_HEADERS_INCREMENT = 1; + public const DUPLICATE_HEADERS_MERGE = 2; /** * Number of the row that contains the column names @@ -106,7 +106,7 @@ public function __construct(\SplFileObject $file, $delimiter = ',', $enclosure = // stream filter を適用して文字エンコーディングと改行コードの変換を行う // see https://github.com/EC-CUBE/ec-cube/issues/5252 $filters = [ - ConvertLineFeedFilter::class + ConvertLineFeedFilter::class, ]; if (!\mb_check_encoding($file->current(), 'UTF-8')) { @@ -327,6 +327,7 @@ public function hasErrors() * * @param \SplFileObject $file Stream filter を適用する SplFileObject * @param \php_user_filter $filters 適用する stream filter のクラス名 + * * @return \SplFileObject 適用後の SplFileObject */ public static function applyStreamFilter(\SplFileObject $file, string ...$filters): \SplFileObject @@ -434,6 +435,7 @@ protected function mergeDuplicates(array $line) * * Windows 版 PHP7 環境では、ファイルエンコーディングが CP932 になるため UTF-8 に変換する. * それ以外の環境では何もしない。 + * * @deprecated 使用していないため削除予定 */ protected function convertEncodingRows($row) diff --git a/src/Eccube/Service/EntityProxyService.php b/src/Eccube/Service/EntityProxyService.php index 981c5c7031e..dc277236bc3 100644 --- a/src/Eccube/Service/EntityProxyService.php +++ b/src/Eccube/Service/EntityProxyService.php @@ -23,7 +23,6 @@ use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\Finder\Finder; -use Zend\Code\Reflection\ClassReflection; class EntityProxyService { diff --git a/src/Eccube/Service/MailService.php b/src/Eccube/Service/MailService.php index f429a767686..5dd56a7361f 100644 --- a/src/Eccube/Service/MailService.php +++ b/src/Eccube/Service/MailService.php @@ -27,11 +27,11 @@ use Eccube\Repository\MailHistoryRepository; use Eccube\Repository\MailTemplateRepository; use Symfony\Component\DependencyInjection\ContainerInterface; +use Symfony\Component\EventDispatcher\EventDispatcher; +use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\Mailer\MailerInterface; use Symfony\Component\Mime\Address; use Symfony\Component\Mime\Email; -use Symfony\Component\EventDispatcher\EventDispatcher; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; class MailService { @@ -758,6 +758,7 @@ public function getHtmlTemplate($templateName) * パラメータ eccube_rfc_email_check == true の場合は変換しない * * @param string $email + * * @return Address */ public function convertRFCViolatingEmail(string $email): Address @@ -767,21 +768,21 @@ public function convertRFCViolatingEmail(string $email): Address } // see https://blog.everqueue.com/chiba/2009/03/22/163/ - $wsp = '[\x20\x09]'; - $vchar = '[\x21-\x7e]'; - $quoted_pair = "\\\\(?:$vchar|$wsp)"; - $qtext = '[\x21\x23-\x5b\x5d-\x7e]'; - $qcontent = "(?:$qtext|$quoted_pair)"; + $wsp = '[\x20\x09]'; + $vchar = '[\x21-\x7e]'; + $quoted_pair = "\\\\(?:$vchar|$wsp)"; + $qtext = '[\x21\x23-\x5b\x5d-\x7e]'; + $qcontent = "(?:$qtext|$quoted_pair)"; $quoted_string = "\"$qcontent*\""; - $atext = '[a-zA-Z0-9!#$%&\'*+\-\/\=?^_`{|}~]'; - $dot_atom = "$atext+(?:[.]$atext+)*"; - $local_part = "(?:$dot_atom|$quoted_string)"; - $domain = $dot_atom; - $addr_spec = "{$local_part}[@]$domain"; + $atext = '[a-zA-Z0-9!#$%&\'*+\-\/\=?^_`{|}~]'; + $dot_atom = "$atext+(?:[.]$atext+)*"; + $local_part = "(?:$dot_atom|$quoted_string)"; + $domain = $dot_atom; + $addr_spec = "{$local_part}[@]$domain"; - $dot_atom_loose = "$atext+(?:[.]|$atext)*"; + $dot_atom_loose = "$atext+(?:[.]|$atext)*"; $local_part_loose = "(?:$dot_atom_loose|$quoted_string)"; - $addr_spec_loose = "{$local_part_loose}[@]$domain"; + $addr_spec_loose = "{$local_part_loose}[@]$domain"; $regexp = "/\A{$addr_spec}\z/"; if (!preg_match($regexp, $email)) { diff --git a/src/Eccube/Service/OrderHelper.php b/src/Eccube/Service/OrderHelper.php index 8aa912866ac..141b67978d4 100644 --- a/src/Eccube/Service/OrderHelper.php +++ b/src/Eccube/Service/OrderHelper.php @@ -49,24 +49,24 @@ class OrderHelper /** * @var string 非会員情報を保持するセッションのキー */ - const SESSION_NON_MEMBER = 'eccube.front.shopping.nonmember'; + public const SESSION_NON_MEMBER = 'eccube.front.shopping.nonmember'; /** * @var string 非会員の住所情報を保持するセッションのキー */ - const SESSION_NON_MEMBER_ADDRESSES = 'eccube.front.shopping.nonmember.customeraddress'; + public const SESSION_NON_MEMBER_ADDRESSES = 'eccube.front.shopping.nonmember.customeraddress'; /** * @var string 受注IDを保持するセッションのキー */ - const SESSION_ORDER_ID = 'eccube.front.shopping.order.id'; + public const SESSION_ORDER_ID = 'eccube.front.shopping.order.id'; /** * @var string カートが分割されているかどうかのフラグ. 購入フローからのログイン時にカートが分割された場合にtrueがセットされる. * * @see SecurityListener */ - const SESSION_CART_DIVIDE_FLAG = 'eccube.front.cart.divide'; + public const SESSION_CART_DIVIDE_FLAG = 'eccube.front.cart.divide'; /** * @var SessionInterface diff --git a/src/Eccube/Service/OrderPdfService.php b/src/Eccube/Service/OrderPdfService.php index 9cc6f2670a6..a9130c3d034 100644 --- a/src/Eccube/Service/OrderPdfService.php +++ b/src/Eccube/Service/OrderPdfService.php @@ -63,12 +63,12 @@ class OrderPdfService extends TcpdfFpdi // ==================================== /** ダウンロードするPDFファイルのデフォルト名 */ - const DEFAULT_PDF_FILE_NAME = 'nouhinsyo.pdf'; + public const DEFAULT_PDF_FILE_NAME = 'nouhinsyo.pdf'; /** FONT ゴシック */ - const FONT_GOTHIC = 'kozgopromedium'; + public const FONT_GOTHIC = 'kozgopromedium'; /** FONT 明朝 */ - const FONT_SJIS = 'kozminproregular'; + public const FONT_SJIS = 'kozminproregular'; // ==================================== // 変数宣言 @@ -311,7 +311,7 @@ protected function renderShopData() // 電話番号 $text = 'TEL: '.$this->baseInfoRepository->getPhoneNumber(); - $this->lfText(125, 72, $text, 8); //TEL・FAX + $this->lfText(125, 72, $text, 8); // TEL・FAX // メールアドレス if (strlen($this->baseInfoRepository->getEmail01()) > 0) { @@ -342,9 +342,9 @@ protected function renderShopData() */ protected function renderMessageData(array $formData) { - $this->lfText(27, 70, $formData['message1'], 8); //メッセージ1 - $this->lfText(27, 74, $formData['message2'], 8); //メッセージ2 - $this->lfText(27, 78, $formData['message3'], 8); //メッセージ3 + $this->lfText(27, 70, $formData['message1'], 8); // メッセージ1 + $this->lfText(27, 74, $formData['message2'], 8); // メッセージ2 + $this->lfText(27, 78, $formData['message3'], 8); // メッセージ3 } /** @@ -390,7 +390,7 @@ protected function renderTitle($title) // フォント情報のバックアップ $this->backupFont(); - //文書タイトル（納品書・請求書） + // 文書タイトル（納品書・請求書） $this->SetFont(self::FONT_GOTHIC, '', 15); $this->Cell(0, 10, $title, 0, 2, 'C', 0, ''); $this->Cell(0, 66, '', 0, 2, 'R', 0, ''); @@ -423,7 +423,7 @@ protected function renderOrderData(Shipping $Shipping) // $text = $Order->getPref().$Order->getAddr01(); $text = $Shipping->getPref().$Shipping->getAddr01(); $this->lfText(27, 47, $text, 10); - $this->lfText(27, 51, $Shipping->getAddr02(), 10); //購入者住所2 + $this->lfText(27, 51, $Shipping->getAddr02(), 10); // 購入者住所2 // 購入者氏名 if (null !== $Shipping->getCompanyName()) { @@ -443,14 +443,14 @@ protected function renderOrderData(Shipping $Shipping) // ========================================= $this->SetFont(self::FONT_SJIS, '', 10); - //ご注文日 + // ご注文日 $orderDate = $Order->getCreateDate()->format('Y/m/d H:i'); if ($Order->getOrderDate()) { $orderDate = $Order->getOrderDate()->format('Y/m/d H:i'); } $this->lfText(25, 125, $orderDate, 10); - //注文番号 + // 注文番号 $this->lfText(25, 135, $Order->getOrderNo(), 10); // 総合計金額 diff --git a/src/Eccube/Service/PluginService.php b/src/Eccube/Service/PluginService.php index fe3757a4344..940d170c073 100644 --- a/src/Eccube/Service/PluginService.php +++ b/src/Eccube/Service/PluginService.php @@ -62,17 +62,17 @@ class PluginService */ protected $composerService; - const VENDOR_NAME = 'ec-cube'; + public const VENDOR_NAME = 'ec-cube'; /** * Plugin type/library of ec-cube */ - const ECCUBE_LIBRARY = 1; + public const ECCUBE_LIBRARY = 1; /** * Plugin type/library of other (except ec-cube) */ - const OTHER_LIBRARY = 2; + public const OTHER_LIBRARY = 2; /** * @var string %kernel.project_dir% @@ -727,7 +727,7 @@ public function update(Plugin $plugin, $path) $this->cacheUtil->clearCache(); $tmp = $this->createTempDir(); - $this->unpackPluginArchive($path, $tmp); //一旦テンポラリに展開 + $this->unpackPluginArchive($path, $tmp); // 一旦テンポラリに展開 $this->checkPluginArchiveContent($tmp); $config = $this->readConfig($tmp); diff --git a/src/Eccube/Service/PurchaseFlow/ProcessResult.php b/src/Eccube/Service/PurchaseFlow/ProcessResult.php index 11c97a8f7c9..b9ed59951a9 100644 --- a/src/Eccube/Service/PurchaseFlow/ProcessResult.php +++ b/src/Eccube/Service/PurchaseFlow/ProcessResult.php @@ -15,9 +15,9 @@ class ProcessResult { - const ERROR = 'ERROR'; - const WARNING = 'WARNING'; - const SUCCESS = 'SUCCESS'; + public const ERROR = 'ERROR'; + public const WARNING = 'WARNING'; + public const SUCCESS = 'SUCCESS'; protected $type; diff --git a/src/Eccube/Service/PurchaseFlow/PurchaseContext.php b/src/Eccube/Service/PurchaseFlow/PurchaseContext.php index 2aa85fe6842..184f514d9ec 100644 --- a/src/Eccube/Service/PurchaseFlow/PurchaseContext.php +++ b/src/Eccube/Service/PurchaseFlow/PurchaseContext.php @@ -27,11 +27,11 @@ class PurchaseContext extends \SplObjectStorage private $flowType; - const ORDER_FLOW = 'order'; + public const ORDER_FLOW = 'order'; - const SHOPPING_FLOW = 'shopping'; + public const SHOPPING_FLOW = 'shopping'; - const CART_FLOW = 'cart'; + public const CART_FLOW = 'cart'; public function __construct(ItemHolderInterface $originHolder = null, ?Customer $user = null) { diff --git a/src/Eccube/Service/SystemService.php b/src/Eccube/Service/SystemService.php index c7c8e62a271..983d1a7323b 100644 --- a/src/Eccube/Service/SystemService.php +++ b/src/Eccube/Service/SystemService.php @@ -28,9 +28,9 @@ class SystemService implements EventSubscriberInterface { - const MAINTENANCE_TOKEN_KEY = 'maintenance_token'; - const AUTO_MAINTENANCE = 'auto_maintenance'; - const AUTO_MAINTENANCE_UPDATE = 'auto_maintenance_update'; + public const MAINTENANCE_TOKEN_KEY = 'maintenance_token'; + public const AUTO_MAINTENANCE = 'auto_maintenance'; + public const AUTO_MAINTENANCE_UPDATE = 'auto_maintenance_update'; /** * メンテナンスモードを無効にする場合はtrue diff --git a/src/Eccube/Service/TwoFactorAuthService.php b/src/Eccube/Service/TwoFactorAuthService.php index 00bdda2e59a..fdb7db5c168 100644 --- a/src/Eccube/Service/TwoFactorAuthService.php +++ b/src/Eccube/Service/TwoFactorAuthService.php @@ -26,12 +26,12 @@ class TwoFactorAuthService /** * @var int デフォルトの認証の有効日数 */ - const DEFAULT_EXPIRE_DATE = 14; + public const DEFAULT_EXPIRE_DATE = 14; /** * @var string Cookieに保存する時のキー名 */ - const DEFAULT_COOKIE_NAME = 'eccube_2fa'; + public const DEFAULT_COOKIE_NAME = 'eccube_2fa'; /** * @var ContainerInterface @@ -159,7 +159,7 @@ public function createAuthedCookie($Member) $this->cookieName, // name json_encode($configs), // value ($this->expire == 0 ? 0 : time() + ($this->expire * 24 * 60 * 60)), // expire - $this->request->getBasePath().'/'.$this->eccubeConfig->get('eccube_admin_route'), //path + $this->request->getBasePath().'/'.$this->eccubeConfig->get('eccube_admin_route'), // path null, // domain ($this->eccubeConfig->get('eccube_force_ssl') ? true : false), // secure true, // httpOnly diff --git a/src/Eccube/Stream/Filter/SjisToUtf8EncodingFilter.php b/src/Eccube/Stream/Filter/SjisToUtf8EncodingFilter.php index 904e0462898..4d92c61154a 100644 --- a/src/Eccube/Stream/Filter/SjisToUtf8EncodingFilter.php +++ b/src/Eccube/Stream/Filter/SjisToUtf8EncodingFilter.php @@ -70,11 +70,11 @@ public function filter($in, $out, &$consumed, $closing): int $deferredData = ''; while ($bucket = \stream_bucket_make_writeable($in)) { - $data = $previousData . $bucket->data; + $data = $previousData.$bucket->data; $consumed += $bucket->datalen; while ($this->needsToNarrowEncodingDataScope($data)) { - $deferredData = \substr($data, -1) . $deferredData; + $deferredData = \substr($data, -1).$deferredData; $data = \substr($data, 0, -1); } @@ -87,6 +87,7 @@ public function filter($in, $out, &$consumed, $closing): int $this->buffer = $deferredData; $this->assertBufferSizeIsSmallEnough(); + return $isBucketAppended ? \PSFS_PASS_ON : \PSFS_FEED_ME; } diff --git a/src/Eccube/Twig/Extension/CartServiceExtension.php b/src/Eccube/Twig/Extension/CartServiceExtension.php index 5b7291a1bfa..9a709f48229 100644 --- a/src/Eccube/Twig/Extension/CartServiceExtension.php +++ b/src/Eccube/Twig/Extension/CartServiceExtension.php @@ -15,8 +15,8 @@ use Eccube\Entity\Cart; use Eccube\Service\CartService; -use Twig\TwigFunction; use Twig\Extension\AbstractExtension; +use Twig\TwigFunction; class CartServiceExtension extends AbstractExtension { diff --git a/src/Eccube/Twig/Extension/IgnoreRoutingNotFoundExtension.php b/src/Eccube/Twig/Extension/IgnoreRoutingNotFoundExtension.php index 81958143949..e2cf4f4633c 100644 --- a/src/Eccube/Twig/Extension/IgnoreRoutingNotFoundExtension.php +++ b/src/Eccube/Twig/Extension/IgnoreRoutingNotFoundExtension.php @@ -63,7 +63,8 @@ public function getPath($name, $parameters = [], $relative = false) return $this->generator->generate($name, $parameters, $relative ? UrlGeneratorInterface::RELATIVE_PATH : UrlGeneratorInterface::ABSOLUTE_PATH); } catch (RouteNotFoundException $e) { log_warning($e->getMessage(), ['exception' => $e]); - return $this->generator->generate('homepage', $parameters, $relative ? UrlGeneratorInterface::RELATIVE_PATH : UrlGeneratorInterface::ABSOLUTE_PATH).'404?bind='.$name;; + + return $this->generator->generate('homepage', $parameters, $relative ? UrlGeneratorInterface::RELATIVE_PATH : UrlGeneratorInterface::ABSOLUTE_PATH).'404?bind='.$name; } } diff --git a/src/Eccube/Twig/Extension/TwigIncludeExtension.php b/src/Eccube/Twig/Extension/TwigIncludeExtension.php index 4c70381f4d4..4214756d215 100644 --- a/src/Eccube/Twig/Extension/TwigIncludeExtension.php +++ b/src/Eccube/Twig/Extension/TwigIncludeExtension.php @@ -13,8 +13,8 @@ namespace Eccube\Twig\Extension; -use Twig\TwigFunction; use Twig\Extension\AbstractExtension; +use Twig\TwigFunction; class TwigIncludeExtension extends AbstractExtension { diff --git a/src/Eccube/Util/CacheUtil.php b/src/Eccube/Util/CacheUtil.php index be3b70bdf35..a347e37fa76 100644 --- a/src/Eccube/Util/CacheUtil.php +++ b/src/Eccube/Util/CacheUtil.php @@ -31,7 +31,7 @@ */ class CacheUtil implements EventSubscriberInterface { - const DOCTRINE_APP_CACHE_KEY = 'doctrine.app_cache_pool'; + public const DOCTRINE_APP_CACHE_KEY = 'doctrine.app_cache_pool'; private $clearCacheAfterResponse = false;