From 7cde23cd0c921a48448a99f8898d9e7622ccf172 Mon Sep 17 00:00:00 2001 From: Shift Date: Sun, 6 Feb 2022 20:07:13 +0000 Subject: [PATCH 1/9] Bump dependencies for Laravel 9 --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 218d1fa..fafadae 100644 --- a/composer.json +++ b/composer.json @@ -20,19 +20,19 @@ } ], "require": { - "php": "^7.4|^8.0", + "php": "^8.0", "ext-json": "*", "guzzlehttp/guzzle": "^7.2", - "illuminate/http": "^8.0", - "illuminate/support": "^8.0", + "illuminate/http": "^9.0", + "illuminate/support": "^9.0", "spatie/laravel-package-tools": "^1.1" }, "require-dev": { - "orchestra/testbench": "^6.0", - "phpunit/phpunit": "^9.3", - "spatie/laravel-ray": "^1.12", + "orchestra/testbench": "^7.0", + "phpunit/phpunit": "^9.5.10", + "spatie/laravel-ray": "^1.29", "timacdonald/log-fake": "^1.9", - "vimeo/psalm": "^4.4" + "vimeo/psalm": "^4.20" }, "autoload": { "psr-4": { From 23df6eeb10654de420d5b099aa882587052e735b Mon Sep 17 00:00:00 2001 From: Shift Date: Sun, 6 Feb 2022 20:07:13 +0000 Subject: [PATCH 2/9] Update GitHub Actions for Laravel 9 --- .github/workflows/run-tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 799d0ca..aa3e71a 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -9,12 +9,12 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest, windows-latest] - php: [8.0, 7.4] - laravel: [8.*] + php: [8.0] + laravel: [9.*] stability: [prefer-lowest, prefer-stable] include: - - laravel: 8.* - testbench: 6.* + - laravel: 9.* + testbench: 7.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} From 03cdac2bfb8f5102b757f4d241a4f59441e78b57 Mon Sep 17 00:00:00 2001 From: Bilfeldt Date: Sun, 6 Feb 2022 22:25:34 +0100 Subject: [PATCH 3/9] Update composer.json --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index fafadae..2adbdd1 100644 --- a/composer.json +++ b/composer.json @@ -20,11 +20,11 @@ } ], "require": { - "php": "^8.0", + "php": "^7.4 || ^8.0", "ext-json": "*", "guzzlehttp/guzzle": "^7.2", - "illuminate/http": "^9.0", - "illuminate/support": "^9.0", + "illuminate/http": "^8.0 || ^9.0", + "illuminate/support": "^8.0 || ^9.0", "spatie/laravel-package-tools": "^1.1" }, "require-dev": { From fd593717bed4de8d1b7e9398fb9036faf4403a40 Mon Sep 17 00:00:00 2001 From: Bilfeldt Date: Sun, 6 Feb 2022 22:27:22 +0100 Subject: [PATCH 4/9] Update run-tests.yml --- .github/workflows/run-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index aa3e71a..204af42 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -11,10 +11,12 @@ jobs: os: [ubuntu-latest, windows-latest] php: [8.0] laravel: [9.*] - stability: [prefer-lowest, prefer-stable] + stability: [prefer-stable] include: - laravel: 9.* testbench: 7.* + - laravel: 8.* + testbench: 6.* name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} From a1524fe4950f4e49f3cac2d485ee46f514caebc3 Mon Sep 17 00:00:00 2001 From: Bilfeldt Date: Sun, 6 Feb 2022 22:29:38 +0100 Subject: [PATCH 5/9] Update run-tests.yml --- .github/workflows/run-tests.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 204af42..4acf878 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -9,14 +9,17 @@ jobs: fail-fast: true matrix: os: [ubuntu-latest, windows-latest] - php: [8.0] - laravel: [9.*] + php: [8.0, 7.4] + 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 }} From 7e8b583341f4a307a54e10cecb633b759985bb3c Mon Sep 17 00:00:00 2001 From: Bilfeldt Date: Thu, 10 Feb 2022 09:33:45 +0100 Subject: [PATCH 6/9] Test laravel 9 compatible timacdonald/log-fake --- composer.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2adbdd1..3bfbbed 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ "orchestra/testbench": "^7.0", "phpunit/phpunit": "^9.5.10", "spatie/laravel-ray": "^1.29", - "timacdonald/log-fake": "^1.9", + "timacdonald/log-fake": "dev-l9-compatibility", "vimeo/psalm": "^4.20" }, "autoload": { @@ -44,6 +44,12 @@ "Bilfeldt\\LaravelHttpClientLogger\\Tests\\": "tests" } }, + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/laravel-shift/log-fake.git" + } + ] "scripts": { "psalm": "vendor/bin/psalm", "test": "vendor/bin/phpunit --colors=always", From 0b9783e1b9988798a4eb157f49f5c70f45a11852 Mon Sep 17 00:00:00 2001 From: Bilfeldt Date: Thu, 10 Feb 2022 09:35:56 +0100 Subject: [PATCH 7/9] Dahmit Fix invalid json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3bfbbed..e1b9238 100644 --- a/composer.json +++ b/composer.json @@ -49,7 +49,7 @@ "type": "vcs", "url": "https://github.com/laravel-shift/log-fake.git" } - ] + ], "scripts": { "psalm": "vendor/bin/psalm", "test": "vendor/bin/phpunit --colors=always", From b4bb5649755d19d61b3ca12c0163d8d583bfcd5c Mon Sep 17 00:00:00 2001 From: Bilfeldt Date: Thu, 10 Feb 2022 12:09:08 +0100 Subject: [PATCH 8/9] Update repo Change repo to https://github.com/bilfeldt/log-fake.git --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index e1b9238..130017d 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ "orchestra/testbench": "^7.0", "phpunit/phpunit": "^9.5.10", "spatie/laravel-ray": "^1.29", - "timacdonald/log-fake": "dev-l9-compatibility", + "timacdonald/log-fake": "dev-return-types", "vimeo/psalm": "^4.20" }, "autoload": { @@ -47,7 +47,7 @@ "repositories": [ { "type": "vcs", - "url": "https://github.com/laravel-shift/log-fake.git" + "url": "https://github.com/bilfeldt/log-fake.git" } ], "scripts": { From 6f9e68ac5e13fee5fd8f74c2539bf49653cd0215 Mon Sep 17 00:00:00 2001 From: Bilfeldt Date: Thu, 10 Feb 2022 12:23:41 +0100 Subject: [PATCH 9/9] Add changelog info --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) 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