From 9a49aeba27f9602e4d4043e6132fd0b79265122e Mon Sep 17 00:00:00 2001 From: Shift Date: Thu, 3 Feb 2022 18:56:58 +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/TestCase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/TestCase.php b/tests/TestCase.php index 34e7a8b..0f72286 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 e6a4ce3092e9174c7db27e995d1f753d285c6e0f Mon Sep 17 00:00:00 2001 From: Shift Date: Thu, 3 Feb 2022 18:56:59 +0000 Subject: [PATCH 2/7] Bump dependencies for Laravel 9 --- composer.json | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 63451ad..7327f20 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,17 @@ { "name": "renoki-co/laravel-ec2-metadata", "description": "Retrieve the EC2 Metadata using Laravel's eloquent syntax.", - "keywords": ["laravel", "php", "ec2", "aws", "metadata", "instance", "imds", "amazon", "amazonaws"], + "keywords": [ + "laravel", + "php", + "ec2", + "aws", + "metadata", + "instance", + "imds", + "amazon", + "amazonaws" + ], "license": "Apache-2.0", "homepage": "https://github.com/renoki-co/laravel-ec2-metadata", "authors": [ @@ -14,8 +24,8 @@ "require": { "php": "^8.0", "guzzlehttp/guzzle": "^6.5|^7.0", - "illuminate/http": "^8.18", - "illuminate/support": "^8.18" + "illuminate/http": "^8.18|^9.0", + "illuminate/support": "^8.18|^9.0" }, "autoload": { "psr-4": { @@ -31,8 +41,8 @@ "test": "vendor/bin/phpunit" }, "require-dev": { - "mockery/mockery": "^1.5", - "orchestra/testbench": "^6.24.0" + "mockery/mockery": "^1.5|^1.4.4", + "orchestra/testbench": "^6.24.0|^7.0" }, "config": { "sort-packages": true From dd23c51eabe3b63ebbabf02cad83232ef646fa76 Mon Sep 17 00:00:00 2001 From: Shift Date: Thu, 3 Feb 2022 18:56:59 +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 7327f20..679ee8e 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,8 @@ }, "require-dev": { "mockery/mockery": "^1.5|^1.4.4", - "orchestra/testbench": "^6.24.0|^7.0" + "orchestra/testbench": "^6.24.0|^7.0", + "phpunit/phpunit": "^9.0" }, "config": { "sort-packages": true From c685aa4083c155de565099b243cc2e63f8faf587 Mon Sep 17 00:00:00 2001 From: Shift Date: Thu, 3 Feb 2022 18:56:59 +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 679ee8e..3295f11 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,7 @@ "test": "vendor/bin/phpunit" }, "require-dev": { - "mockery/mockery": "^1.5|^1.4.4", + "mockery/mockery": "^1.5", "orchestra/testbench": "^6.24.0|^7.0", "phpunit/phpunit": "^9.0" }, From 31c2a8f6afdac35c8da453e398b3ee44f5cd10c2 Mon Sep 17 00:00:00 2001 From: Shift Date: Thu, 3 Feb 2022 18:56:59 +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 3295f11..1c9ffb3 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,7 @@ }, "require-dev": { "mockery/mockery": "^1.5", - "orchestra/testbench": "^6.24.0|^7.0", + "orchestra/testbench": "^7.0", "phpunit/phpunit": "^9.0" }, "config": { From 4c6ca9c85e77894536aceaa2fc2b214066c0b445 Mon Sep 17 00:00:00 2001 From: rennokki Date: Thu, 3 Feb 2022 22:42:19 +0200 Subject: [PATCH 6/7] Update composer.json --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 1c9ffb3..3ea0da4 100644 --- a/composer.json +++ b/composer.json @@ -24,8 +24,8 @@ "require": { "php": "^8.0", "guzzlehttp/guzzle": "^6.5|^7.0", - "illuminate/http": "^8.18|^9.0", - "illuminate/support": "^8.18|^9.0" + "illuminate/http": "^9.0", + "illuminate/support": "^9.0" }, "autoload": { "psr-4": { From 7d19e9d681bc37a7e9077e108fac779d5b43ca21 Mon Sep 17 00:00:00 2001 From: rennokki Date: Thu, 3 Feb 2022 22:46:39 +0200 Subject: [PATCH 7/7] Update ci.yml --- .github/workflows/ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6556fb4..b3ff0b4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,17 +17,19 @@ jobs: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: php: - '8.0' + - '8.1' laravel: - - 8.* + - 9.* prefer: - 'prefer-lowest' - 'prefer-stable' include: - - laravel: '8.*' - testbench: '6.*' + - laravel: '9.*' + testbench: '7.*' name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} --${{ matrix.prefer }}