From a307a61cdeaf776de7d77a4cdbea76b6e5128371 Mon Sep 17 00:00:00 2001 From: "takumi.tokoro" Date: Mon, 3 Aug 2026 14:44:51 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix(ci):=20=E5=BB=83=E6=AD=A2=E3=81=95?= =?UTF-8?q?=E3=82=8C=E3=81=9F=20actions/cache@v1=20=E3=81=A8=20::set-outpu?= =?UTF-8?q?t=20=E3=82=92=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GitHub 側で actions/cache v1 が廃止され、ワークフローが自動的に失敗する ようになったため、本ブランチの CI が全ジョブ failure になっていた。 ##[error]This request has been automatically failed because it uses a deprecated version of `actions/cache: v1`. - actions/cache@v1 → @v4 - ::set-output → $GITHUB_OUTPUT（同じく非推奨のため合わせて更新） Co-Authored-By: Claude Opus 5 (1M context) --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 85fd0b5..6a9d380 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -103,8 +103,8 @@ jobs: - name: Get Composer Cache Directory id: composer-cache run: | - echo "::set-output name=dir::$(composer config cache-files-dir)" - - uses: actions/cache@v1 + echo "dir=$(composer config cache-files-dir)" >> "$GITHUB_OUTPUT" + - uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} From d12e1c67612148bf893daafef57114d9bd01cd38 Mon Sep 17 00:00:00 2001 From: "takumi.tokoro" Date: Mon, 3 Aug 2026 14:54:50 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix(test):=20decimal=20=E3=82=AB=E3=83=A9?= =?UTF-8?q?=E3=83=A0=E3=81=AE=E6=AF=94=E8=BC=83=E3=82=92=20assertEquals=20?= =?UTF-8?q?=E3=81=AB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit EC-CUBE 4.3 との組み合わせで 6 テストが失敗していた。decimal カラムは Doctrine が文字列で返すため、verify() (assertSame) では型が一致しない。 CouponServiceTest::testRecalcOrderDiscountRate Failed asserting that '623.00' is identical to 623. CouponControllerTest::testShoppingCoupon Failed asserting that '-100.00' is identical to -100.0. 金額の等価性を検証したいだけなので、数値等価 (assertEquals) に変更する。 4.4 対応ブランチ (#197) でも同じ方針で対応している。 - Tests/Service/CouponServiceTest.php (2 箇所) - Tests/Web/CouponControllerTest.php (4 箇所) Co-Authored-By: Claude Opus 5 (1M context) --- Tests/Service/CouponServiceTest.php | 6 ++++-- Tests/Web/CouponControllerTest.php | 12 ++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Tests/Service/CouponServiceTest.php b/Tests/Service/CouponServiceTest.php index d2cf24d..a93a754 100644 --- a/Tests/Service/CouponServiceTest.php +++ b/Tests/Service/CouponServiceTest.php @@ -387,7 +387,8 @@ public function testRecalcOrderDiscountRate() $this->actual = $discount; $this->expected = (int) round(round($total) * $discountRate / 100); - $this->verify(); + // decimal カラムは Doctrine が文字列で返すため数値等価で比較する + self::assertEquals($this->expected, $this->actual); } /** @@ -449,7 +450,8 @@ public function testRecalcOrderWithTaxRateIsEmpty() $this->actual = $discount; $this->expected = (int) round(round($total) * $discountRate / 100); - $this->verify(); + // decimal カラムは Doctrine が文字列で返すため数値等価で比較する + self::assertEquals($this->expected, $this->actual); } /** diff --git a/Tests/Web/CouponControllerTest.php b/Tests/Web/CouponControllerTest.php index 99b5d0e..f25d3d0 100644 --- a/Tests/Web/CouponControllerTest.php +++ b/Tests/Web/CouponControllerTest.php @@ -164,7 +164,8 @@ public function testShoppingCoupon() $this->expected = round(0 - $Coupon->getDiscountPrice(), 2); $this->actual = $Order->getItems()->getDiscounts()->first()->getPrice(); - $this->verify(); + // decimal カラムは Doctrine が文字列で返すため数値等価で比較する + self::assertEquals($this->expected, $this->actual); } /** @@ -259,7 +260,8 @@ public function testShoppingCouponDiscountTypePrice() $this->actual = $Coupon->getDiscountPrice(); $this->expected = 0 - $Order->getItems()->getDiscounts()->first()->getPrice(); - $this->verify(); + // decimal カラムは Doctrine が文字列で返すため数値等価で比較する + self::assertEquals($this->expected, $this->actual); } /** @@ -300,7 +302,8 @@ public function testShoppingCouponDiscountTypeRate() $this->actual = $CouponOrder->getDiscount(); $this->expected = 0 - $Order->getItems()->getDiscounts()->first()->getPrice(); - $this->verify(); + // decimal カラムは Doctrine が文字列で返すため数値等価で比較する + self::assertEquals($this->expected, $this->actual); } /** @@ -358,7 +361,8 @@ public function testCompleteWithNonmember() $this->actual = $Coupon->getDiscountPrice(); $this->expected = 0 - $Order->getItems()->getDiscounts()->first()->getPrice(); - $this->verify(); + // decimal カラムは Doctrine が文字列で返すため数値等価で比較する + self::assertEquals($this->expected, $this->actual); } /** From debb4b28352b74b219b359379033ed2b2f376405 Mon Sep 17 00:00:00 2001 From: "takumi.tokoro" Date: Mon, 3 Aug 2026 14:55:27 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20Bootstrap=205=20=E3=81=AB=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E3=81=97=E3=81=AA=E3=81=84=20mr-2=20/=20mr-3=20?= =?UTF-8?q?=E3=82=92=20me-2=20/=20me-3=20=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 管理画面のクーポン登録画面で、Bootstrap 4 の右マージンユーティリティ (mr-*) が残っており、スタイルが当たっていなかった。Bootstrap 5 では me-* にリネームされている。 - Resource/template/admin/regist.twig (411 / 450 / 473 行) - Resource/template/admin/regist_product_list_prototype.twig - Resource/template/admin/regist_category_list_prototype.twig admin の bootstrap.css に .mr-2 のルールは存在せず (.me-2 は存在する) 、 同じ regist.twig の 391 行だけが me-2 で不統一だった。 Co-Authored-By: Claude Opus 5 (1M context) --- Resource/template/admin/regist.twig | 6 +++--- Resource/template/admin/regist_category_list_prototype.twig | 2 +- Resource/template/admin/regist_product_list_prototype.twig | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Resource/template/admin/regist.twig b/Resource/template/admin/regist.twig index 1bf01d9..a325b41 100644 --- a/Resource/template/admin/regist.twig +++ b/Resource/template/admin/regist.twig @@ -408,7 +408,7 @@
- +
@@ -447,7 +447,7 @@
- カテゴリの追加 + カテゴリの追加
- +
diff --git a/Resource/template/admin/regist_category_list_prototype.twig b/Resource/template/admin/regist_category_list_prototype.twig index a12d419..42bb164 100644 --- a/Resource/template/admin/regist_category_list_prototype.twig +++ b/Resource/template/admin/regist_category_list_prototype.twig @@ -13,7 +13,7 @@
- +
diff --git a/Resource/template/admin/regist_product_list_prototype.twig b/Resource/template/admin/regist_product_list_prototype.twig index b182916..c511625 100644 --- a/Resource/template/admin/regist_product_list_prototype.twig +++ b/Resource/template/admin/regist_product_list_prototype.twig @@ -14,7 +14,7 @@
- +