From 1697ba5cad6d71fa58c7aba6156519492397fe6b Mon Sep 17 00:00:00 2001 From: Shift Date: Thu, 3 Feb 2022 18:47:46 +0000 Subject: [PATCH 1/8] Set return type of base TestCase methods From the [PHPUnit 8 release notes][1], the `TestCase` methods below now declare a `void` return type: - `setUpBeforeClass()` - `setUp()` - `assertPreConditions()` - `assertPostConditions()` - `tearDown()` - `tearDownAfterClass()` - `onNotSuccessfulTest()` [1]: https://phpunit.de/announcements/phpunit-8.html --- tests/TestCase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/TestCase.php b/tests/TestCase.php index 7a6a56e..7b0e70b 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -10,7 +10,7 @@ abstract class TestCase extends Orchestra /** * {@inheritdoc} */ - public function setUp(): void + protected function setUp(): void { parent::setUp(); From 7a781bf65ce884c150d53c85582260f5fabae456 Mon Sep 17 00:00:00 2001 From: Shift Date: Thu, 3 Feb 2022 18:47:47 +0000 Subject: [PATCH 2/8] Bump dependencies for Laravel 9 --- composer.json | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 5b1e33a..1e228e0 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,19 @@ { "name": "renoki-co/hej", "description": "Hej! is a simple authentication boilerplate for Socialite.", - "keywords": ["laravel", "php", "social", "login", "register", "socialite", "facebook", "github", "twitter", "gitlab", "google"], + "keywords": [ + "laravel", + "php", + "social", + "login", + "register", + "socialite", + "facebook", + "github", + "twitter", + "gitlab", + "google" + ], "license": "Apache-2.0", "homepage": "https://github.com/renoki-co/hej", "authors": [ @@ -12,8 +24,8 @@ } ], "require": { - "illuminate/database": "^7.30|^8.24", - "illuminate/support": "^7.30|^8.24", + "illuminate/database": "^7.30|^8.24|^9.0", + "illuminate/support": "^7.30|^8.24|^9.0", "laravel/socialite": "^5.0" }, "autoload": { @@ -31,9 +43,9 @@ }, "require-dev": { "laravel/legacy-factories": "^1.3", - "mockery/mockery": "^1.5", + "mockery/mockery": "^1.5|^1.4.4", "orchestra/database": "^5.0|^6.0", - "orchestra/testbench": "^6.24.0", + "orchestra/testbench": "^6.24.0|^7.0", "orchestra/testbench-browser-kit": "^6.17.2" }, "config": { From a1b7e5276f1afc08e72f6b2ccb5a79e3ec20aaa5 Mon Sep 17 00:00:00 2001 From: Shift Date: Thu, 3 Feb 2022 18:47:47 +0000 Subject: [PATCH 3/8] Add phpunit/phpunit --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1e228e0..b3584a5 100644 --- a/composer.json +++ b/composer.json @@ -46,7 +46,8 @@ "mockery/mockery": "^1.5|^1.4.4", "orchestra/database": "^5.0|^6.0", "orchestra/testbench": "^6.24.0|^7.0", - "orchestra/testbench-browser-kit": "^6.17.2" + "orchestra/testbench-browser-kit": "^6.17.2", + "phpunit/phpunit": "^9.0" }, "config": { "sort-packages": true From e66bf80c5f677f2797053f5b8b904e2981163555 Mon Sep 17 00:00:00 2001 From: Shift Date: Thu, 3 Feb 2022 18:47:47 +0000 Subject: [PATCH 4/8] Add mockery/mockery --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b3584a5..f48c2ad 100644 --- a/composer.json +++ b/composer.json @@ -43,7 +43,7 @@ }, "require-dev": { "laravel/legacy-factories": "^1.3", - "mockery/mockery": "^1.5|^1.4.4", + "mockery/mockery": "^1.5", "orchestra/database": "^5.0|^6.0", "orchestra/testbench": "^6.24.0|^7.0", "orchestra/testbench-browser-kit": "^6.17.2", From 5052c757f85804dee5a1cd60942d6a407ed1b804 Mon Sep 17 00:00:00 2001 From: Shift Date: Thu, 3 Feb 2022 18:47:47 +0000 Subject: [PATCH 5/8] Add orchestra/testbench --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f48c2ad..5923acb 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,7 @@ "laravel/legacy-factories": "^1.3", "mockery/mockery": "^1.5", "orchestra/database": "^5.0|^6.0", - "orchestra/testbench": "^6.24.0|^7.0", + "orchestra/testbench": "^7.0", "orchestra/testbench-browser-kit": "^6.17.2", "phpunit/phpunit": "^9.0" }, From 3a66e29beffb6d8e2a3ab2f4f1cd90276b7d77b0 Mon Sep 17 00:00:00 2001 From: rennokki Date: Thu, 10 Feb 2022 00:35:59 +0200 Subject: [PATCH 6/8] Update composer.json --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 5923acb..8ddd27f 100644 --- a/composer.json +++ b/composer.json @@ -24,9 +24,9 @@ } ], "require": { - "illuminate/database": "^7.30|^8.24|^9.0", - "illuminate/support": "^7.30|^8.24|^9.0", - "laravel/socialite": "^5.0" + "illuminate/database": "^8.83|^9.0.1", + "illuminate/support": "^8.83|^9.0.1", + "laravel/socialite": "^5.3" }, "autoload": { "psr-4": { @@ -44,10 +44,10 @@ "require-dev": { "laravel/legacy-factories": "^1.3", "mockery/mockery": "^1.5", - "orchestra/database": "^5.0|^6.0", - "orchestra/testbench": "^7.0", - "orchestra/testbench-browser-kit": "^6.17.2", - "phpunit/phpunit": "^9.0" + "orchestra/database": "^6.28|^7.0", + "orchestra/testbench": "^6.28|^7.0", + "orchestra/testbench-browser-kit": "^6.28|^7.0", + "phpunit/phpunit": "^9.5.13" }, "config": { "sort-packages": true From 23f4715a603edc56ce92d7f5870b19215ee4314e Mon Sep 17 00:00:00 2001 From: rennokki Date: Thu, 10 Feb 2022 00:36:55 +0200 Subject: [PATCH 7/8] Update ci.yml --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b2427be..fa7e34c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,22 +17,22 @@ jobs: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: php: - - '7.3' - - '7.4' - '8.0' + - '8.1' laravel: - - '7.*' - '8.*' + - '9.*' prefer: - 'prefer-lowest' - 'prefer-stable' include: - - laravel: '7.*' - testbench: '5.*' - laravel: '8.*' testbench: '6.*' + - laravel: '9.*' + testbench: '7.*' name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} --${{ matrix.prefer }} From 82ce7cd28846de6c084723f9a54d8255a0ef93e5 Mon Sep 17 00:00:00 2001 From: rennokki Date: Thu, 10 Feb 2022 00:39:47 +0200 Subject: [PATCH 8/8] Update composer.json --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 8ddd27f..6335bb8 100644 --- a/composer.json +++ b/composer.json @@ -47,6 +47,7 @@ "orchestra/database": "^6.28|^7.0", "orchestra/testbench": "^6.28|^7.0", "orchestra/testbench-browser-kit": "^6.28|^7.0", + "orchestra/testbench-core": "^6.28|^7.0", "phpunit/phpunit": "^9.5.13" }, "config": {