From c9bf808841fe9892104f74b81ed0d424454c77ef Mon Sep 17 00:00:00 2001 From: Shift Date: Thu, 3 Feb 2022 18:58:31 +0000 Subject: [PATCH 1/7] 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/BlockingTest.php | 2 +- tests/CanFilterBlockingTest.php | 2 +- tests/CanFilterFollowingTest.php | 2 +- tests/CanFilterLikingTest.php | 2 +- tests/FollowRequestTest.php | 2 +- tests/FollowTest.php | 2 +- tests/LikingTest.php | 2 +- tests/TestCase.php | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/BlockingTest.php b/tests/BlockingTest.php index aedc32e..2618bcf 100644 --- a/tests/BlockingTest.php +++ b/tests/BlockingTest.php @@ -18,7 +18,7 @@ class BlockingTest extends TestCase protected $simplePage; - public function setUp(): void + protected function setUp(): void { parent::setUp(); diff --git a/tests/CanFilterBlockingTest.php b/tests/CanFilterBlockingTest.php index e8629cb..49f832c 100644 --- a/tests/CanFilterBlockingTest.php +++ b/tests/CanFilterBlockingTest.php @@ -11,7 +11,7 @@ class CanFilterBlockingTest extends TestCase protected $alice; - public function setUp(): void + protected function setUp(): void { parent::setUp(); diff --git a/tests/CanFilterFollowingTest.php b/tests/CanFilterFollowingTest.php index 627c6f6..7dd2d26 100644 --- a/tests/CanFilterFollowingTest.php +++ b/tests/CanFilterFollowingTest.php @@ -11,7 +11,7 @@ class CanFilterFollowingTest extends TestCase protected $alice; - public function setUp(): void + protected function setUp(): void { parent::setUp(); diff --git a/tests/CanFilterLikingTest.php b/tests/CanFilterLikingTest.php index 1e5a2ff..11797f4 100644 --- a/tests/CanFilterLikingTest.php +++ b/tests/CanFilterLikingTest.php @@ -11,7 +11,7 @@ class CanFilterLikingTest extends TestCase protected $alice; - public function setUp(): void + protected function setUp(): void { parent::setUp(); diff --git a/tests/FollowRequestTest.php b/tests/FollowRequestTest.php index 80471a4..325d414 100644 --- a/tests/FollowRequestTest.php +++ b/tests/FollowRequestTest.php @@ -18,7 +18,7 @@ class FollowRequestTest extends TestCase protected $simplePage; - public function setUp(): void + protected function setUp(): void { parent::setUp(); diff --git a/tests/FollowTest.php b/tests/FollowTest.php index 230e131..60376b8 100644 --- a/tests/FollowTest.php +++ b/tests/FollowTest.php @@ -18,7 +18,7 @@ class FollowTest extends TestCase protected $simplePage; - public function setUp(): void + protected function setUp(): void { parent::setUp(); diff --git a/tests/LikingTest.php b/tests/LikingTest.php index 5a822b3..dca8b3f 100644 --- a/tests/LikingTest.php +++ b/tests/LikingTest.php @@ -18,7 +18,7 @@ class LikingTest extends TestCase protected $simplePage; - public function setUp(): void + protected function setUp(): void { parent::setUp(); diff --git a/tests/TestCase.php b/tests/TestCase.php index 80942af..2d3042a 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -16,7 +16,7 @@ abstract class TestCase extends Orchestra * * @return void */ - public function setUp(): void + protected function setUp(): void { parent::setUp(); From fc13faa14873f9ff4be4f9ac6ed207059ed301c1 Mon Sep 17 00:00:00 2001 From: Shift Date: Thu, 3 Feb 2022 18:58:32 +0000 Subject: [PATCH 2/7] Bump dependencies for Laravel 9 --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index cc9607f..a05917b 100644 --- a/composer.json +++ b/composer.json @@ -29,14 +29,14 @@ } ], "require": { - "doctrine/dbal": "^2.10", - "illuminate/database": "^7.30|^8.23", - "illuminate/support": "^7.30|^8.23" + "doctrine/dbal": "^2.10|^3.3", + "illuminate/database": "^7.30|^8.23|^9.0", + "illuminate/support": "^7.30|^8.23|^9.0" }, "require-dev": { "laravel/legacy-factories": "^1.3", - "mockery/mockery": "^1.5", - "orchestra/testbench": "^6.24.0", + "mockery/mockery": "^1.5|^1.4.4", + "orchestra/testbench": "^6.24.0|^7.0", "orchestra/database": "^5.0|^6.0" }, "autoload": { From a56394d9c6b75c3480f85c7157ce2228608ee5ea Mon Sep 17 00:00:00 2001 From: Shift Date: Thu, 3 Feb 2022 18:58:32 +0000 Subject: [PATCH 3/7] Add phpunit/phpunit --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a05917b..c6be310 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,8 @@ "laravel/legacy-factories": "^1.3", "mockery/mockery": "^1.5|^1.4.4", "orchestra/testbench": "^6.24.0|^7.0", - "orchestra/database": "^5.0|^6.0" + "orchestra/database": "^5.0|^6.0", + "phpunit/phpunit": "^9.0" }, "autoload": { "psr-4": { From adb711892292144ba4a7bcd0194d10133da945a6 Mon Sep 17 00:00:00 2001 From: Shift Date: Thu, 3 Feb 2022 18:58:32 +0000 Subject: [PATCH 4/7] Add mockery/mockery --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c6be310..8d68e41 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ }, "require-dev": { "laravel/legacy-factories": "^1.3", - "mockery/mockery": "^1.5|^1.4.4", + "mockery/mockery": "^1.5", "orchestra/testbench": "^6.24.0|^7.0", "orchestra/database": "^5.0|^6.0", "phpunit/phpunit": "^9.0" From 12fb653ad30a2967705b1600ab27a3d96d9eb95a Mon Sep 17 00:00:00 2001 From: Shift Date: Thu, 3 Feb 2022 18:58:32 +0000 Subject: [PATCH 5/7] Add orchestra/testbench --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8d68e41..1b7812c 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,7 @@ "require-dev": { "laravel/legacy-factories": "^1.3", "mockery/mockery": "^1.5", - "orchestra/testbench": "^6.24.0|^7.0", + "orchestra/testbench": "^7.0", "orchestra/database": "^5.0|^6.0", "phpunit/phpunit": "^9.0" }, From 160ff5c550ca2b7a4f6468fb134ea54f39e9edef Mon Sep 17 00:00:00 2001 From: rennokki Date: Thu, 10 Feb 2022 21:16:59 +0200 Subject: [PATCH 6/7] Update composer.json --- composer.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 1b7812c..ff3cc4d 100644 --- a/composer.json +++ b/composer.json @@ -30,15 +30,16 @@ ], "require": { "doctrine/dbal": "^2.10|^3.3", - "illuminate/database": "^7.30|^8.23|^9.0", - "illuminate/support": "^7.30|^8.23|^9.0" + "illuminate/database": "^8.83|^9.0.1", + "illuminate/support": "^8.83|^9.0.1" }, "require-dev": { "laravel/legacy-factories": "^1.3", "mockery/mockery": "^1.5", - "orchestra/testbench": "^7.0", - "orchestra/database": "^5.0|^6.0", - "phpunit/phpunit": "^9.0" + "orchestra/database": "^6.28|^7.0", + "orchestra/testbench": "^6.28|^7.0", + "orchestra/testbench-core": "^6.28|^7.0", + "phpunit/phpunit": "^9.5.13" }, "autoload": { "psr-4": { From 0d372a5a6a8b212c1675bb5bee44c25f5cb4d16c Mon Sep 17 00:00:00 2001 From: rennokki Date: Thu, 10 Feb 2022 21:20:50 +0200 Subject: [PATCH 7/7] Update ci.yml --- .github/workflows/ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1154d54..8e891a7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,21 +15,22 @@ jobs: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: php: - - '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 }}