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') }} 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 @@
- +
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); } /**