From 68774c5f38ee225c7d2b35774e2f6e75b0616689 Mon Sep 17 00:00:00 2001 From: Erick Carvalho Date: Fri, 15 Jan 2021 16:35:43 -0300 Subject: [PATCH 1/5] Updated composer.json to accept PHP 8.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 591597e..6a64509 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ } ], "require": { - "php": "^7.3", + "php": "^7.3|^8.0", "illuminate/http": "^6.0|^7.0|^8.0" }, "require-dev": { From 5e7ace887ddc57c1eff6be2181e0fe2809fbbc11 Mon Sep 17 00:00:00 2001 From: Erick Carvalho Date: Thu, 28 Jan 2021 12:51:01 -0300 Subject: [PATCH 2/5] Updated the Mockery to 1.4 and updated the test workflow to run PHP 8 --- .github/workflows/run-tests.yml | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 0bccc3a..4c72cb4 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -9,7 +9,7 @@ jobs: strategy: fail-fast: true matrix: - php: [7.4, 7.3] + php: [8.0, 7.4, 7.3] laravel: [8.*, 7.*, 6.*] dependency-version: [prefer-lowest, prefer-stable] include: diff --git a/composer.json b/composer.json index 6a64509..c89f406 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ "require-dev": { "phpunit/phpunit": "^8.0 || ^9.0", "orchestra/testbench": "^4.0|^5.0|^6.0", - "mockery/mockery": "^1.3" + "mockery/mockery": "^1.4" }, "autoload": { "psr-4": { From f55fcecebd2cf447b0dd933a07646a7bfc0a4b53 Mon Sep 17 00:00:00 2001 From: Erick Carvalho Date: Thu, 28 Jan 2021 14:30:33 -0300 Subject: [PATCH 3/5] Set the Symfony 5.1 minimum version to 5.1.3 --- composer.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index c89f406..026a996 100644 --- a/composer.json +++ b/composer.json @@ -21,11 +21,14 @@ ], "require": { "php": "^7.3|^8.0", - "illuminate/http": "^6.0|^7.0|^8.0" + "illuminate/http": "^6.0|^7.0|^8.0", + "laravel/framework": "6.*", + "orchestra/testbench": "4.*", + "symfony/console": ">=4.3.4", + "symfony/http-foundation": "^4.3.4|>=5.1.3" }, "require-dev": { "phpunit/phpunit": "^8.0 || ^9.0", - "orchestra/testbench": "^4.0|^5.0|^6.0", "mockery/mockery": "^1.4" }, "autoload": { From d7cfee976b6823e3e4bb5df9211d2100f0c516d1 Mon Sep 17 00:00:00 2001 From: Erick Carvalho Date: Mon, 1 Feb 2021 08:40:12 -0300 Subject: [PATCH 4/5] Fix composer.json locks --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 026a996..5a22804 100644 --- a/composer.json +++ b/composer.json @@ -22,13 +22,12 @@ "require": { "php": "^7.3|^8.0", "illuminate/http": "^6.0|^7.0|^8.0", - "laravel/framework": "6.*", - "orchestra/testbench": "4.*", "symfony/console": ">=4.3.4", "symfony/http-foundation": "^4.3.4|>=5.1.3" }, "require-dev": { "phpunit/phpunit": "^8.0 || ^9.0", + "orchestra/testbench": "^4.0|^5.0|^6.0", "mockery/mockery": "^1.4" }, "autoload": { From 843eabdd2226b3d5a81e66c8a97227c8cfe22158 Mon Sep 17 00:00:00 2001 From: Aron Rotteveel Date: Tue, 2 Feb 2021 09:44:23 +0100 Subject: [PATCH 5/5] Simplify composer --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 5a22804..b112ef9 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,6 @@ "require": { "php": "^7.3|^8.0", "illuminate/http": "^6.0|^7.0|^8.0", - "symfony/console": ">=4.3.4", "symfony/http-foundation": "^4.3.4|>=5.1.3" }, "require-dev": {