diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 799d0ca..4acf878 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -10,11 +10,16 @@ jobs: matrix: os: [ubuntu-latest, windows-latest] php: [8.0, 7.4] - laravel: [8.*] - stability: [prefer-lowest, prefer-stable] + laravel: [9.*, 8.*] + stability: [prefer-stable] include: + - laravel: 9.* + testbench: 7.* - laravel: 8.* testbench: 6.* + exclude: + - laravel: 9.* + php: 7.4 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} diff --git a/CHANGELOG.md b/CHANGELOG.md index c9b9b5d..80c895d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,7 +51,12 @@ The following changes are required when updating: ## Changes +### 1.1.0 + +- Add Laravel 9 support + ### 1.0.1 + - Add unofficial support for Lumen ### 1.0.0 diff --git a/composer.json b/composer.json index 218d1fa..130017d 100644 --- a/composer.json +++ b/composer.json @@ -20,19 +20,19 @@ } ], "require": { - "php": "^7.4|^8.0", + "php": "^7.4 || ^8.0", "ext-json": "*", "guzzlehttp/guzzle": "^7.2", - "illuminate/http": "^8.0", - "illuminate/support": "^8.0", + "illuminate/http": "^8.0 || ^9.0", + "illuminate/support": "^8.0 || ^9.0", "spatie/laravel-package-tools": "^1.1" }, "require-dev": { - "orchestra/testbench": "^6.0", - "phpunit/phpunit": "^9.3", - "spatie/laravel-ray": "^1.12", - "timacdonald/log-fake": "^1.9", - "vimeo/psalm": "^4.4" + "orchestra/testbench": "^7.0", + "phpunit/phpunit": "^9.5.10", + "spatie/laravel-ray": "^1.29", + "timacdonald/log-fake": "dev-return-types", + "vimeo/psalm": "^4.20" }, "autoload": { "psr-4": { @@ -44,6 +44,12 @@ "Bilfeldt\\LaravelHttpClientLogger\\Tests\\": "tests" } }, + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/bilfeldt/log-fake.git" + } + ], "scripts": { "psalm": "vendor/bin/psalm", "test": "vendor/bin/phpunit --colors=always",