From cf4522728e8e6010f481c5d67366e191c39c7df8 Mon Sep 17 00:00:00 2001 From: Nuno Maduro Date: Fri, 12 Jan 2024 15:09:33 +0000 Subject: [PATCH 1/3] Keeps supporting older illuminate components --- .github/workflows/tests.yml | 13 ++++++++++--- composer.json | 8 ++++---- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 37d9cc8..58f0bab 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,8 +17,9 @@ jobs: fail-fast: true matrix: php: [8.2, 8.3] + laravel: [10, 11] - name: PHP ${{ matrix.php }} + name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} steps: - name: Checkout code @@ -34,6 +35,9 @@ jobs: - name: Install dependencies run: composer install --no-interaction --prefer-dist + run: | + composer require "laravel/framework=^${{ matrix.laravel }}" --no-update + composer update --prefer-dist --no-interaction --no-progress - name: Execute tests run: vendor/bin/phpunit @@ -45,8 +49,9 @@ jobs: fail-fast: true matrix: php: [8.2, 8.3] + laravel: [10, 11] - name: PHP ${{ matrix.php }} - Windows + name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - Windows steps: - name: Set git to use LF @@ -67,7 +72,9 @@ jobs: coverage: none - name: Install dependencies - run: composer install --no-interaction --prefer-dist + run: | + composer require "laravel/framework=^${{ matrix.laravel }}" --no-update + composer update --prefer-dist --no-interaction --no-progress - name: Execute tests run: vendor/bin/phpunit diff --git a/composer.json b/composer.json index ab40e93..87921fc 100644 --- a/composer.json +++ b/composer.json @@ -11,11 +11,11 @@ ], "require": { "php": "^8.2", - "illuminate/filesystem": "^11.0", - "illuminate/support": "^11.0", + "illuminate/filesystem": "^10.20|^11.0", + "illuminate/support": "^10.20|^11.0", "laravel/prompts": "^0.1", - "symfony/console": "^7.0", - "symfony/process": "^7.0" + "symfony/console": "^6.2|^7.0", + "symfony/process": "^6.2|^7.0" }, "require-dev": { "phpstan/phpstan": "^1.10", From c7f05fcac144cad90178998fe25f79942461f282 Mon Sep 17 00:00:00 2001 From: Nuno Maduro Date: Fri, 12 Jan 2024 15:10:58 +0000 Subject: [PATCH 2/3] Removes double run --- .github/workflows/tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 58f0bab..b4c9326 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -34,7 +34,6 @@ jobs: coverage: none - name: Install dependencies - run: composer install --no-interaction --prefer-dist run: | composer require "laravel/framework=^${{ matrix.laravel }}" --no-update composer update --prefer-dist --no-interaction --no-progress From 5d8e03a15c631086806b5ae38b55de7e2e4bf1c3 Mon Sep 17 00:00:00 2001 From: Nuno Maduro Date: Fri, 12 Jan 2024 15:14:28 +0000 Subject: [PATCH 3/3] Fixes windows caret --- .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 b4c9326..0090166 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -72,7 +72,7 @@ jobs: - name: Install dependencies run: | - composer require "laravel/framework=^${{ matrix.laravel }}" --no-update + composer require "laravel/framework=~${{ matrix.laravel }}" --no-update composer update --prefer-dist --no-interaction --no-progress - name: Execute tests