From 318d9030c54d26275e4cd6752e3c7810c78343d1 Mon Sep 17 00:00:00 2001 From: Mo Khosh Date: Sun, 25 Feb 2024 14:46:26 +0330 Subject: [PATCH 01/12] add laravel 11 --- composer.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index 80ec93aa..d6bba0ad 100644 --- a/composer.json +++ b/composer.json @@ -14,17 +14,17 @@ "php": "^8.0.2", "ext-simplexml": "*", "barryvdh/laravel-ide-helper": "^2.13", - "illuminate/config": "^9.48 || ^10.0", - "illuminate/container": "^9.48 || ^10.0", - "illuminate/contracts": "^9.48 || ^10.0", - "illuminate/database": "^9.48 || ^10.0", - "illuminate/events": "^9.48 || ^10.0", - "illuminate/http": "^9.48 || ^10.0", - "illuminate/routing": "^9.48 || ^10.0", - "illuminate/support": "^9.48 || ^10.0", - "illuminate/view": "^9.48 || ^10.0", + "illuminate/config": "^9.48 || ^10.0 || ^11.0", + "illuminate/container": "^9.48 || ^10.0 || ^11.0", + "illuminate/contracts": "^9.48 || ^10.0 || ^11.0", + "illuminate/database": "^9.48 || ^10.0 || ^11.0", + "illuminate/events": "^9.48 || ^10.0 || ^11.0", + "illuminate/http": "^9.48 || ^10.0 || ^11.0", + "illuminate/routing": "^9.48 || ^10.0 || ^11.0", + "illuminate/support": "^9.48 || ^10.0 || ^11.0", + "illuminate/view": "^9.48 || ^10.0 || ^11.0", "nikic/php-parser": "^4.13", - "orchestra/testbench": "^7.19 || ^8.0", + "orchestra/testbench": "^7.19 || ^8.0 || ^9.0", "symfony/console": "^6.0", "vimeo/psalm": "^4.30 || ^5.1" }, From 05ce8c9348a92b09ff150b1500fedc5c30fd908a Mon Sep 17 00:00:00 2001 From: Mo Khosh Date: Sun, 25 Feb 2024 14:46:29 +0330 Subject: [PATCH 02/12] add laravel 11 --- .github/workflows/test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1adb661a..5689b4c7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -51,11 +51,13 @@ jobs: fail-fast: true matrix: php: [8.3, 8.2, 8.0] - laravel: [^10.0, ^9.0] + laravel: [^11.0, ^10.0, ^9.0] dependencies: [lowest, highest] exclude: - php: 8.0 laravel: ^10.0 + - php: 8.0 + laravel: ^11.0 name: Acceptance P${{ matrix.php }} | L${{ matrix.laravel }} | ${{ matrix.dependencies == 'highest' && '↑' || '↓' }} steps: - name: Checkout code From 333df6213a4057994cc456db1feb0db5338d55d6 Mon Sep 17 00:00:00 2001 From: Mo Khosh Date: Mon, 26 Feb 2024 13:26:25 +0330 Subject: [PATCH 03/12] use testbench 9 for laravel 11 --- .github/workflows/test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5689b4c7..76f8e564 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -53,6 +53,9 @@ jobs: php: [8.3, 8.2, 8.0] laravel: [^11.0, ^10.0, ^9.0] dependencies: [lowest, highest] + include: + - laravel: 11.* + testbench: 9.* exclude: - php: 8.0 laravel: ^10.0 From cd472d8c894c4334cb5d53760cbcdf4549680794 Mon Sep 17 00:00:00 2001 From: Mo Khosh Date: Mon, 26 Feb 2024 13:34:24 +0330 Subject: [PATCH 04/12] move exclude block around to fix the wrong matrices --- .github/workflows/test.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 76f8e564..4ab5afa8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -57,10 +57,11 @@ jobs: - laravel: 11.* testbench: 9.* exclude: - - php: 8.0 - laravel: ^10.0 - - php: 8.0 - laravel: ^11.0 + - laravel: 10.* + php: 8.0 + - laravel: 11.* + php: 8.0 + name: Acceptance P${{ matrix.php }} | L${{ matrix.laravel }} | ${{ matrix.dependencies == 'highest' && '↑' || '↓' }} steps: - name: Checkout code From c6c36be7d0a403b7b3748c7042a24cf50e6dc4db Mon Sep 17 00:00:00 2001 From: Mo Khosh Date: Mon, 26 Feb 2024 13:36:25 +0330 Subject: [PATCH 05/12] unify version notation --- .github/workflows/test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4ab5afa8..bdc6a9f6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -54,12 +54,12 @@ jobs: laravel: [^11.0, ^10.0, ^9.0] dependencies: [lowest, highest] include: - - laravel: 11.* - testbench: 9.* + - laravel: ^11.0 + testbench: ^9.0 exclude: - - laravel: 10.* + - laravel: ^10.0 php: 8.0 - - laravel: 11.* + - laravel: ^11.0 php: 8.0 name: Acceptance P${{ matrix.php }} | L${{ matrix.laravel }} | ${{ matrix.dependencies == 'highest' && '↑' || '↓' }} From 0d8ed4508aed288a25b0c8f7085d37760c5385a2 Mon Sep 17 00:00:00 2001 From: Mo Khosh Date: Mon, 26 Feb 2024 13:40:25 +0330 Subject: [PATCH 06/12] use matrix testbench version in composer require --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bdc6a9f6..c21f54f8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -77,11 +77,11 @@ jobs: - name: Install lowest dependencies from composer.json if: "matrix.dependencies == 'lowest'" - run: composer update --with='laravel/framework:${{ matrix.laravel }}' --no-interaction --no-progress --prefer-dist --prefer-stable --prefer-lowest + run: composer update --with='laravel/framework:${{ matrix.laravel }}' 'orchestra/testbench:${{ matrix.testbench }}' --no-interaction --no-progress --prefer-dist --prefer-stable --prefer-lowest - name: Install highest dependencies from composer.json if: "matrix.dependencies == 'highest'" - run: composer update --with='laravel/framework:${{ matrix.laravel }}' --no-interaction --no-progress --prefer-dist --prefer-stable + run: composer update --with='laravel/framework:${{ matrix.laravel }}' 'orchestra/testbench:${{ matrix.testbench }}' --no-interaction --no-progress --prefer-dist --prefer-stable - name: Run Acceptance Tests run: composer test:type From 86a2c24e1b61cb0e855a11593b1b4ed09c5bd87c Mon Sep 17 00:00:00 2001 From: Mo Khosh Date: Mon, 26 Feb 2024 13:50:28 +0330 Subject: [PATCH 07/12] separate require and update to fix partial update without lock file error --- .github/workflows/test.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c21f54f8..40481721 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -77,11 +77,15 @@ jobs: - name: Install lowest dependencies from composer.json if: "matrix.dependencies == 'lowest'" - run: composer update --with='laravel/framework:${{ matrix.laravel }}' 'orchestra/testbench:${{ matrix.testbench }}' --no-interaction --no-progress --prefer-dist --prefer-stable --prefer-lowest + run: | + composer require 'laravel/framework:${{ matrix.laravel }}' 'orchestra/testbench:${{ matrix.testbench }}' --no-interaction --no-update + composer update --no-progress --prefer-lowest --prefer-dist --prefer-stable --no-interaction - name: Install highest dependencies from composer.json if: "matrix.dependencies == 'highest'" - run: composer update --with='laravel/framework:${{ matrix.laravel }}' 'orchestra/testbench:${{ matrix.testbench }}' --no-interaction --no-progress --prefer-dist --prefer-stable + run: | + composer require 'laravel/framework:${{ matrix.laravel }}' 'orchestra/testbench:${{ matrix.testbench }}' --no-interaction --no-update + composer update --no-progress --prefer-dist --prefer-stable --no-interaction - name: Run Acceptance Tests run: composer test:type From 40b07610f7d8a3351ab25a653719d43f9fb79cb3 Mon Sep 17 00:00:00 2001 From: Mo Khosh Date: Mon, 26 Feb 2024 13:52:58 +0330 Subject: [PATCH 08/12] include testbench versions for all laravel versions --- .github/workflows/test.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 40481721..0710589d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -56,6 +56,10 @@ jobs: include: - laravel: ^11.0 testbench: ^9.0 + - laravel: ^10.0 + testbench: ^8.0 + - laravel: ^9.0 + testbench: ^7.0 exclude: - laravel: ^10.0 php: 8.0 From 401ea1aa8563f45f6076474bde1190acdc54b2be Mon Sep 17 00:00:00 2001 From: Mo Khosh Date: Mon, 26 Feb 2024 13:54:52 +0330 Subject: [PATCH 09/12] allow symfony console 7 for laravel 11 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d6bba0ad..eb9b4426 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "illuminate/view": "^9.48 || ^10.0 || ^11.0", "nikic/php-parser": "^4.13", "orchestra/testbench": "^7.19 || ^8.0 || ^9.0", - "symfony/console": "^6.0", + "symfony/console": "^6.0 || ^7.0", "vimeo/psalm": "^4.30 || ^5.1" }, "require-dev": { From 0fda33981f8c899c4ae95c5bb8e4ab641f87df28 Mon Sep 17 00:00:00 2001 From: Mo Khosh Date: Mon, 26 Feb 2024 13:56:29 +0330 Subject: [PATCH 10/12] allow symfony http-foundation 7 for laravel 11 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index eb9b4426..d46fc97c 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "ramsey/collection": "^1.3", "slevomat/coding-standard": "^8.8", "squizlabs/php_codesniffer": "*", - "symfony/http-foundation": "^6.0" + "symfony/http-foundation": "^6.0 || ^7.0" }, "minimum-stability": "dev", "prefer-stable": true, From df4f88291b86e4b3f8740d6820993d5cc293ef07 Mon Sep 17 00:00:00 2001 From: Mo Khosh Date: Mon, 26 Feb 2024 14:00:27 +0330 Subject: [PATCH 11/12] bump ide helper to support laravel 11 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d46fc97c..e5948d1d 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "require": { "php": "^8.0.2", "ext-simplexml": "*", - "barryvdh/laravel-ide-helper": "^2.13", + "barryvdh/laravel-ide-helper": "^2.15", "illuminate/config": "^9.48 || ^10.0 || ^11.0", "illuminate/container": "^9.48 || ^10.0 || ^11.0", "illuminate/contracts": "^9.48 || ^10.0 || ^11.0", From a462bbb43e274f1d202ec911b411dd5cb5da8f81 Mon Sep 17 00:00:00 2001 From: Mo Khosh Date: Mon, 26 Feb 2024 14:06:06 +0330 Subject: [PATCH 12/12] allow dev-master of ide-helper to support laravel 11 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e5948d1d..81485003 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "require": { "php": "^8.0.2", "ext-simplexml": "*", - "barryvdh/laravel-ide-helper": "^2.15", + "barryvdh/laravel-ide-helper": "*", "illuminate/config": "^9.48 || ^10.0 || ^11.0", "illuminate/container": "^9.48 || ^10.0 || ^11.0", "illuminate/contracts": "^9.48 || ^10.0 || ^11.0",