From b9fa05626257ad56175b7549f7c48a4403b84f85 Mon Sep 17 00:00:00 2001 From: Khalil Bouzidi Date: Wed, 13 Mar 2024 07:03:46 +0100 Subject: [PATCH 1/4] fix tests --- tests/CouponManagerTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/CouponManagerTest.php b/tests/CouponManagerTest.php index f05c454..a95cb31 100644 --- a/tests/CouponManagerTest.php +++ b/tests/CouponManagerTest.php @@ -87,8 +87,8 @@ 'code' => 'SINGLEUSE10', 'discount' => 10, 'singleUse' => true, - 'startDate' => '2024-02-01', - 'endDate' => '2024-02-28', + 'startDate' => now(), + 'endDate' => now()->addMonth(), ]; $this->couponManager->add($coupon); @@ -102,8 +102,8 @@ $coupon = [ 'code' => 'TRACKED20', 'discount' => 20, - 'startDate' => '2024-02-01', - 'endDate' => '2024-02-28', + 'startDate' => now(), + 'endDate' => now()->addMonth(), ]; $this->couponManager->add($coupon); From d8c7f369f83ccde0b1661e31fe59653acf71eab6 Mon Sep 17 00:00:00 2001 From: Khalil Bouzidi Date: Wed, 13 Mar 2024 07:13:01 +0100 Subject: [PATCH 2/4] update run-tests.yml --- .github/workflows/run-tests.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index ac011ad..26a6ae5 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -20,10 +20,6 @@ jobs: php: [8.3, 8.2] laravel: [11.*, 10.*] stability: [prefer-lowest, prefer-stable] - include: - - laravel: 10.* - testbench: 8.* - carbon: ^2.63 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} From 87d9ccda46e467ed004d29c6b23dda147580bb57 Mon Sep 17 00:00:00 2001 From: Khalil Bouzidi Date: Wed, 13 Mar 2024 07:20:09 +0100 Subject: [PATCH 3/4] update run-tests.yml --- .github/workflows/run-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 26a6ae5..3f33ba3 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -20,6 +20,9 @@ jobs: php: [8.3, 8.2] laravel: [11.*, 10.*] stability: [prefer-lowest, prefer-stable] + testbench: [8.*] + include: + - carbon: ^2.63 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} From 4feccc1d89055fb169ec0edff0db1637c932f331 Mon Sep 17 00:00:00 2001 From: Khalil Bouzidi Date: Wed, 13 Mar 2024 07:44:39 +0100 Subject: [PATCH 4/4] fix tests --- .github/workflows/run-tests.yml | 5 +---- composer.json | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 3f33ba3..6e4c249 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -20,9 +20,6 @@ jobs: php: [8.3, 8.2] laravel: [11.*, 10.*] stability: [prefer-lowest, prefer-stable] - testbench: [8.*] - include: - - carbon: ^2.63 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} @@ -44,7 +41,7 @@ jobs: - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.carbon }}" --no-interaction --no-update + composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update composer update --${{ matrix.stability }} --prefer-dist --no-interaction - name: List Installed Dependencies diff --git a/composer.json b/composer.json index f33d0dc..7c9365c 100644 --- a/composer.json +++ b/composer.json @@ -23,8 +23,8 @@ "require-dev": { "laravel/pint": "^1.13.7", "larastan/larastan": "^2.7.0", - "nunomaduro/collision": "^7.10", - "orchestra/testbench": "^8.18", + "nunomaduro/collision": "^7.0|^8.9", + "orchestra/testbench": "^8.21.1|^9.0.0", "pestphp/pest": "^2.30", "pestphp/pest-plugin-arch": "^2.5", "pestphp/pest-plugin-laravel": "^2.2",