From 5bcae62b72aabcb5a29b94b9fbd7a7dcb3d6fb79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=A0=20=E6=81=A9=E6=A8=B9?= <eunsoo_ji@ec-cube.co.jp>
Date: Tue, 16 Apr 2024 13:38:15 +0900
Subject: [PATCH 1/9] =?UTF-8?q?=E5=85=A5=E5=8A=9B=E5=80=A4=E3=82=92?=
 =?UTF-8?q?=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Store/OwnerStoreController.php      | 45 +++++++++++++++----
 .../Web/Admin/Store/PluginControllerTest.php  | 39 ++++++++++++++++
 2 files changed, 76 insertions(+), 8 deletions(-)

diff --git a/src/Eccube/Controller/Admin/Store/OwnerStoreController.php b/src/Eccube/Controller/Admin/Store/OwnerStoreController.php
index 9fe068412ab..f12db37a77f 100644
--- a/src/Eccube/Controller/Admin/Store/OwnerStoreController.php
+++ b/src/Eccube/Controller/Admin/Store/OwnerStoreController.php
@@ -32,6 +32,8 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 /**
  * @Route("/%eccube_admin_route%/store/plugin/api")
@@ -48,6 +50,11 @@ class OwnerStoreController extends AbstractController
      */
     protected $pluginService;
 
+    /**
+     * @var ValidatorInterface
+     */
+    protected ValidatorInterface $validator;
+
     /**
      * @var ComposerServiceInterface
      */
@@ -81,6 +88,7 @@ class OwnerStoreController extends AbstractController
      * @param PluginApiService $pluginApiService
      * @param BaseInfoRepository $baseInfoRepository
      * @param CacheUtil $cacheUtil
+     * @param ValidatorInterface $validatorInterface
      *
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
@@ -92,7 +100,8 @@ public function __construct(
         SystemService $systemService,
         PluginApiService $pluginApiService,
         BaseInfoRepository $baseInfoRepository,
-        CacheUtil $cacheUtil
+        CacheUtil $cacheUtil,
+        ValidatorInterface $validatorInterface
     ) {
         $this->pluginRepository = $pluginRepository;
         $this->pluginService = $pluginService;
@@ -100,6 +109,7 @@ public function __construct(
         $this->pluginApiService = $pluginApiService;
         $this->BaseInfo = $baseInfoRepository->get();
         $this->cacheUtil = $cacheUtil;
+        $this->validator = $validatorInterface;
 
         // TODO: Check the flow of the composer service below
         $this->composerService = $composerService;
@@ -263,13 +273,32 @@ public function apiInstall(Request $request)
 
         $pluginCode = $request->get('pluginCode');
 
-        try {
-            $log = $this->composerService->execRequire('ec-cube/'.$pluginCode);
-
-            return $this->json(['success' => true, 'log' => $log]);
-        } catch (\Exception $e) {
-            $log = $e->getMessage();
-            log_error($e);
+        $errors = $this->validator->validate(
+            $pluginCode,
+            [
+                new Assert\NotBlank(),
+                new Assert\Regex(
+                    [
+                        'pattern' => '/^[a-zA-Z0-9_]+$/',
+                    ]
+                ),
+            ]
+        );
+
+        if ($errors->count() != 0) {
+            $log = [];
+            foreach ($errors as $error) {
+                $log[] = $error->getMessage();
+            }
+        } else {
+            try {
+                $log = $this->composerService->execRequire('ec-cube/'.$pluginCode);
+    
+                return $this->json(['success' => true, 'log' => $log]);
+            } catch (\Exception $e) {
+                $log = $e->getMessage();
+                log_error($e);
+            }
         }
 
         return $this->json(['success' => false, 'log' => $log], 500);
diff --git a/tests/Eccube/Tests/Web/Admin/Store/PluginControllerTest.php b/tests/Eccube/Tests/Web/Admin/Store/PluginControllerTest.php
index 4bfdee3a80e..e661b5e4196 100644
--- a/tests/Eccube/Tests/Web/Admin/Store/PluginControllerTest.php
+++ b/tests/Eccube/Tests/Web/Admin/Store/PluginControllerTest.php
@@ -49,4 +49,43 @@ public function testSubmit()
         $this->actual = $this->entityManager->getRepository(\Eccube\Entity\BaseInfo::class)->get()->getPhpPath();
         $this->verify();
     }
+
+    /**
+     * 異常系を確認。正常系のインストールはE2Eテストの方で実施
+     *
+     * @dataProvider OwnerStoreInstallParam
+     * 
+     */
+    public function testFailureInstall($param1, $param2, $message)
+    {
+        $form = [
+            'pluginCode' => $param1,
+            'version' => $param2,
+        ];
+
+        $crawler = $this->client->request('POST',
+            $this->generateUrl('admin_store_plugin_api_install', $form),
+            [],
+            [],
+            [
+                'HTTP_X-Requested-With' => 'XMLHttpRequest',
+                'CONTENT_TYPE' => 'application/json',
+            ]
+        );
+        //　ダウンロードできないことを確認
+        $this->assertEquals(500, $this->client->getResponse()->getStatusCode());
+        //　ログを確認
+        $this->assertContains($message, json_decode($this->client->getResponse()->getContent())->log);
+    }
+
+    /**
+     * 異常系のテストケース
+     */
+    public function OwnerStoreInstallParam()
+    {
+        return [
+            ['api42+symfony/yaml:5.3', '4.2.3', '有効な値ではありません。'],
+            ['', '4.2.3','入力されていません。'],
+        ];
+    }
 }

From b6ac03f2000df38a5599f1719e654b11c684e7dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=A0=20=E6=81=A9=E6=A8=B9?= <eunsoo_ji@ec-cube.co.jp>
Date: Tue, 16 Apr 2024 16:29:42 +0900
Subject: [PATCH 2/9] =?UTF-8?q?wait=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 codeception/acceptance/EA03ProductCest.php | 16 ++++++++++++++++
 codeception/acceptance/EA04OrderCest.php   |  7 ++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/codeception/acceptance/EA03ProductCest.php b/codeception/acceptance/EA03ProductCest.php
index 5db3e4562a9..ffa33463e1e 100644
--- a/codeception/acceptance/EA03ProductCest.php
+++ b/codeception/acceptance/EA03ProductCest.php
@@ -1129,27 +1129,39 @@ public function product_一覧からの規格編集_規格あり_重複在庫の
             ->検索($Product->getName())
             ->検索結果_選択(1);
 
+        $I->wait(5);
+
         ProductEditPage::at($I)
             ->規格管理();
 
+        $I->wait(5);
+
         ProductClassEditPage::at($I)
             ->入力_在庫数無制限(1)
             ->登録();
 
+        $I->wait(5);
+
         ProductClassEditPage::at($I)
             ->無効_在庫数無制限(1)
             ->入力_個数(1, 100)
             ->登録();
 
+        $I->wait(5);
+
         ProductClassEditPage::at($I)
             ->無効_規格(1)
             ->登録();
 
+        $I->wait(5);
+
         ProductClassEditPage::at($I)
             ->有効_規格(1)
             ->入力_個数(1, 10)
             ->入力_販売価格(1, 5000)
             ->登録();
+        
+        $I->wait(5);
 
         $I->see('保存しました', ProductClassEditPage::$登録完了メッセージ);
 
@@ -1159,10 +1171,14 @@ public function product_一覧からの規格編集_規格あり_重複在庫の
         $ProductClass = $ProductClasses[0];
         $id = $ProductClass->getId();
 
+        $I->wait(5);
+
         // 該当IDの商品が1つか確認
         $count = $this->conn->fetchOne('SELECT COUNT(*) FROM dtb_product_stock WHERE product_class_id = ?', [$id]);
         $I->assertEquals('1', $count, '該当データは1件です');
 
+        $I->wait(5);
+        
         // 個数のズレがないか確認
         $stock = $this->conn->fetchOne('SELECT stock FROM dtb_product_stock WHERE product_class_id = ?', [$id]);
         $I->assertEquals('10', $stock, 'Stockが一致');
diff --git a/codeception/acceptance/EA04OrderCest.php b/codeception/acceptance/EA04OrderCest.php
index 8cfc0928ca4..ee3976d1031 100644
--- a/codeception/acceptance/EA04OrderCest.php
+++ b/codeception/acceptance/EA04OrderCest.php
@@ -222,6 +222,9 @@ public function order_受注削除(AcceptanceTester $I)
         });
 
         $OrderListPage = OrderManagePage::go($I)->検索();
+
+        $I->wait(2);
+
         $I->see('検索結果：'.count($TargetOrders).'件が該当しました', OrderManagePage::$検索結果_メッセージ);
 
         // 削除
@@ -230,7 +233,9 @@ public function order_受注削除(AcceptanceTester $I)
             ->一覧_選択(1)
             ->一覧_削除()
             ->Accept_削除();
-
+        
+        $I->wait(2);
+        
         $I->see('削除しました', ['css' => '#page_admin_order > div > div.c-contentsArea > div.alert.alert-success.alert-dismissible.fade.show.m-3 > span']);
         $I->assertNotEquals($OrderNumForDel, $OrderListPage->一覧_注文番号(1));
 

From a1d78e4db1cb673ef9ab450197a627d9fbf52bd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=A0=20=E6=81=A9=E6=A8=B9?= <eunsoo_ji@ec-cube.co.jp>
Date: Wed, 17 Apr 2024 10:45:17 +0900
Subject: [PATCH 3/9] =?UTF-8?q?Revert=20"wait=E8=BF=BD=E5=8A=A0"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b6ac03f2000df38a5599f1719e654b11c684e7dc.
---
 codeception/acceptance/EA03ProductCest.php | 16 ----------------
 codeception/acceptance/EA04OrderCest.php   |  7 +------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/codeception/acceptance/EA03ProductCest.php b/codeception/acceptance/EA03ProductCest.php
index ffa33463e1e..5db3e4562a9 100644
--- a/codeception/acceptance/EA03ProductCest.php
+++ b/codeception/acceptance/EA03ProductCest.php
@@ -1129,39 +1129,27 @@ public function product_一覧からの規格編集_規格あり_重複在庫の
             ->検索($Product->getName())
             ->検索結果_選択(1);
 
-        $I->wait(5);
-
         ProductEditPage::at($I)
             ->規格管理();
 
-        $I->wait(5);
-
         ProductClassEditPage::at($I)
             ->入力_在庫数無制限(1)
             ->登録();
 
-        $I->wait(5);
-
         ProductClassEditPage::at($I)
             ->無効_在庫数無制限(1)
             ->入力_個数(1, 100)
             ->登録();
 
-        $I->wait(5);
-
         ProductClassEditPage::at($I)
             ->無効_規格(1)
             ->登録();
 
-        $I->wait(5);
-
         ProductClassEditPage::at($I)
             ->有効_規格(1)
             ->入力_個数(1, 10)
             ->入力_販売価格(1, 5000)
             ->登録();
-        
-        $I->wait(5);
 
         $I->see('保存しました', ProductClassEditPage::$登録完了メッセージ);
 
@@ -1171,14 +1159,10 @@ public function product_一覧からの規格編集_規格あり_重複在庫の
         $ProductClass = $ProductClasses[0];
         $id = $ProductClass->getId();
 
-        $I->wait(5);
-
         // 該当IDの商品が1つか確認
         $count = $this->conn->fetchOne('SELECT COUNT(*) FROM dtb_product_stock WHERE product_class_id = ?', [$id]);
         $I->assertEquals('1', $count, '該当データは1件です');
 
-        $I->wait(5);
-        
         // 個数のズレがないか確認
         $stock = $this->conn->fetchOne('SELECT stock FROM dtb_product_stock WHERE product_class_id = ?', [$id]);
         $I->assertEquals('10', $stock, 'Stockが一致');
diff --git a/codeception/acceptance/EA04OrderCest.php b/codeception/acceptance/EA04OrderCest.php
index ee3976d1031..8cfc0928ca4 100644
--- a/codeception/acceptance/EA04OrderCest.php
+++ b/codeception/acceptance/EA04OrderCest.php
@@ -222,9 +222,6 @@ public function order_受注削除(AcceptanceTester $I)
         });
 
         $OrderListPage = OrderManagePage::go($I)->検索();
-
-        $I->wait(2);
-
         $I->see('検索結果：'.count($TargetOrders).'件が該当しました', OrderManagePage::$検索結果_メッセージ);
 
         // 削除
@@ -233,9 +230,7 @@ public function order_受注削除(AcceptanceTester $I)
             ->一覧_選択(1)
             ->一覧_削除()
             ->Accept_削除();
-        
-        $I->wait(2);
-        
+
         $I->see('削除しました', ['css' => '#page_admin_order > div > div.c-contentsArea > div.alert.alert-success.alert-dismissible.fade.show.m-3 > span']);
         $I->assertNotEquals($OrderNumForDel, $OrderListPage->一覧_注文番号(1));
 

From 9e7eae3f2ef5d0bc7f8da18d79f565c84407fefb Mon Sep 17 00:00:00 2001
From: ji-eunsoo <132241702+ji-eunsoo@users.noreply.github.com>
Date: Wed, 17 Apr 2024 11:15:08 +0900
Subject: [PATCH 4/9] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=83=97?=
 =?UTF-8?q?=E3=83=A9=E3=82=B0=E3=82=A4=E3=83=B3=E3=83=90=E3=83=BC=E3=82=B8?=
 =?UTF-8?q?=E3=83=A7=E3=83=B3=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/Eccube/Tests/Web/Admin/Store/PluginControllerTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Eccube/Tests/Web/Admin/Store/PluginControllerTest.php b/tests/Eccube/Tests/Web/Admin/Store/PluginControllerTest.php
index e661b5e4196..ea36307a014 100644
--- a/tests/Eccube/Tests/Web/Admin/Store/PluginControllerTest.php
+++ b/tests/Eccube/Tests/Web/Admin/Store/PluginControllerTest.php
@@ -84,8 +84,8 @@ public function testFailureInstall($param1, $param2, $message)
     public function OwnerStoreInstallParam()
     {
         return [
-            ['api42+symfony/yaml:5.3', '4.2.3', '有効な値ではありません。'],
-            ['', '4.2.3','入力されていません。'],
+            ['api42+symfony/yaml:5.3', '4.3.0', '有効な値ではありません。'],
+            ['', '4.3.0','入力されていません。'],
         ];
     }
 }

From 5c06984eaf54aeb44c2d4c842d0768491af83b6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=A0=20=E6=81=A9=E6=A8=B9?= <eunsoo_ji@ec-cube.co.jp>
Date: Wed, 17 Apr 2024 15:51:08 +0900
Subject: [PATCH 5/9] =?UTF-8?q?=E3=82=A2=E3=83=83=E3=83=97=E3=83=87?=
 =?UTF-8?q?=E3=83=BC=E3=83=88=E3=81=AB=E5=85=A5=E5=8A=9B=E5=80=A4=E3=81=AE?=
 =?UTF-8?q?=E5=88=B6=E9=99=90=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Store/OwnerStoreController.php      | 52 ++++++++++++++++---
 .../Web/Admin/Store/PluginControllerTest.php  | 46 +++++++++++++++-
 2 files changed, 90 insertions(+), 8 deletions(-)

diff --git a/src/Eccube/Controller/Admin/Store/OwnerStoreController.php b/src/Eccube/Controller/Admin/Store/OwnerStoreController.php
index f12db37a77f..7a3cf241dcd 100644
--- a/src/Eccube/Controller/Admin/Store/OwnerStoreController.php
+++ b/src/Eccube/Controller/Admin/Store/OwnerStoreController.php
@@ -372,13 +372,53 @@ public function apiUpgrade(Request $request)
         $pluginCode = $request->get('pluginCode');
         $version = $request->get('version');
 
-        try {
-            $log = $this->composerService->execRequire('ec-cube/'.$pluginCode.':'.$version);
+        $log = [];
+        
+        $errors = $this->validator->validate(
+            $pluginCode,
+            [
+                new Assert\NotBlank(),
+                new Assert\Regex(
+                    [
+                        'pattern' => '/^[a-zA-Z0-9_]+$/',
+                    ]
+                ),
+            ]
+        );
 
-            return $this->json(['success' => true, 'log' => $log]);
-        } catch (\Exception $e) {
-            $log = $e->getMessage();
-            log_error($e);
+        if ($errors->count() != 0) {
+            foreach ($errors as $error) {
+                $log[] = $pluginCode.':'.$error->getMessage();
+            }
+        }
+
+        $errors = $this->validator->validate(
+            $version,
+            [
+                new Assert\NotBlank(),
+                new Assert\Regex(
+                    [
+                        'pattern' => '/^[0-9.]+$/',
+                    ]
+                ),
+            ]
+        );
+
+        if ($errors->count() != 0) {
+            foreach ($errors as $error) {
+                $log[] = $version.':'.$error->getMessage();
+            }
+        }
+
+        if (empty($log)) {
+            try {
+                $log = $this->composerService->execRequire('ec-cube/'.$pluginCode.':'.$version);
+
+                return $this->json(['success' => true, 'log' => $log]);
+            } catch (\Exception $e) {
+                $log = $e->getMessage();
+                log_error($e);
+            }
         }
 
         return $this->json(['success' => false, 'log' => $log], 500);
diff --git a/tests/Eccube/Tests/Web/Admin/Store/PluginControllerTest.php b/tests/Eccube/Tests/Web/Admin/Store/PluginControllerTest.php
index ea36307a014..95fdf68cc6d 100644
--- a/tests/Eccube/Tests/Web/Admin/Store/PluginControllerTest.php
+++ b/tests/Eccube/Tests/Web/Admin/Store/PluginControllerTest.php
@@ -77,6 +77,35 @@ public function testFailureInstall($param1, $param2, $message)
         //　ログを確認
         $this->assertContains($message, json_decode($this->client->getResponse()->getContent())->log);
     }
+    
+    /**
+     * 異常系を確認。正常系のアップデートはE2Eテストの方で実施
+     *
+     * @dataProvider OwnerStoreUpgradeParam
+     * 
+     */
+    public function testFailureUpgrade($param1, $param2, $message)
+    {
+        $form = [
+            'pluginCode' => $param1,
+            'version' => $param2,
+        ];
+
+        $crawler = $this->client->request('POST',
+            $this->generateUrl('admin_store_plugin_api_upgrade', $form),
+            [],
+            [],
+            [
+                'HTTP_X-Requested-With' => 'XMLHttpRequest',
+                'CONTENT_TYPE' => 'application/json',
+            ]
+        );
+        //　ダウンロードできないことを確認
+        $this->assertEquals(500, $this->client->getResponse()->getStatusCode());
+
+        //　ログを確認
+        $this->assertStringContainsString($message, implode(',', json_decode($this->client->getResponse()->getContent())->log));
+    }
 
     /**
      * 異常系のテストケース
@@ -84,8 +113,21 @@ public function testFailureInstall($param1, $param2, $message)
     public function OwnerStoreInstallParam()
     {
         return [
-            ['api42+symfony/yaml:5.3', '4.3.0', '有効な値ではありません。'],
-            ['', '4.3.0','入力されていません。'],
+            ['api42+symfony/yaml:5.3', '4.2.3', '有効な値ではありません。'],
+            ['', '4.2.3','入力されていません。'],
+        ];
+    }
+
+    /**
+     * 異常系のテストケース
+     */
+    public function OwnerStoreUpgradeParam()
+    {
+        return [
+            ['api42+symfony/yaml:5.3', '4.2.3', '有効な値ではありません。'],
+            ['api42', '4.2.3 symfony/yaml:5.3', '有効な値ではありません。'],
+            ['api42', '','入力されていません。'],
+            ['', '4.2.3','入力されていません。'],
         ];
     }
 }

From d1c6522ca4d229a11a7ff541b3b135414fcb2c13 Mon Sep 17 00:00:00 2001
From: ji-eunsoo <132241702+ji-eunsoo@users.noreply.github.com>
Date: Wed, 17 Apr 2024 15:58:46 +0900
Subject: [PATCH 6/9] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=83=97?=
 =?UTF-8?q?=E3=83=A9=E3=82=B0=E3=82=A4=E3=83=B3=E3=83=90=E3=83=BC=E3=82=B8?=
 =?UTF-8?q?=E3=83=A7=E3=83=B3=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Eccube/Tests/Web/Admin/Store/PluginControllerTest.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/Eccube/Tests/Web/Admin/Store/PluginControllerTest.php b/tests/Eccube/Tests/Web/Admin/Store/PluginControllerTest.php
index 95fdf68cc6d..4b10afb1102 100644
--- a/tests/Eccube/Tests/Web/Admin/Store/PluginControllerTest.php
+++ b/tests/Eccube/Tests/Web/Admin/Store/PluginControllerTest.php
@@ -114,7 +114,7 @@ public function OwnerStoreInstallParam()
     {
         return [
             ['api42+symfony/yaml:5.3', '4.2.3', '有効な値ではありません。'],
-            ['', '4.2.3','入力されていません。'],
+            ['', '4.3.0','入力されていません。'],
         ];
     }
 
@@ -124,10 +124,10 @@ public function OwnerStoreInstallParam()
     public function OwnerStoreUpgradeParam()
     {
         return [
-            ['api42+symfony/yaml:5.3', '4.2.3', '有効な値ではありません。'],
-            ['api42', '4.2.3 symfony/yaml:5.3', '有効な値ではありません。'],
+            ['api42+symfony/yaml:5.3', '4.3.0', '有効な値ではありません。'],
+            ['api42', '4.3.0 symfony/yaml:5.3', '有効な値ではありません。'],
             ['api42', '','入力されていません。'],
-            ['', '4.2.3','入力されていません。'],
+            ['', '4.3.0','入力されていません。'],
         ];
     }
 }

From 28864c354f4dbdb768fd8bece5e4b3db2ed76b06 Mon Sep 17 00:00:00 2001
From: ji-eunsoo <132241702+ji-eunsoo@users.noreply.github.com>
Date: Wed, 17 Apr 2024 16:01:15 +0900
Subject: [PATCH 7/9] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=83=97?=
 =?UTF-8?q?=E3=83=A9=E3=82=B0=E3=82=A4=E3=83=B3=E3=83=90=E3=83=BC=E3=82=B8?=
 =?UTF-8?q?=E3=83=A7=E3=83=B3=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/Eccube/Tests/Web/Admin/Store/PluginControllerTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Eccube/Tests/Web/Admin/Store/PluginControllerTest.php b/tests/Eccube/Tests/Web/Admin/Store/PluginControllerTest.php
index 4b10afb1102..802bc6f9baf 100644
--- a/tests/Eccube/Tests/Web/Admin/Store/PluginControllerTest.php
+++ b/tests/Eccube/Tests/Web/Admin/Store/PluginControllerTest.php
@@ -113,7 +113,7 @@ public function testFailureUpgrade($param1, $param2, $message)
     public function OwnerStoreInstallParam()
     {
         return [
-            ['api42+symfony/yaml:5.3', '4.2.3', '有効な値ではありません。'],
+            ['api42+symfony/yaml:5.3', '4.3.0', '有効な値ではありません。'],
             ['', '4.3.0','入力されていません。'],
         ];
     }

From 81124f66a5ec4e2b06118341a142ed57e96b26a6 Mon Sep 17 00:00:00 2001
From: ji-eunsoo <132241702+ji-eunsoo@users.noreply.github.com>
Date: Thu, 18 Apr 2024 15:09:33 +0900
Subject: [PATCH 8/9] =?UTF-8?q?=E5=A4=96=E9=83=A8=E3=81=8B=E3=82=89?=
 =?UTF-8?q?=E3=81=AE=E5=85=A5=E5=8A=9B=E5=80=A4=E3=81=AE=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Eccube/Controller/Admin/Store/OwnerStoreController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Eccube/Controller/Admin/Store/OwnerStoreController.php b/src/Eccube/Controller/Admin/Store/OwnerStoreController.php
index 7a3cf241dcd..de3c9b352e4 100644
--- a/src/Eccube/Controller/Admin/Store/OwnerStoreController.php
+++ b/src/Eccube/Controller/Admin/Store/OwnerStoreController.php
@@ -388,7 +388,7 @@ public function apiUpgrade(Request $request)
 
         if ($errors->count() != 0) {
             foreach ($errors as $error) {
-                $log[] = $pluginCode.':'.$error->getMessage();
+                $log[] = $error->getMessage();
             }
         }
 
@@ -406,7 +406,7 @@ public function apiUpgrade(Request $request)
 
         if ($errors->count() != 0) {
             foreach ($errors as $error) {
-                $log[] = $version.':'.$error->getMessage();
+                $log[] = $error->getMessage();
             }
         }
 

From a986ef2146ca407610812c04a1f7bef6aafda6d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=A0=20=E6=81=A9=E6=A8=B9?= <eunsoo_ji@ec-cube.co.jp>
Date: Tue, 23 Jul 2024 13:05:45 +0900
Subject: [PATCH 9/9] =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7?=
 =?UTF-8?q?=E3=83=B3=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json              | 4 ++--
 package.json                   | 2 +-
 src/Eccube/Common/Constant.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 249f78bcda0..caf3698ce19 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "eccube",
-  "version": "4.3.0-rc",
+  "version": "4.3.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "eccube",
-      "version": "4.3.0-rc",
+      "version": "4.3.0",
       "license": "GPL-2.0",
       "dependencies": {
         "@babel/polyfill": "^7.12.1",
diff --git a/package.json b/package.json
index c49fe8cbec5..86e78ce6fab 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eccube",
-  "version": "4.3.0-rc",
+  "version": "4.3.0",
   "description": "EC-CUBE EC open platform.",
   "main": "index.js",
   "directories": {
diff --git a/src/Eccube/Common/Constant.php b/src/Eccube/Common/Constant.php
index 39f63df52d7..0904a95e306 100644
--- a/src/Eccube/Common/Constant.php
+++ b/src/Eccube/Common/Constant.php
@@ -18,7 +18,7 @@ class Constant
     /**
      * EC-CUBE VERSION.
      */
-    public const VERSION = '4.3.0-rc';
+    public const VERSION = '4.3.0';
 
     /**
      * Enable value.