From 378318dd8592f146fa047681f31f5e88a1cdc934 Mon Sep 17 00:00:00 2001 From: Tim Ohlsen Date: Fri, 12 May 2023 14:42:39 +0200 Subject: [PATCH 1/4] Support php 8.0 and higher --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 72a8fa7..3c0db62 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ } ], "require": { - "php": "^7.2 || ^7.3", + "php": "^7.2 || ^7.3 || ~8.0", "guzzlehttp/guzzle": "~4.0|~5.0|~6.0|~7.0" }, "require-dev": { From 9bb5fc511f4ccebb169a03d012c118448a5c4e1d Mon Sep 17 00:00:00 2001 From: Tim Ohlsen Date: Thu, 25 May 2023 18:25:07 +0200 Subject: [PATCH 2/4] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b5dc6b7..b891f68 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: operating-system: [ ubuntu-latest ] - php-versions: [ '7.2', '7.3' ] + php-versions: [ '7.2', '7.3', '8.0', '8.2' ] name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }} steps: - uses: actions/checkout@v2 From dd925a58e074ee42833b23c4f4b3bc2fc2539469 Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 26 May 2023 14:07:28 +0200 Subject: [PATCH 3/4] PHPUnit now supports phpunit 10 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3c0db62..5b5bfb3 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "guzzlehttp/guzzle": "~4.0|~5.0|~6.0|~7.0" }, "require-dev": { - "phpunit/phpunit": "^5.7 || ^6.5 || ^7.1" + "phpunit/phpunit": "^5.7 || ^6.5 || ^7.1 || ^10.1" }, "config": { "sort-packages": true From 817833b20e32a62e108becfdac37da85911d2550 Mon Sep 17 00:00:00 2001 From: Tim Date: Fri, 26 May 2023 15:19:50 +0200 Subject: [PATCH 4/4] test setUp is now compatible with phpunit --- .github/workflows/test.yml | 2 +- composer.json | 2 +- tests/ApiClientTest.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b891f68..70837be 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: operating-system: [ ubuntu-latest ] - php-versions: [ '7.2', '7.3', '8.0', '8.2' ] + php-versions: [ '7.2', '7.3', '8.2' ] name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }} steps: - uses: actions/checkout@v2 diff --git a/composer.json b/composer.json index 5b5bfb3..ca76280 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ } ], "require": { - "php": "^7.2 || ^7.3 || ~8.0", + "php": "^7.2 || ^7.3 || ^8.2", "guzzlehttp/guzzle": "~4.0|~5.0|~6.0|~7.0" }, "require-dev": { diff --git a/tests/ApiClientTest.php b/tests/ApiClientTest.php index 7886e3d..49bc38f 100644 --- a/tests/ApiClientTest.php +++ b/tests/ApiClientTest.php @@ -15,7 +15,7 @@ class ApiClientTest extends TestCase /** @var SendCloudApiClient */ private $sendCloudApiClient; - protected function setUp() + protected function setUp(): void { parent::setUp(); $this->guzzleClient = $this->createMock(Client::class);