From bbd45a5bc591df36723a5a12a266caf4ab83974e Mon Sep 17 00:00:00 2001 From: Alessio Date: Wed, 19 Jan 2022 11:44:25 +0100 Subject: [PATCH 1/2] Drop Laravel 7 and PHP 7.2 support --- .github/workflows/ci.yml | 7 ++----- README.md | 2 +- composer.json | 18 +++++++++--------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 219af64..444d150 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,11 +15,8 @@ jobs: strategy: fail-fast: true matrix: - php: [7.2, 7.3, 7.4] - laravel: ["7.*", "8.*"] - exclude: - - laravel: "8.*" - php: 7.2 + php: [7.3, 7.4] + laravel: ["8.*"] steps: - uses: actions/checkout@v2 diff --git a/README.md b/README.md index f8be834..c96fb23 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ as well as the community driven [Socialite Providers](https://socialiteproviders **requirements** -`oneofftech/laravel-connect-identity` requires **Laravel >= 7.20** and **PHP >= 7.2**. +`oneofftech/laravel-connect-identity` requires **Laravel >= 8.0** and **PHP >= 7.3**. > **The package is currently a Work In Progress.** The api might change without notice so it is not yet suitable for production environments. diff --git a/composer.json b/composer.json index abc9561..98f8dbb 100644 --- a/composer.json +++ b/composer.json @@ -17,21 +17,21 @@ } ], "require": { - "php": ">=7.2.5", - "illuminate/auth": "^7.0|^8.0", - "illuminate/console": "^7.0|^8.0", - "illuminate/encryption": "^7.0|^8.0", - "illuminate/support": "^7.0|^8.0", - "illuminate/view": "^7.0|^8.0", - "laravel/socialite": "^4.4|^5.0", + "php": "^7.3", + "illuminate/auth": "^8.0", + "illuminate/console": "^8.0", + "illuminate/encryption": "^8.0", + "illuminate/support": "^8.0", + "illuminate/view": "^8.0", + "laravel/socialite": "^5.0", "socialiteproviders/gitlab": "^3.1|^4.0", "socialiteproviders/dropbox": "^4.1", - "laravel/ui": "^2.1|^3.0" + "laravel/ui": "^3.0" }, "require-dev": { "fzaninotto/faker": "~1.9.1", "mockery/mockery": "^1.3.1", - "phpunit/phpunit": "^8.5|^9.3", + "phpunit/phpunit": "^8.5|^9.5.8", "orchestra/testbench": "^5.0|^6.0", "friendsofphp/php-cs-fixer": "^2.16" }, From 8693053d53408fa9eb35019a95803891d1326f8f Mon Sep 17 00:00:00 2001 From: Alessio Date: Wed, 19 Jan 2022 11:55:37 +0100 Subject: [PATCH 2/2] Update minimum required dependencies --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 98f8dbb..19b8042 100644 --- a/composer.json +++ b/composer.json @@ -31,8 +31,8 @@ "require-dev": { "fzaninotto/faker": "~1.9.1", "mockery/mockery": "^1.3.1", - "phpunit/phpunit": "^8.5|^9.5.8", - "orchestra/testbench": "^5.0|^6.0", + "phpunit/phpunit": "^8.5.19|^9.5.8", + "orchestra/testbench": "^6.15", "friendsofphp/php-cs-fixer": "^2.16" }, "autoload": {