From 963bba6d1e7cbe97c735128bac97e322ab64708d Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 20 Sep 2024 10:00:37 +0800 Subject: [PATCH 01/11] [1.x] Supports PHP 8.4 Signed-off-by: Mior Muhammad Zaki --- .github/workflows/tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 77587de5..cbf85774 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: true matrix: - php: [7.3, 7.4, '8.0', 8.1, 8.2, 8.3] + php: [7.3, 7.4, '8.0', 8.1, 8.2, 8.3, 8.4] laravel: [8, 9, 10, 11] exclude: - php: 7.3 @@ -31,6 +31,8 @@ jobs: laravel: 8 - php: 8.3 laravel: 8 + - php: 8.4 + laravel: [8, 9, 10] name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} From d31ed69afde098e1debf440493d00b8ee711e499 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 20 Sep 2024 10:09:15 +0800 Subject: [PATCH 02/11] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/tests.yml | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index cbf85774..dc6f7c78 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,23 +16,22 @@ jobs: strategy: fail-fast: true matrix: - php: [7.3, 7.4, '8.0', 8.1, 8.2, 8.3, 8.4] - laravel: [8, 9, 10, 11] - exclude: + # php: [7.3, 7.4, '8.0', 8.1, 8.2, 8.3, 8.4] + # laravel: [8, 9, 10, 11] + php: [8.2, 8.3] + laravel: [10, 11] + include: - php: 7.3 - laravel: [9, 10, 11] - - php: 7.4 - laravel: [9, 10, 11] - - php: 8.0 - laravel: [10, 11] - - php: 8.1 - laravel: [8, 11] - - php: 8.2 laravel: 8 - - php: 8.3 + - php: 7.4 laravel: 8 + - php: '8.0' + laravel: 9 + - php: 8.1 + laravel: 10 - php: 8.4 - laravel: [8, 9, 10] + laravel: 11 + name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} From dc1be178ea7e31b5b3a30bc1c4a458e6b4c69168 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 20 Sep 2024 10:11:20 +0800 Subject: [PATCH 03/11] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/tests.yml | 1 - composer.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index dc6f7c78..c9b6e164 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -32,7 +32,6 @@ jobs: - php: 8.4 laravel: 11 - name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} steps: diff --git a/composer.json b/composer.json index d2d94f62..bbf35e44 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "require-dev": { "illuminate/support": "^8.0|^9.0|^10.0|^11.0", "nesbot/carbon": "^2.61|^3.0", - "pestphp/pest": "^1.21.3", + "pestphp/pest": "^1.21.3|^2.0|^3.0", "phpstan/phpstan": "^1.8.2", "symfony/var-dumper": "^5.4.11|^6.2.0|^7.0.0" }, From 0edfdab930f5411c8df03918fe7c573332ba6951 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 20 Sep 2024 10:26:01 +0800 Subject: [PATCH 04/11] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/tests.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c9b6e164..f9a36af7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -51,6 +51,18 @@ jobs: echo "::add-matcher::${{ runner.tool_cache }}/php.json" echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" + - name: Install Pest v1 + run: composer require "pestphp:pest:^1.0" --no-install + if: matrix.php < 8.1 + + - name: Install Pest v2 + run: composer require "pestphp:pest:^2.0" --no-install + if: matrix.php < 8.2 + + - name: Install Pest v3 + run: composer require "pestphp:pest:^3.0" --no-install + if: matrix.php >= 8.2 + - name: Install PHP dependencies run: composer update --prefer-stable --no-interaction --no-progress From 3859d38530c16e48334666c45ed2af533adb3e39 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 20 Sep 2024 10:26:59 +0800 Subject: [PATCH 05/11] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f9a36af7..074f46d0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,7 +11,7 @@ on: jobs: linux_tests: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 strategy: fail-fast: true From 70d62e5c3477f60ab30b6196b969e2c0fb5c6e0d Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 20 Sep 2024 10:27:41 +0800 Subject: [PATCH 06/11] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 074f46d0..80727282 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -52,15 +52,15 @@ jobs: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - name: Install Pest v1 - run: composer require "pestphp:pest:^1.0" --no-install + run: composer require "pestphp/pest:^1.0" --no-install if: matrix.php < 8.1 - name: Install Pest v2 - run: composer require "pestphp:pest:^2.0" --no-install + run: composer require "pestphp/pest:^2.0" --no-install if: matrix.php < 8.2 - name: Install Pest v3 - run: composer require "pestphp:pest:^3.0" --no-install + run: composer require "pestphp/pest:^3.0" --no-install if: matrix.php >= 8.2 - name: Install PHP dependencies From fe343228ffe254dc358709b23a3599ca7b09465e Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 20 Sep 2024 10:32:06 +0800 Subject: [PATCH 07/11] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 80727282..19067797 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -53,11 +53,11 @@ jobs: - name: Install Pest v1 run: composer require "pestphp/pest:^1.0" --no-install - if: matrix.php < 8.1 + if: matrix.php <= '8.0' - name: Install Pest v2 run: composer require "pestphp/pest:^2.0" --no-install - if: matrix.php < 8.2 + if: matrix.php <= 8.1 - name: Install Pest v3 run: composer require "pestphp/pest:^3.0" --no-install From 13fd903f15dd0a0f150d9a6a9eeaeefe144c64ac Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 20 Sep 2024 10:34:01 +0800 Subject: [PATCH 08/11] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 19067797..c3799ea6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -57,7 +57,7 @@ jobs: - name: Install Pest v2 run: composer require "pestphp/pest:^2.0" --no-install - if: matrix.php <= 8.1 + if: matrix.php == 8.1 - name: Install Pest v3 run: composer require "pestphp/pest:^3.0" --no-install From 8697bb0149dcfdcfff1f61c53db53f1b75984636 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 20 Sep 2024 10:35:54 +0800 Subject: [PATCH 09/11] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/tests.yml | 6 +++--- composer.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c3799ea6..783ce5b3 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -59,9 +59,9 @@ jobs: run: composer require "pestphp/pest:^2.0" --no-install if: matrix.php == 8.1 - - name: Install Pest v3 - run: composer require "pestphp/pest:^3.0" --no-install - if: matrix.php >= 8.2 + # - name: Install Pest v3 + # run: composer require "pestphp/pest:^3.0" --no-install + # if: matrix.php >= 8.2 - name: Install PHP dependencies run: composer update --prefer-stable --no-interaction --no-progress diff --git a/composer.json b/composer.json index bbf35e44..8f329230 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "require-dev": { "illuminate/support": "^8.0|^9.0|^10.0|^11.0", "nesbot/carbon": "^2.61|^3.0", - "pestphp/pest": "^1.21.3|^2.0|^3.0", + "pestphp/pest": "^1.21.3|^2.0", "phpstan/phpstan": "^1.8.2", "symfony/var-dumper": "^5.4.11|^6.2.0|^7.0.0" }, From d276d1f4b2aaf2b4a7f041e38af7029cace3684e Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 20 Sep 2024 10:36:10 +0800 Subject: [PATCH 10/11] wip Signed-off-by: Mior Muhammad Zaki --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 783ce5b3..36754f53 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -57,7 +57,7 @@ jobs: - name: Install Pest v2 run: composer require "pestphp/pest:^2.0" --no-install - if: matrix.php == 8.1 + if: matrix.php >= 8.1 # - name: Install Pest v3 # run: composer require "pestphp/pest:^3.0" --no-install From 8c2ca99a79c2a5545047fb5cd0f190bed801b386 Mon Sep 17 00:00:00 2001 From: Mior Muhammad Zaki Date: Fri, 20 Sep 2024 22:24:23 +0800 Subject: [PATCH 11/11] wip --- .github/workflows/tests.yml | 14 -------------- composer.json | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 36754f53..3312b9de 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,8 +16,6 @@ jobs: strategy: fail-fast: true matrix: - # php: [7.3, 7.4, '8.0', 8.1, 8.2, 8.3, 8.4] - # laravel: [8, 9, 10, 11] php: [8.2, 8.3] laravel: [10, 11] include: @@ -51,18 +49,6 @@ jobs: echo "::add-matcher::${{ runner.tool_cache }}/php.json" echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json" - - name: Install Pest v1 - run: composer require "pestphp/pest:^1.0" --no-install - if: matrix.php <= '8.0' - - - name: Install Pest v2 - run: composer require "pestphp/pest:^2.0" --no-install - if: matrix.php >= 8.1 - - # - name: Install Pest v3 - # run: composer require "pestphp/pest:^3.0" --no-install - # if: matrix.php >= 8.2 - - name: Install PHP dependencies run: composer update --prefer-stable --no-interaction --no-progress diff --git a/composer.json b/composer.json index 8f329230..d2d94f62 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "require-dev": { "illuminate/support": "^8.0|^9.0|^10.0|^11.0", "nesbot/carbon": "^2.61|^3.0", - "pestphp/pest": "^1.21.3|^2.0", + "pestphp/pest": "^1.21.3", "phpstan/phpstan": "^1.8.2", "symfony/var-dumper": "^5.4.11|^6.2.0|^7.0.0" },