From 5bf593d09479601a1f870fbe53d09250e6ca8046 Mon Sep 17 00:00:00 2001 From: Mark Walet Date: Wed, 13 Mar 2024 11:47:19 +0100 Subject: [PATCH 1/2] Add support for Laravel 11 --- .github/workflows/coverage.yml | 2 +- .github/workflows/tests.yml | 24 +++++------------------- .gitignore | 3 ++- CHANGELOG.md | 12 ++++++++++++ composer.json | 6 +++--- phpunit.xml | 34 +++++++++++++++++++--------------- 6 files changed, 42 insertions(+), 39 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 28a879b..c4876b9 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -22,7 +22,7 @@ jobs: uses: actions/cache@v4 with: path: ~/.composer/cache/files - key: dependencies-php-8.3-illuminate-10.*-composer-${{ hashFiles('composer.json') }} + key: dependencies-php-8.3-illuminate-11.*-composer-${{ hashFiles('composer.json') }} - name: Setup PHP uses: shivammathur/setup-php@v2 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c20ace2..5169b2a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,31 +16,17 @@ jobs: strategy: fail-fast: true matrix: - php: [ 8.0, 8.1, 8.2, 8.3 ] - illuminate: [ 7.*, ~8.74, ^9.0, ^10.0 ] + php: [ 8.1, 8.2, 8.3 ] + illuminate: [ ^10.0, ^11.0 ] stability: [ prefer-lowest, prefer-stable ] include: - - illuminate: 7.* - testbench: 5.* - - illuminate: ~8.74 - testbench: 6.* - - illuminate: ^9.0 - testbench: 7.* - illuminate: ^10.0 testbench: 8.* + - illuminate: ^11.0 + testbench: 9.* exclude: - php: 8.1 - illuminate: 7.* - - php: 8.0 - illuminate: ^10.0 - - php: 8.2 - illuminate: 7.* - - php: 8.2 - illuminate: ~8.74 - - php: 8.3 - illuminate: 7.* - - php: 8.3 - illuminate: ~8.74 + illuminate: ^11.0 name: P${{ matrix.php }} - I${{ matrix.illuminate }} - ${{ matrix.stability }} diff --git a/.gitignore b/.gitignore index bd4dddb..0281460 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,8 @@ /.idea vendor -/composer.lock +composer.lock composer.phar clover.json clover.xml .phpunit.result.cache +.phpunit.cache/ \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 6853cd3..2625bc8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,18 @@ ## [Unreleased](https://github.com/markwalet/laravel-changelog/compare/v1.9.0...master) +### Added +- Added support for Laravel 11 + +### Removed +- Removed support for PHP 8.0 +- Removed support for Laravel 7 +- Removed support for Laravel 8 +- Removed support for Laravel 9 + +### Changed +- Upgraded to PHPUnit 10. + ## [v1.9.0 (2023-12-02)](https://github.com/markwalet/laravel-changelog/compare/v1.8.0...v1.9.0) ### Added diff --git a/composer.json b/composer.json index 9a7cd21..1cc5275 100644 --- a/composer.json +++ b/composer.json @@ -11,15 +11,15 @@ ], "require": { "php": "8.*", - "laravel/framework": "7.*|~8.74|^9.0|^10.0|^11.0", + "laravel/framework": "^10.0|^11.0", "markwalet/laravel-git-state": "~1.0", "ext-simplexml": "*", "ext-dom": "*" }, "require-dev": { - "phpunit/phpunit": "~9.3", + "phpunit/phpunit": "^10.5", "mockery/mockery": "~1.4", - "orchestra/testbench": "5.*|6.*|7.*|8.*" + "orchestra/testbench": "8.*|9.*" }, "autoload": { "psr-4": { diff --git a/phpunit.xml b/phpunit.xml index 0ab969b..e174124 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,20 +1,24 @@ - - - ./src - - - ./src/Exceptions/* - - - - - ./tests/ - - + processIsolation="false" + stopOnFailure="false" + xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" + cacheDirectory=".phpunit.cache" + backupStaticProperties="false"> + + + ./tests/ + + + + + ./src + + + ./src/Exceptions/* + + From 76169e4b6e7f3e9fdb69103605001105bdb2ae7f Mon Sep 17 00:00:00 2001 From: Mark Walet Date: Wed, 13 Mar 2024 11:51:43 +0100 Subject: [PATCH 2/2] Remove verbose flag from phpunit run --- .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 5169b2a..ce7a74b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -54,4 +54,4 @@ jobs: composer update --${{ matrix.stability }} --prefer-dist --no-interaction - name: Execute tests - run: vendor/bin/phpunit --verbose + run: vendor/bin/phpunit