From 9e67cede15e545d04314cc1f8104f93cff3f1f4d Mon Sep 17 00:00:00 2001 From: Chihiro Adachi <8196725+chihiro-adachi@users.noreply.github.com> Date: Tue, 15 Jun 2021 08:28:20 +0900 Subject: [PATCH 01/10] =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=89=E5=86=85?= =?UTF-8?q?=E3=81=AE=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E8=A1=A8?= =?UTF-8?q?=E8=A8=98=E3=82=92=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Common/Constant.php | 8 ++-- Controller/Admin/ConfigController.php | 42 +++++++++---------- Resource/template/admin/check_permission.twig | 4 +- .../template/admin/check_plugin_vesrion.twig | 8 ++-- Resource/template/admin/check_source.twig | 4 +- Resource/template/admin/config.twig | 4 +- Resource/template/admin/update_data.twig | 2 +- bin/replace_version.sh | 2 +- composer.json | 4 +- 9 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Common/Constant.php b/Common/Constant.php index e863890..e93be4f 100644 --- a/Common/Constant.php +++ b/Common/Constant.php @@ -11,11 +11,11 @@ * file that was distributed with this source code. */ -namespace Plugin\EccubeUpdater404to405\Common; +namespace Plugin\EccubeUpdater405to406\Common; class Constant { - const FROM_VERSION = '4.0.4'; - const TO_VERSION = '4.0.5'; - const PLUGIN_CODE = 'EccubeUpdater404to405'; + const FROM_VERSION = '4.0.5'; + const TO_VERSION = '4.0.6'; + const PLUGIN_CODE = 'EccubeUpdater405to406'; } diff --git a/Controller/Admin/ConfigController.php b/Controller/Admin/ConfigController.php index 784b297..a2e6801 100644 --- a/Controller/Admin/ConfigController.php +++ b/Controller/Admin/ConfigController.php @@ -11,7 +11,7 @@ * file that was distributed with this source code. */ -namespace Plugin\EccubeUpdater404to405\Controller\Admin; +namespace Plugin\EccubeUpdater405to406\Controller\Admin; use Doctrine\ORM\NonUniqueResultException; use Doctrine\ORM\NoResultException; @@ -25,7 +25,7 @@ use Eccube\Service\Composer\ComposerApiService; use Eccube\Service\PluginApiService; use Eccube\Util\CacheUtil; -use Plugin\EccubeUpdater404to405\Common\Constant as UpdaterConstant; +use Plugin\EccubeUpdater405to406\Common\Constant as UpdaterConstant; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; use Symfony\Bundle\FrameworkBundle\Console\Application; use Symfony\Component\Console\Input\ArrayInput; @@ -118,8 +118,8 @@ public function __construct( } /** - * @Route("/%eccube_admin_route%/eccube_updater_404_to_405/config", name="eccube_updater404to405_admin_config") - * @Template("@EccubeUpdater404to405/admin/config.twig") + * @Route("/%eccube_admin_route%/eccube_updater_405_to_406/config", name="eccube_updater405to406_admin_config") + * @Template("@EccubeUpdater405to406/admin/config.twig") */ public function index(Request $request) { @@ -141,8 +141,8 @@ public function index(Request $request) /** * プラグインのEC-CUBE対応バージョンのチェックを行う. * - * @Route("/%eccube_admin_route%/eccube_updater_404_to_405/check_plugin_version", name="eccube_updater404to405_admin_check_plugin_version") - * @Template("@EccubeUpdater404to405/admin/check_plugin_vesrion.twig") + * @Route("/%eccube_admin_route%/eccube_updater_405_to_406/check_plugin_version", name="eccube_updater405to406_admin_check_plugin_version") + * @Template("@EccubeUpdater405to406/admin/check_plugin_vesrion.twig") */ public function checkPluginVersion(Request $request) { @@ -170,8 +170,8 @@ public function checkPluginVersion(Request $request) /** * ファイルの書き込み権限チェックを行う. * - * @Route("/%eccube_admin_route%/eccube_updater_404_to_405/check_permission", name="eccube_updater404to405_admin_check_permission", methods={"POST"}) - * @Template("@EccubeUpdater404to405/admin/check_permission.twig") + * @Route("/%eccube_admin_route%/eccube_updater_405_to_406/check_permission", name="eccube_updater405to406_admin_check_permission", methods={"POST"}) + * @Template("@EccubeUpdater405to406/admin/check_permission.twig") */ public function checkPermission(Request $request, Filesystem $fs) { @@ -223,8 +223,8 @@ public function checkPermission(Request $request, Filesystem $fs) /** * 更新ファイルの競合を確認する. * - * @Route("/%eccube_admin_route%/eccube_updater_404_to_405/check_source", name="eccube_updater404to405_admin_check_source", methods={"POST"}) - * @Template("@EccubeUpdater404to405/admin/check_source.twig") + * @Route("/%eccube_admin_route%/eccube_updater_405_to_406/check_source", name="eccube_updater405to406_admin_check_source", methods={"POST"}) + * @Template("@EccubeUpdater405to406/admin/check_source.twig") */ public function checkSource(Request $request) { @@ -280,7 +280,7 @@ public function checkSource(Request $request) /** * ファイルを上書きする. * - * @Route("/%eccube_admin_route%/eccube_updater_404_to_405/update_files", name="eccube_updater404to405_admin_update_files", methods={"POST"}) + * @Route("/%eccube_admin_route%/eccube_updater_405_to_406/update_files", name="eccube_updater405to406_admin_update_files", methods={"POST"}) */ public function updateFiles(Request $request, CacheUtil $cacheUtil) { @@ -308,12 +308,12 @@ public function updateFiles(Request $request, CacheUtil $cacheUtil) $cacheUtil->clearCache(); - return $this->redirectToRoute('eccube_updater404to405_admin_dump_autoload'); + return $this->redirectToRoute('eccube_updater405to406_admin_dump_autoload'); } /** * @see https://github.com/EC-CUBE/ec-cube/pull/4117 - * @Route("/%eccube_admin_route%/eccube_updater_404_to_405/dump_autoload", name="eccube_updater404to405_admin_dump_autoload") + * @Route("/%eccube_admin_route%/eccube_updater_405_to_406/dump_autoload", name="eccube_updater405to406_admin_dump_autoload") */ public function dumpAutoload(CacheUtil $cacheUtil) { @@ -331,12 +331,12 @@ public function dumpAutoload(CacheUtil $cacheUtil) $cacheUtil->clearCache(); - return $this->redirectToRoute('eccube_updater404to405_admin_gen_proxy'); + return $this->redirectToRoute('eccube_updater405to406_admin_gen_proxy'); } /** * @see https://github.com/EC-CUBE/ec-cube/pull/4117 - * @Route("/%eccube_admin_route%/eccube_updater_404_to_405/gen_proxy", name="eccube_updater404to405_admin_gen_proxy") + * @Route("/%eccube_admin_route%/eccube_updater_405_to_406/gen_proxy", name="eccube_updater405to406_admin_gen_proxy") */ public function generateProxy(CacheUtil $cacheUtil) { @@ -352,7 +352,7 @@ public function generateProxy(CacheUtil $cacheUtil) $cacheUtil->clearCache(); - return $this->redirectToRoute('eccube_updater404to405_admin_update_data'); + return $this->redirectToRoute('eccube_updater405to406_admin_update_data'); } /** @@ -365,8 +365,8 @@ public function generateProxy(CacheUtil $cacheUtil) * - スキーマアップデート * - マイグレーション * - * @Route("/%eccube_admin_route%/eccube_updater_404_to_405/update_data", name="eccube_updater404to405_admin_update_data") - * @Template("@EccubeUpdater404to405/admin/update_data.twig") + * @Route("/%eccube_admin_route%/eccube_updater_405_to_406/update_data", name="eccube_updater405to406_admin_update_data") + * @Template("@EccubeUpdater405to406/admin/update_data.twig") */ public function updateData(Request $request, CacheUtil $cacheUtil) { @@ -397,7 +397,7 @@ public function updateData(Request $request, CacheUtil $cacheUtil) $cacheUtil->clearCache(); - return $this->redirectToRoute('eccube_updater404to405_admin_complete'); + return $this->redirectToRoute('eccube_updater405to406_admin_complete'); } return [ @@ -408,8 +408,8 @@ public function updateData(Request $request, CacheUtil $cacheUtil) /** * 完了画面を表示. * - * @Route("/%eccube_admin_route%/eccube_updater_404_to_405/complete", name="eccube_updater404to405_admin_complete") - * @Template("@EccubeUpdater404to405/admin/complete.twig") + * @Route("/%eccube_admin_route%/eccube_updater_405_to_406/complete", name="eccube_updater405to406_admin_complete") + * @Template("@EccubeUpdater405to406/admin/complete.twig") */ public function complete() { diff --git a/Resource/template/admin/check_permission.twig b/Resource/template/admin/check_permission.twig index f813982..24acce5 100644 --- a/Resource/template/admin/check_permission.twig +++ b/Resource/template/admin/check_permission.twig @@ -44,13 +44,13 @@