From 19dd6deecf705730278ea01a86c0c2829de7faa5 Mon Sep 17 00:00:00 2001 From: Shift Date: Tue, 27 Feb 2024 21:05:38 +0000 Subject: [PATCH 1/7] Bump dependencies for Laravel 11 --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 1f3eba3..5964d7f 100644 --- a/composer.json +++ b/composer.json @@ -17,12 +17,12 @@ ], "require": { "php": "^8.0", - "illuminate/contracts": "^8.70|^9.0|^10.0", - "nesbot/carbon": "^2.63" + "illuminate/contracts": "^8.70|^9.0|^10.0|^11.0", + "nesbot/carbon": "^2.63|^3.0" }, "require-dev": { - "orchestra/testbench": "^6.25|^7.0|^8.0", - "phpunit/phpunit": "^9.5.10" + "orchestra/testbench": "^6.25|^7.0|^8.0|^9.0", + "phpunit/phpunit": "^9.5.10|^10.5" }, "autoload": { "psr-4": { From 041d81f06c1d0bcde14f41667a3b07afc69063d7 Mon Sep 17 00:00:00 2001 From: Shift Date: Tue, 27 Feb 2024 21:05:38 +0000 Subject: [PATCH 2/7] Update GitHub Actions for Laravel 11 --- .github/workflows/run-tests.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 51da826..9dbb093 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -1,16 +1,19 @@ name: Tests -on: [push, pull_request] +on: + - push + - pull_request jobs: test: runs-on: ${{ matrix.os }} + strategy: fail-fast: true matrix: os: [ubuntu-latest, windows-latest] php: [8.0, 8.1, 8.2] - laravel: [10.*, 9.*, 8.*] + laravel: ['8.*', '9.*', '10.*', '11.*'] dependency-version: [prefer-lowest, prefer-stable] include: - laravel: 10.* @@ -22,9 +25,16 @@ jobs: - laravel: 8.* testbench: 6.* phpunit: 9.4.* + - laravel: 11.* + testbench: 9.* + phpunit: '8.2' exclude: - laravel: 10.* php: 8.0 + - laravel: 11.* + php: 8.0 + - laravel: 11.* + php: 8.1 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} @@ -41,7 +51,7 @@ jobs: - name: Configure for PHP 8.2 run: composer config platform.php 8.1.99 - if: matrix.php == '8.2' + if: "matrix.php == '8.2'" - name: Install dependencies run: | From 9ad7d15888cd97b4e121010a1715d7aa52b8bfeb Mon Sep 17 00:00:00 2001 From: Freek Van der Herten Date: Thu, 29 Feb 2024 09:29:04 +0100 Subject: [PATCH 3/7] Update run-tests.yml --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 9dbb093..47b2d71 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -27,7 +27,7 @@ jobs: phpunit: 9.4.* - laravel: 11.* testbench: 9.* - phpunit: '8.2' + phpunit: 9.6.* exclude: - laravel: 10.* php: 8.0 From 6839f63b154024c5589f543dd32bb314fef32ea4 Mon Sep 17 00:00:00 2001 From: Freek Van der Herten Date: Thu, 29 Feb 2024 09:31:02 +0100 Subject: [PATCH 4/7] Update run-tests.yml --- .github/workflows/run-tests.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 47b2d71..72f9381 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -18,16 +18,12 @@ jobs: include: - laravel: 10.* testbench: 8.* - phpunit: 9.6.* - laravel: 9.* testbench: 7.* - phpunit: 9.5.* - laravel: 8.* testbench: 6.* - phpunit: 9.4.* - laravel: 11.* testbench: 9.* - phpunit: 9.6.* exclude: - laravel: 10.* php: 8.0 @@ -55,7 +51,7 @@ jobs: - name: Install dependencies run: | - composer require "phpunit/phpunit:${{ matrix.phpunit }}" "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction - name: Execute tests From 0527b828aaa1c78bedb2d6e4a4779240587c0fbd Mon Sep 17 00:00:00 2001 From: Freek Van der Herten Date: Thu, 29 Feb 2024 09:33:03 +0100 Subject: [PATCH 5/7] Update run-tests.yml --- .github/workflows/run-tests.yml | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 72f9381..1e67565 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -12,25 +12,14 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest, windows-latest] - php: [8.0, 8.1, 8.2] - laravel: ['8.*', '9.*', '10.*', '11.*'] + php: [8.2, 8.3] + laravel: ['10.*', '11.*'] dependency-version: [prefer-lowest, prefer-stable] include: - laravel: 10.* testbench: 8.* - - laravel: 9.* - testbench: 7.* - - laravel: 8.* - testbench: 6.* - laravel: 11.* testbench: 9.* - exclude: - - laravel: 10.* - php: 8.0 - - laravel: 11.* - php: 8.0 - - laravel: 11.* - php: 8.1 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} @@ -39,16 +28,12 @@ jobs: uses: actions/checkout@v4 - name: Setup PHP - uses: shivammathur/setup-php@v2 + uses: shivammathur/setup-php@v4 with: php-version: ${{ matrix.php }} extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo coverage: none - - name: Configure for PHP 8.2 - run: composer config platform.php 8.1.99 - if: "matrix.php == '8.2'" - - name: Install dependencies run: | composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update From f416ed968c9e496df0e4a07dbbb89e255e0a353b Mon Sep 17 00:00:00 2001 From: Freek Van der Herten Date: Thu, 29 Feb 2024 09:33:29 +0100 Subject: [PATCH 6/7] Update composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 5964d7f..11e10c3 100644 --- a/composer.json +++ b/composer.json @@ -17,11 +17,11 @@ ], "require": { "php": "^8.0", - "illuminate/contracts": "^8.70|^9.0|^10.0|^11.0", + "illuminate/contracts": "^10.0|^11.0", "nesbot/carbon": "^2.63|^3.0" }, "require-dev": { - "orchestra/testbench": "^6.25|^7.0|^8.0|^9.0", + "orchestra/testbench": "^8.0|^9.0", "phpunit/phpunit": "^9.5.10|^10.5" }, "autoload": { From 2210f1f523b33b17aeac75c3b7e990eed4c5986b Mon Sep 17 00:00:00 2001 From: Freek Van der Herten Date: Thu, 29 Feb 2024 09:34:14 +0100 Subject: [PATCH 7/7] Update run-tests.yml --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 1e67565..08a17d6 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -28,7 +28,7 @@ jobs: uses: actions/checkout@v4 - name: Setup PHP - uses: shivammathur/setup-php@v4 + uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php }} extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo