From 1591a7076d54966834a86f3e8698731c12b9bd26 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 23 Nov 2021 16:16:12 +0100 Subject: [PATCH 1/3] Laravel 9 support --- .github/workflows/tests.yml | 7 ++++++- composer.json | 23 ++++++++++------------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e5d48d657..bbc5c061e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,7 +14,12 @@ jobs: fail-fast: true matrix: php: [7.3, 7.4, 8.0, 8.1] - laravel: [^8.0] + laravel: [^8.0, ^9.0] + exclude: + - php: 7.3 + laravel: ^9.0 + - php: 7.4 + laravel: ^9.0 name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} diff --git a/composer.json b/composer.json index 0726c28c7..1681c31da 100644 --- a/composer.json +++ b/composer.json @@ -17,15 +17,15 @@ "php": "^7.3|^8.0", "ext-json": "*", "firebase/php-jwt": "^5.0", - "illuminate/auth": "^8.2", - "illuminate/console": "^8.2", - "illuminate/container": "^8.2", - "illuminate/contracts": "^8.2", - "illuminate/cookie": "^8.2", - "illuminate/database": "^8.2", - "illuminate/encryption": "^8.2", - "illuminate/http": "^8.2", - "illuminate/support": "^8.2", + "illuminate/auth": "^8.2|^9.0", + "illuminate/console": "^8.2|^9.0", + "illuminate/container": "^8.2|^9.0", + "illuminate/contracts": "^8.2|^9.0", + "illuminate/cookie": "^8.2|^9.0", + "illuminate/database": "^8.2|^9.0", + "illuminate/encryption": "^8.2|^9.0", + "illuminate/http": "^8.2|^9.0", + "illuminate/support": "^8.2|^9.0", "lcobucci/jwt": "^3.4|^4.0", "league/oauth2-server": "^8.2", "nyholm/psr7": "^1.3", @@ -34,7 +34,7 @@ }, "require-dev": { "mockery/mockery": "^1.0", - "orchestra/testbench": "^6.0", + "orchestra/testbench": "^6.0|^7.0", "phpunit/phpunit": "^9.3" }, "autoload": { @@ -49,9 +49,6 @@ } }, "extra": { - "branch-alias": { - "dev-master": "10.x-dev" - }, "laravel": { "providers": [ "Laravel\\Passport\\PassportServiceProvider" From 0ccb534adff3183e212f27fd940307e7bbc29f57 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 11 Jan 2022 21:20:03 +0100 Subject: [PATCH 2/3] Update composer.json --- composer.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/composer.json b/composer.json index 1681c31da..bea4a04e3 100644 --- a/composer.json +++ b/composer.json @@ -49,6 +49,9 @@ } }, "extra": { + "branch-alias": { + "dev-master": "10.x-dev" + }, "laravel": { "providers": [ "Laravel\\Passport\\PassportServiceProvider" From 5ec8e68b147610d6c90518fafa8c1feecbded851 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 11 Jan 2022 21:22:28 +0100 Subject: [PATCH 3/3] Update tests.yml --- .github/workflows/tests.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index bbc5c061e..2d0bcbc33 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,13 +13,13 @@ jobs: strategy: fail-fast: true matrix: - php: [7.3, 7.4, 8.0, 8.1] - laravel: [^8.0, ^9.0] + php: [7.3, 7.4, '8.0', 8.1] + laravel: [8, 9] exclude: - php: 7.3 - laravel: ^9.0 + laravel: 9 - php: 7.4 - laravel: ^9.0 + laravel: 9 name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} @@ -37,7 +37,7 @@ jobs: - name: Install dependencies run: | - composer require "illuminate/contracts=${{ matrix.laravel }}" --no-update + composer require "illuminate/contracts=^${{ matrix.laravel }}" --no-update composer update --prefer-dist --no-interaction --no-progress - name: Execute tests