From 083c62af7c26417aca849728bd8ca38eb33b879e Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 29 May 2026 10:13:32 +0000 Subject: [PATCH 01/24] Update Paratest to ^7.4, PHPUnit to ^10.5, and prophecy-phpunit to ^2.5 --- composer.json | 6 +++--- phpunit.xml.dist | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index abd83212..75833e05 100644 --- a/composer.json +++ b/composer.json @@ -22,15 +22,15 @@ "symfony/yaml": "^6.2|^7.0|^8.0" }, "require-dev": { - "brianium/paratest": "^6.0", + "brianium/paratest": "^7.4", "jangregor/phpstan-prophecy": "2.2.0", "larapack/dd": "^1.1", "phpmd/phpmd": "^2.9", - "phpspec/prophecy-phpunit": "^2.0", + "phpspec/prophecy-phpunit": "^2.5", "phpstan/phpstan": "2.2.1", "phpstan/phpstan-deprecation-rules": "^2.0", "phpstan/phpstan-phpunit": "^2.0", - "phpunit/phpunit": "^9.3", + "phpunit/phpunit": "^10.5", "rregeer/phpunit-coverage-check": "^0.3.1", "slevomat/coding-standard": "^8.15", "squizlabs/php_codesniffer": "^3.5", diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 24f901e5..5171d815 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,7 +1,7 @@ - - + + src @@ -9,7 +9,7 @@ src/Dictionary/* src/Exception/* - + test/Unit From d02636e5673f93f63b10ea54924ff14b5e05fa30 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 29 May 2026 10:17:18 +0000 Subject: [PATCH 02/24] Cap paratest to ~7.4 to prevent installing 7.5+ --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 75833e05..8545b8a2 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "symfony/yaml": "^6.2|^7.0|^8.0" }, "require-dev": { - "brianium/paratest": "^7.4", + "brianium/paratest": "~7.4", "jangregor/phpstan-prophecy": "2.2.0", "larapack/dd": "^1.1", "phpmd/phpmd": "^2.9", From 0c6dbbefd262b86782b71f1528ac4e5d3f17e9d8 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 29 May 2026 10:36:11 +0000 Subject: [PATCH 03/24] Fix paratest constraint to ~7.4.0 to properly cap at 7.4.x --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8545b8a2..7f65172e 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "symfony/yaml": "^6.2|^7.0|^8.0" }, "require-dev": { - "brianium/paratest": "~7.4", + "brianium/paratest": "~7.4.0", "jangregor/phpstan-prophecy": "2.2.0", "larapack/dd": "^1.1", "phpmd/phpmd": "^2.9", From 942eb4655b23c980622361ec45198636b49a8c25 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 29 May 2026 10:45:43 +0000 Subject: [PATCH 04/24] Support PHPUnit 10-13 and change paratest to ^7.4 --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 7f65172e..d2b10ba1 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "symfony/yaml": "^6.2|^7.0|^8.0" }, "require-dev": { - "brianium/paratest": "~7.4.0", + "brianium/paratest": "^7.4", "jangregor/phpstan-prophecy": "2.2.0", "larapack/dd": "^1.1", "phpmd/phpmd": "^2.9", @@ -30,7 +30,7 @@ "phpstan/phpstan": "2.2.1", "phpstan/phpstan-deprecation-rules": "^2.0", "phpstan/phpstan-phpunit": "^2.0", - "phpunit/phpunit": "^10.5", + "phpunit/phpunit": "^10.5|^11.0|^12.0|^13.0", "rregeer/phpunit-coverage-check": "^0.3.1", "slevomat/coding-standard": "^8.15", "squizlabs/php_codesniffer": "^3.5", From 8b3d5f1db731f1bd709e01bd7ec426181810eaed Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 29 May 2026 10:51:21 +0000 Subject: [PATCH 05/24] Fix paratest constraint to ~7.4.0 || ^7.5 for PHP 8.1 compat --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d2b10ba1..8bfb169d 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "symfony/yaml": "^6.2|^7.0|^8.0" }, "require-dev": { - "brianium/paratest": "^7.4", + "brianium/paratest": "~7.4.0 || ^7.5", "jangregor/phpstan-prophecy": "2.2.0", "larapack/dd": "^1.1", "phpmd/phpmd": "^2.9", From a436707898834fb3bae4f8885d8683dfec40e9d5 Mon Sep 17 00:00:00 2001 From: bytestream Date: Mon, 1 Jun 2026 11:28:18 +0100 Subject: [PATCH 06/24] Allow paratest >=7.3 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8bfb169d..1b068bbf 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "symfony/yaml": "^6.2|^7.0|^8.0" }, "require-dev": { - "brianium/paratest": "~7.4.0 || ^7.5", + "brianium/paratest": "^7.3", "jangregor/phpstan-prophecy": "2.2.0", "larapack/dd": "^1.1", "phpmd/phpmd": "^2.9", From 34ee910b910ee649a18dfe60006b08026cb92d52 Mon Sep 17 00:00:00 2001 From: bytestream Date: Mon, 1 Jun 2026 11:31:24 +0100 Subject: [PATCH 07/24] Add cacheDirectory to phpunit config --- .gitignore | 5 +++-- phpunit.xml.dist | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 264a78e0..693eb4cd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ -.idea -vendor +/.idea +/vendor +/.phpunit.cache/ /.phpunit.result.cache diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 5171d815..7d463868 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,6 +1,10 @@ - + src From f87f66f8224b5e0d3cb673fe785019d9b9ed70bd Mon Sep 17 00:00:00 2001 From: bytestream Date: Mon, 1 Jun 2026 12:15:45 +0100 Subject: [PATCH 08/24] update data provider usages --- test/ApiDataProviders.php | 66 +++++++++---------- test/ApiTestCase.php | 51 ++++++-------- test/Cache/CacheableApisTest.php | 19 +++--- test/ContainerAwareBaseTestCase.php | 14 ++-- test/E2E/BaseTestCase.php | 31 +++++---- test/Functional/SupportPalTest.php | 3 +- test/Integration/ApiClientTest.php | 41 ++++-------- test/Unit/ApiClient/Core/BrandApisTest.php | 11 ++-- test/Unit/ApiClient/Core/SettingsApisTest.php | 6 +- .../ApiClient/SelfService/ArticleApisTest.php | 36 +++++----- .../SelfService/CategoryApisTest.php | 5 +- .../ApiClient/SelfService/CommentApisTest.php | 16 ++--- .../SelfService/SettingsApisTest.php | 6 +- .../ApiClient/SelfService/TagApisTest.php | 11 ++-- .../ApiClient/SelfService/TypeApisTest.php | 11 ++-- .../ApiClient/Ticket/AttachmentApisTest.php | 11 ++-- .../Ticket/ChannelSettingsApisTest.php | 6 +- .../ApiClient/Ticket/CustomFieldApisTest.php | 11 ++-- .../ApiClient/Ticket/DepartmentApisTest.php | 11 ++-- .../Unit/ApiClient/Ticket/MessageApisTest.php | 26 ++++---- .../ApiClient/Ticket/PriorityApisTest.php | 11 ++-- .../ApiClient/Ticket/SettingsApisTest.php | 6 +- test/Unit/ApiClient/Ticket/StatusApisTest.php | 11 ++-- test/Unit/ApiClient/Ticket/TicketApisTest.php | 26 ++++---- test/Unit/ApiClient/User/OperatorApisTest.php | 21 +++--- .../ApiClient/User/OperatorGroupApisTest.php | 11 ++-- .../ApiClient/User/OrganisationApisTest.php | 21 +++--- .../User/OrganisationCustomFieldApisTest.php | 11 ++-- test/Unit/ApiClient/User/SettingsApisTest.php | 6 +- test/Unit/ApiClient/User/UserApisTest.php | 26 ++++---- .../User/UserCustomFieldApisTest.php | 11 ++-- .../Unit/ApiClient/User/UserGroupApisTest.php | 11 ++-- test/Unit/ApiClientTest.php | 16 ++++- .../Cache/CacheableRequestMatcherTest.php | 13 ++-- test/Unit/Config/ApiContextTest.php | 13 ++-- test/Unit/Model/CollectionTest.php | 8 +-- 36 files changed, 278 insertions(+), 336 deletions(-) diff --git a/test/ApiDataProviders.php b/test/ApiDataProviders.php index e0ce912b..86cefe69 100644 --- a/test/ApiDataProviders.php +++ b/test/ApiDataProviders.php @@ -10,9 +10,9 @@ trait ApiDataProviders /** * @return iterable */ - public function provideGetEndpointsTestCases(): iterable + public static function provideGetEndpointsTestCases(): iterable { - foreach ($this->getGetEndpoints() as $endpoint => $value) { + foreach (static::getGetEndpoints() as $endpoint => $value) { [$data, $parameters] = $value; yield [$data, $endpoint, $parameters]; @@ -22,11 +22,11 @@ public function provideGetEndpointsTestCases(): iterable /** * @return iterable */ - public function provideGetEndpointsUnsuccessfulTestCases(): iterable + public static function provideGetEndpointsUnsuccessfulTestCases(): iterable { - foreach ($this->getGetEndpoints() as $endpoint => $value) { + foreach (static::getGetEndpoints() as $endpoint => $value) { $parameters = next($value); - foreach ($this->provideUnsuccessfulResponses() as $testCase) { + foreach (static::provideUnsuccessfulResponses() as $testCase) { yield [current($testCase), $endpoint, $parameters]; } } @@ -35,9 +35,9 @@ public function provideGetEndpointsUnsuccessfulTestCases(): iterable /** * @return iterable */ - public function providePostEndpointsTestCases(): iterable + public static function providePostEndpointsTestCases(): iterable { - foreach ($this->getPostEndpoints() as $endpoint => $value) { + foreach (static::getPostEndpoints() as $endpoint => $value) { [$model, $data] = $value; yield [$model, $data, $endpoint]; @@ -47,9 +47,9 @@ public function providePostEndpointsTestCases(): iterable /** * @return iterable */ - public function providePutEndpointsTestCases(): iterable + public static function providePutEndpointsTestCases(): iterable { - foreach ($this->getPutEndpoints() as $endpoint => $value) { + foreach (static::getPutEndpoints() as $endpoint => $value) { [$model, $data, $response] = $value; yield [$model, $data, $response, $endpoint]; @@ -59,11 +59,11 @@ public function providePutEndpointsTestCases(): iterable /** * @return iterable */ - public function providePostEndpointsUnsuccessfulTestCases(): iterable + public static function providePostEndpointsUnsuccessfulTestCases(): iterable { - foreach ($this->getPostEndpoints() as $endpoint => $value) { + foreach (static::getPostEndpoints() as $endpoint => $value) { $model = current($value); - foreach ($this->provideUnsuccessfulResponses() as $testCase) { + foreach (static::provideUnsuccessfulResponses() as $testCase) { yield [current($testCase), $endpoint, [$model]]; } } @@ -72,11 +72,11 @@ public function providePostEndpointsUnsuccessfulTestCases(): iterable /** * @return iterable */ - public function providePutEndpointsUnsuccessfulTestCases(): iterable + public static function providePutEndpointsUnsuccessfulTestCases(): iterable { - foreach ($this->getPutEndpoints() as $endpoint => $value) { + foreach (static::getPutEndpoints() as $endpoint => $value) { [$model, $data] = $value; - foreach ($this->provideUnsuccessfulResponses() as $testCase) { + foreach (static::provideUnsuccessfulResponses() as $testCase) { yield [current($testCase), $endpoint, [$model, $data]]; } } @@ -85,9 +85,9 @@ public function providePutEndpointsUnsuccessfulTestCases(): iterable /** * @return iterable */ - public function provideApiClientPutEndpointsTestCases(): iterable + public static function provideApiClientPutEndpointsTestCases(): iterable { - foreach ($this->getPutEndpoints() as $endpoint => $value) { + foreach (static::getPutEndpoints() as $endpoint => $value) { [$data, $response] = $value; yield [$data, $response, $endpoint]; @@ -97,10 +97,10 @@ public function provideApiClientPutEndpointsTestCases(): iterable /** * @return iterable */ - public function provideDeleteEndpointsUnsuccessfulTestCases(): iterable + public static function provideDeleteEndpointsUnsuccessfulTestCases(): iterable { - foreach ($this->getDeleteEndpoints() as $endpoint => $id) { - foreach ($this->provideUnsuccessfulResponses() as $testCase) { + foreach (static::getDeleteEndpoints() as $endpoint => $id) { + foreach (static::provideUnsuccessfulResponses() as $testCase) { yield [current($testCase), $endpoint, [$id]]; } } @@ -109,9 +109,9 @@ public function provideDeleteEndpointsUnsuccessfulTestCases(): iterable /** * @return iterable */ - public function provideDeleteEndpointsTestCases(): iterable + public static function provideDeleteEndpointsTestCases(): iterable { - foreach ($this->getDeleteEndpoints() as $endpoint => $id) { + foreach (static::getDeleteEndpoints() as $endpoint => $id) { yield [$id, $endpoint]; } } @@ -119,9 +119,9 @@ public function provideDeleteEndpointsTestCases(): iterable /** * @return iterable */ - public function provideDownloadEndpointsTestCases(): iterable + public static function provideDownloadEndpointsTestCases(): iterable { - foreach ($this->getDownloadsEndpoints() as $endpoint => $model) { + foreach (static::getDownloadsEndpoints() as $endpoint => $model) { yield [$model, $endpoint]; } } @@ -129,10 +129,10 @@ public function provideDownloadEndpointsTestCases(): iterable /** * @return iterable */ - public function provideDownloadUnsuccessfulTestCases(): iterable + public static function provideDownloadUnsuccessfulTestCases(): iterable { - foreach ($this->getDownloadsEndpoints() as $endpoint => $model) { - foreach ($this->provideUnsuccessfulResponses() as $testCase) { + foreach (static::getDownloadsEndpoints() as $endpoint => $model) { + foreach (static::provideUnsuccessfulResponses() as $testCase) { yield [current($testCase), $endpoint, [$model]]; } } @@ -141,30 +141,30 @@ public function provideDownloadUnsuccessfulTestCases(): iterable /** * @return array */ - abstract protected function getGetEndpoints(): array; + abstract protected static function getGetEndpoints(): array; /** * @return array */ - abstract protected function getPostEndpoints(): array; + abstract protected static function getPostEndpoints(): array; /** * @return array */ - abstract protected function getPutEndpoints(): array; + abstract protected static function getPutEndpoints(): array; /** * @return array */ - abstract protected function getDeleteEndpoints(): array; + abstract protected static function getDeleteEndpoints(): array; /** * @return array */ - abstract protected function getDownloadsEndpoints(): array; + abstract protected static function getDownloadsEndpoints(): array; /** * @return iterable */ - abstract protected function provideUnsuccessfulResponses(): iterable; + abstract protected static function provideUnsuccessfulResponses(): iterable; } diff --git a/test/ApiTestCase.php b/test/ApiTestCase.php index 6140cc14..efa7c801 100644 --- a/test/ApiTestCase.php +++ b/test/ApiTestCase.php @@ -14,12 +14,9 @@ abstract class ApiTestCase extends ContainerAwareBaseTestCase { - /** - * @dataProvider provideGetEndpointsTestCases - * @param array $data - * @param array $parameters - * @throws Exception + /** * @throws Exception */ + #[DataProvider('provideGetEndpointsTestCases')] public function testGetEndpoint(array $data, string $functionName, array $parameters): void { $this->appendRequestResponse( @@ -39,9 +36,8 @@ public function testGetEndpoint(array $data, string $functionName, array $parame /** * @param Response $response * @param array $parameters - * @throws Exception - * @dataProvider provideGetEndpointsUnsuccessfulTestCases - */ + * @throws Exception */ + #[DataProvider('provideGetEndpointsUnsuccessfulTestCases')] public function testUnsuccessfulGetEndpoint(Response $response, string $endpoint, array $parameters): void { $this->prepareUnsuccessfulApiRequest($response); @@ -52,9 +48,8 @@ public function testUnsuccessfulGetEndpoint(Response $response, string $endpoint /** * @param array $responseData - * @throws Exception - * @dataProvider providePostEndpointsTestCases - */ + * @throws Exception */ + #[DataProvider('providePostEndpointsTestCases')] public function testSuccessfulPostEndpoint(Model $model, array $responseData, string $functionName): void { $jsonSuccessfulBody = json_encode($responseData) ?: throw new JsonException('Failed to encode JSON.'); @@ -67,9 +62,8 @@ public function testSuccessfulPostEndpoint(Model $model, array $responseData, st /** * @param array $parameters - * @throws Exception - * @dataProvider providePostEndpointsUnsuccessfulTestCases - */ + * @throws Exception */ + #[DataProvider('providePostEndpointsUnsuccessfulTestCases')] public function testUnsuccessfulPostEndpoint(Response $response, string $endpoint, array $parameters): void { $this->prepareUnsuccessfulApiRequest($response); @@ -80,9 +74,8 @@ public function testUnsuccessfulPostEndpoint(Response $response, string $endpoin /** * @param array $responseData - * @throws Exception - * @dataProvider providePutEndpointsTestCases - */ + * @throws Exception */ + #[DataProvider('providePutEndpointsTestCases')] public function testSuccessfulPutEndpoint( int $id, Model $model, @@ -99,9 +92,8 @@ public function testSuccessfulPutEndpoint( /** * @param array $parameters - * @throws Exception - * @dataProvider providePutEndpointsUnsuccessfulTestCases - */ + * @throws Exception */ + #[DataProvider('providePutEndpointsUnsuccessfulTestCases')] public function testUnsuccessfulPutEndpoint(Response $response, string $endpoint, array $parameters): void { $this->prepareUnsuccessfulApiRequest($response); @@ -111,9 +103,8 @@ public function testUnsuccessfulPutEndpoint(Response $response, string $endpoint } /** - * @throws Exception - * @dataProvider provideDeleteEndpointsTestCases - */ + * @throws Exception */ + #[DataProvider('provideDeleteEndpointsTestCases')] public function testSuccessfulDeleteEndpoint(int $id, string $functionName): void { $jsonSuccessfulBody = json_encode(['status' => 'success']) ?: throw new JsonException('Failed to encode JSON.'); @@ -125,9 +116,8 @@ public function testSuccessfulDeleteEndpoint(int $id, string $functionName): voi /** * @param array $parameters - * @throws Exception - * @dataProvider provideDeleteEndpointsUnsuccessfulTestCases - */ + * @throws Exception */ + #[DataProvider('provideDeleteEndpointsUnsuccessfulTestCases')] public function testUnsuccessfulDeleteEndpoint(Response $response, string $endpoint, array $parameters): void { $this->prepareUnsuccessfulApiRequest($response); @@ -136,9 +126,7 @@ public function testUnsuccessfulDeleteEndpoint(Response $response, string $endpo call_user_func_array($callable, $parameters); } - /** - * @dataProvider provideDownloadEndpointsTestCases - */ + #[DataProvider('provideDownloadEndpointsTestCases')] public function testDownloadEndpoint(int $id, string $functionName): void { $this->appendRequestResponse(new Response(200, ['Content-Disposition' => 'test'], '')); @@ -149,10 +137,9 @@ public function testDownloadEndpoint(int $id, string $functionName): void } /** - * @param array $parameters - * @dataProvider provideDownloadUnsuccessfulTestCases - * @throws Exception + * @param array $parameters * @throws Exception */ + #[DataProvider('provideDownloadUnsuccessfulTestCases')] public function testUnsuccessfulDownloadEndpoint(Response $response, string $endpoint, array $parameters): void { $this->prepareUnsuccessfulApiRequest($response); diff --git a/test/Cache/CacheableApisTest.php b/test/Cache/CacheableApisTest.php index 27bc009e..938fa2de 100644 --- a/test/Cache/CacheableApisTest.php +++ b/test/Cache/CacheableApisTest.php @@ -60,9 +60,8 @@ class CacheableApisTest extends ContainerAwareBaseTestCase * @param array $data * @param array $parameters * @param class-string $apiClientClass - * @throws Exception - * @dataProvider provideCacheableApiCalls - */ + * @throws Exception */ + #[DataProvider('provideCacheableApiCalls')] public function testGetCacheableApiTestCacheHit( string $endpoint, array $data, @@ -92,9 +91,8 @@ public function testGetCacheableApiTestCacheHit( * @param array $data * @param array $parameters * @param class-string $apiClientClass - * @throws Exception - * @dataProvider provideCacheableApiCalls - */ + * @throws Exception */ + #[DataProvider('provideCacheableApiCalls')] public function testGetCacheableApiTestCacheMiss( string $endpoint, array $data, @@ -140,9 +138,8 @@ public function testGetCacheableApiTestCacheMiss( * @param array $data * @param array $parameters * @param class-string $apiClientClass - * @throws Exception - * @dataProvider provideNonCacheableApis - */ + * @throws Exception */ + #[DataProvider('provideNonCacheableApis')] public function testNonCacheableApisAlwaysMiss( string $endpoint, array $data, @@ -178,7 +175,7 @@ protected function tearDown(): void /** * @return iterable */ - public function provideCacheableApiCalls(): iterable + public static function provideCacheableApiCalls(): iterable { /** Core Apis */ $brandData = new BrandData; @@ -253,7 +250,7 @@ public function provideCacheableApiCalls(): iterable /** * @return iterable */ - public function provideNonCacheableApis(): iterable + public static function provideNonCacheableApis(): iterable { /** SelfService Apis */ $attachmentData = new ArticleAttachmentData; diff --git a/test/ContainerAwareBaseTestCase.php b/test/ContainerAwareBaseTestCase.php index 365274ea..6697914d 100644 --- a/test/ContainerAwareBaseTestCase.php +++ b/test/ContainerAwareBaseTestCase.php @@ -42,9 +42,15 @@ abstract class ContainerAwareBaseTestCase extends TestCase /** * @return iterable> */ - public function provideUnsuccessfulResponses(): iterable + public static function provideUnsuccessfulResponses(): iterable { - $jsonSuccessfulBody = $this->genericErrorResponse; + $genericErrorResponse = [ + 'status' => 'error', + 'message' => null, + 'data' => [] + ]; + + $jsonSuccessfulBody = $genericErrorResponse; $jsonSuccessfulBody['status'] = 'success'; $jsonSuccessfulBody = json_encode($jsonSuccessfulBody) ?: throw new JsonException('Failed to encode JSON data.'); @@ -53,10 +59,10 @@ public function provideUnsuccessfulResponses(): iterable yield ['error 403 response' => new Response(403, [], $jsonSuccessfulBody)]; yield ['error 404 response' => new Response(404, [], $jsonSuccessfulBody)]; - $jsonErrorBody = json_encode($this->genericErrorResponse) ?: throw new JsonException('Failed to encode JSON data.'); + $jsonErrorBody = json_encode($genericErrorResponse) ?: throw new JsonException('Failed to encode JSON data.'); yield [ - 'error status response' => new Response(200, [], $jsonErrorBody) + 'error status response' => new Response(200, [], $jsonErrorBody), ]; } diff --git a/test/E2E/BaseTestCase.php b/test/E2E/BaseTestCase.php index 4013c971..8832b0a8 100644 --- a/test/E2E/BaseTestCase.php +++ b/test/E2E/BaseTestCase.php @@ -3,6 +3,7 @@ namespace SupportPal\ApiClient\Tests\E2E; use GuzzleHttp\Client; +use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\ExpectationFailedException; use SupportPal\ApiClient\Api\CoreApi; use SupportPal\ApiClient\Api\SelfServiceApi; @@ -55,9 +56,8 @@ public function setUp(): void } /** - * @throws HttpResponseException - * @dataProvider provideGetAllEndpoints - */ + * @throws HttpResponseException */ + #[DataProvider('provideGetAllEndpoints')] public function testGetAll(string $endpoint, string $apiCall): void { $start = 1; @@ -96,9 +96,9 @@ public function testGetAll(string $endpoint, string $apiCall): void /** * @return iterable */ - public function provideGetAllEndpoints(): iterable + public static function provideGetAllEndpoints(): iterable { - foreach ($this->getGetAllEndpoints() as $endpoint => $apiCall) { + foreach (static::getGetAllEndpoints() as $endpoint => $apiCall) { yield [$endpoint, $apiCall]; } } @@ -106,11 +106,10 @@ public function provideGetAllEndpoints(): iterable /** * @return string[] */ - abstract protected function getGetAllEndpoints(): array; + abstract protected static function getGetAllEndpoints(): array; - /** - * @dataProvider provideGetOneEndpoints - */ + /** */ + #[DataProvider('provideGetOneEndpoints')] public function testGetOne(string $endpoint, string $apiCall): void { $iteration = 1; @@ -146,9 +145,9 @@ public function testGetOne(string $endpoint, string $apiCall): void /** * @return iterable */ - public function provideGetOneEndpoints(): iterable + public static function provideGetOneEndpoints(): iterable { - foreach ($this->getGetOneEndpoints() as $endpoint => $apiCall) { + foreach (static::getGetOneEndpoints() as $endpoint => $apiCall) { yield [$endpoint, $apiCall]; } } @@ -156,12 +155,12 @@ public function provideGetOneEndpoints(): iterable /** * @return string[] */ - abstract protected function getGetOneEndpoints(): array; + abstract protected static function getGetOneEndpoints(): array; /** * @param mixed[] $data - * @dataProvider providePostEndpoints */ + #[DataProvider('providePostEndpoints')] public function testPost(string $endpoint, array $data): void { $iteration = 1; @@ -193,9 +192,9 @@ public function testPost(string $endpoint, array $data): void /** * @return iterable */ - public function providePostEndpoints(): iterable + public static function providePostEndpoints(): iterable { - foreach ($this->getPostEndpoints() as $endpoint => $data) { + foreach (static::getPostEndpoints() as $endpoint => $data) { yield [$endpoint, $data]; } } @@ -203,7 +202,7 @@ public function providePostEndpoints(): iterable /** * @return array */ - abstract protected function getPostEndpoints(): array; + abstract protected static function getPostEndpoints(): array; protected function settingsTestCase(string $endpoint, string $apiCall): void { diff --git a/test/Functional/SupportPalTest.php b/test/Functional/SupportPalTest.php index b593f40c..fe57b4f5 100644 --- a/test/Functional/SupportPalTest.php +++ b/test/Functional/SupportPalTest.php @@ -49,10 +49,10 @@ public function testSendRequestUnSuccessful(): void } /** - * @dataProvider provideApiTokens * @param string $apiToken * @throws Exception */ + #[DataProvider('provideApiTokens')] public function testEscapePercentApiToken(string $apiToken): void { $request = (new SupportPal(new ApiContext('localhost', $apiToken)))->getRequest()->create('GET', 'test'); @@ -62,7 +62,6 @@ public function testEscapePercentApiToken(string $apiToken): void /** * @return iterable> */ - public function provideApiTokens(): iterable { yield ['api_token_without_percent']; yield ['api_token%']; diff --git a/test/Integration/ApiClientTest.php b/test/Integration/ApiClientTest.php index b55dba4f..0032581a 100644 --- a/test/Integration/ApiClientTest.php +++ b/test/Integration/ApiClientTest.php @@ -59,13 +59,9 @@ public function testResponseNonEncodeableException(): void $this->apiClient->sendRequest($request); } - /** - * @dataProvider provideGetEndpointsTestCases - * @param array $data - * @param string $functionName - * @param array $parameters - * @throws Exception + /** * @throws Exception */ + #[DataProvider('provideGetEndpointsTestCases')] public function testGetEndpoints(array $data, string $functionName, array $parameters): void { $expectedResponse = new Response( @@ -83,22 +79,17 @@ public function testGetEndpoints(array $data, string $functionName, array $param * @param Response $response * @param string $endpoint * @param array $parameters - * @throws Exception - * @dataProvider provideGetEndpointsUnsuccessfulTestCases - */ + * @throws Exception */ + #[DataProvider('provideGetEndpointsUnsuccessfulTestCases')] public function testUnsuccessfulGetEndpoint(Response $response, string $endpoint, array $parameters): void { $this->prepareUnsuccessfulApiRequest($response); $this->makeClientCall($endpoint, $parameters); } - /** - * @dataProvider providePostEndpointsTestCases - * @param array $modelData - * @param array $responseData - * @param string $endpoint - * @throws Exception + /** * @throws Exception */ + #[DataProvider('providePostEndpointsTestCases')] public function testPostModel(array $modelData, array $responseData, string $endpoint): void { $jsonSuccessfulBody = json_encode($responseData) ?: throw new JsonException('Failed to encode JSON data.'); @@ -116,22 +107,17 @@ public function testPostModel(array $modelData, array $responseData, string $end * @param Response $response * @param string $endpoint * @param array $data - * @throws Exception - * @dataProvider providePostEndpointsUnsuccessfulTestCases - */ + * @throws Exception */ + #[DataProvider('providePostEndpointsUnsuccessfulTestCases')] public function testUnsuccessfulPostModel(Response $response, string $endpoint, array $data): void { $this->prepareUnsuccessfulApiRequest($response); $this->makeClientCall($endpoint, [$data]); } - /** - * @dataProvider provideApiClientPutEndpointsTestCases - * @param array $modelData - * @param array $responseData - * @param string $endpoint - * @throws Exception + /** * @throws Exception */ + #[DataProvider('provideApiClientPutEndpointsTestCases')] public function testPutModel(array $modelData, array $responseData, string $endpoint): void { $jsonSuccessfulBody = json_encode($responseData) ?: throw new JsonException('Failed to encode JSON data.'); @@ -149,9 +135,8 @@ public function testPutModel(array $modelData, array $responseData, string $endp * @param Response $response * @param string $endpoint * @param array $data - * @throws Exception - * @dataProvider providePutEndpointsUnsuccessfulTestCases - */ + * @throws Exception */ + #[DataProvider('providePutEndpointsUnsuccessfulTestCases')] public function testUnsuccessfulPutModel(Response $response, string $endpoint, array $data): void { $this->prepareUnsuccessfulApiRequest($response); @@ -161,8 +146,8 @@ public function testUnsuccessfulPutModel(Response $response, string $endpoint, a /** * @param int $modelId * @param string $endpoint - * @dataProvider provideDownloadEndpointsTestCases */ + #[DataProvider('provideDownloadEndpointsTestCases')] public function testDownloadEndpoint(int $modelId, string $endpoint): void { $expectedResponse = new Response(200, ['Content-Disposition' => 'test'], ''); diff --git a/test/Unit/ApiClient/Core/BrandApisTest.php b/test/Unit/ApiClient/Core/BrandApisTest.php index f860150b..b5e03d93 100644 --- a/test/Unit/ApiClient/Core/BrandApisTest.php +++ b/test/Unit/ApiClient/Core/BrandApisTest.php @@ -2,6 +2,7 @@ namespace SupportPal\ApiClient\Tests\Unit\ApiClient\Core; +use PHPUnit\Framework\Attributes\DataProvider; use SupportPal\ApiClient\Dictionary\ApiDictionary; use SupportPal\ApiClient\Exception\HttpResponseException; use SupportPal\ApiClient\Http\CoreClient; @@ -42,9 +43,8 @@ public function testHttpExceptionGetBrands(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetBrands(int $statusCode, string $responseBody): void { $queryParams = ['test' => 'value']; @@ -88,9 +88,8 @@ public function testHttpExceptionGetBrand(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetBrand(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); diff --git a/test/Unit/ApiClient/Core/SettingsApisTest.php b/test/Unit/ApiClient/Core/SettingsApisTest.php index 3f759f85..2112dd4c 100644 --- a/test/Unit/ApiClient/Core/SettingsApisTest.php +++ b/test/Unit/ApiClient/Core/SettingsApisTest.php @@ -2,6 +2,7 @@ namespace SupportPal\ApiClient\Tests\Unit\ApiClient\Core; +use PHPUnit\Framework\Attributes\DataProvider; use SupportPal\ApiClient\Dictionary\ApiDictionary; use SupportPal\ApiClient\Exception\HttpResponseException; use SupportPal\ApiClient\Http\CoreClient; @@ -30,9 +31,8 @@ public function testSuccessfulGetCoreSettings(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetCoreSettings(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); diff --git a/test/Unit/ApiClient/SelfService/ArticleApisTest.php b/test/Unit/ApiClient/SelfService/ArticleApisTest.php index 2cc6db6b..0d9f634f 100644 --- a/test/Unit/ApiClient/SelfService/ArticleApisTest.php +++ b/test/Unit/ApiClient/SelfService/ArticleApisTest.php @@ -2,6 +2,7 @@ namespace SupportPal\ApiClient\Tests\Unit\ApiClient\SelfService; +use PHPUnit\Framework\Attributes\DataProvider; use SupportPal\ApiClient\Dictionary\ApiDictionary; use SupportPal\ApiClient\Exception\HttpResponseException; use SupportPal\ApiClient\Http\SelfServiceClient; @@ -44,9 +45,8 @@ public function testHttpExceptionGetArticlesByTerm(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetArticlesByTerm(int $statusCode, string $responseBody): void { $queryParams = ['test' => 'value']; @@ -90,9 +90,8 @@ public function testHttpExceptionGetArticle(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetArticle(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); @@ -130,9 +129,8 @@ public function testHttpExceptionGetArticles(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetArticles(int $statusCode, string $responseBody): void { $queryParams = []; @@ -176,9 +174,8 @@ public function testHttpExceptionGetRelatedArticles(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetRelatedArticles(int $statusCode, string $responseBody): void { $queryParams = []; @@ -209,9 +206,8 @@ public function testPostArticle(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testPostUnsuccessfulArticle(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); @@ -264,9 +260,8 @@ public function testHttpExceptionUpdateArticle(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulUpdateArticle(int $statusCode, string $responseBody): void { $articleData = new ArticleData; @@ -304,9 +299,8 @@ public function testHttpExceptionDeleteArticle(): void $this->apiClient->deleteArticle($this->testArticleId); } - /** - * @dataProvider provideUnsuccessfulTestCases - */ + /** */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulDeleteArticle(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); diff --git a/test/Unit/ApiClient/SelfService/CategoryApisTest.php b/test/Unit/ApiClient/SelfService/CategoryApisTest.php index 198875f4..b31ef869 100644 --- a/test/Unit/ApiClient/SelfService/CategoryApisTest.php +++ b/test/Unit/ApiClient/SelfService/CategoryApisTest.php @@ -2,6 +2,7 @@ namespace SupportPal\ApiClient\Tests\Unit\ApiClient\SelfService; +use PHPUnit\Framework\Attributes\DataProvider; use SupportPal\ApiClient\Dictionary\ApiDictionary; use SupportPal\ApiClient\Exception\HttpResponseException; use SupportPal\ApiClient\Http\SelfServiceClient; @@ -43,8 +44,8 @@ public function testHttpExceptionGetCategories(): void /** * @param int $statusCode * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetCategories(int $statusCode, string $responseBody): void { $queryParams = ['test' => 'value']; @@ -89,8 +90,8 @@ public function testHttpExceptionGetCategory(): void /** * @param int $statusCode * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetCategory(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); diff --git a/test/Unit/ApiClient/SelfService/CommentApisTest.php b/test/Unit/ApiClient/SelfService/CommentApisTest.php index 7b829a6f..a5c2b8c8 100644 --- a/test/Unit/ApiClient/SelfService/CommentApisTest.php +++ b/test/Unit/ApiClient/SelfService/CommentApisTest.php @@ -2,6 +2,7 @@ namespace SupportPal\ApiClient\Tests\Unit\ApiClient\SelfService; +use PHPUnit\Framework\Attributes\DataProvider; use SupportPal\ApiClient\Dictionary\ApiDictionary; use SupportPal\ApiClient\Exception\HttpResponseException; use SupportPal\ApiClient\Http\SelfServiceClient; @@ -33,9 +34,8 @@ public function testPostSelfServiceComment(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulPostSelfServiceComment(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); @@ -76,9 +76,8 @@ public function testHttpExceptionGetComments(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetComments(int $statusCode, string $responseBody): void { $queryParams = ['test' => 'value']; @@ -122,9 +121,8 @@ public function testHttpExceptionGetComment(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetComment(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); diff --git a/test/Unit/ApiClient/SelfService/SettingsApisTest.php b/test/Unit/ApiClient/SelfService/SettingsApisTest.php index 38f60f94..f5f76bb3 100644 --- a/test/Unit/ApiClient/SelfService/SettingsApisTest.php +++ b/test/Unit/ApiClient/SelfService/SettingsApisTest.php @@ -2,6 +2,7 @@ namespace SupportPal\ApiClient\Tests\Unit\ApiClient\SelfService; +use PHPUnit\Framework\Attributes\DataProvider; use SupportPal\ApiClient\Dictionary\ApiDictionary; use SupportPal\ApiClient\Exception\HttpResponseException; use SupportPal\ApiClient\Http\SelfServiceClient; @@ -38,9 +39,8 @@ public function testHttpExceptionGetSettings(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetSettings(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); diff --git a/test/Unit/ApiClient/SelfService/TagApisTest.php b/test/Unit/ApiClient/SelfService/TagApisTest.php index 8f064c72..52ba788b 100644 --- a/test/Unit/ApiClient/SelfService/TagApisTest.php +++ b/test/Unit/ApiClient/SelfService/TagApisTest.php @@ -2,6 +2,7 @@ namespace SupportPal\ApiClient\Tests\Unit\ApiClient\SelfService; +use PHPUnit\Framework\Attributes\DataProvider; use SupportPal\ApiClient\Dictionary\ApiDictionary; use SupportPal\ApiClient\Exception\HttpResponseException; use SupportPal\ApiClient\Http\SelfServiceClient; @@ -52,9 +53,8 @@ public function testHttpExceptionGetTag(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetTag(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); @@ -92,9 +92,8 @@ public function testHttpExceptionGetTags(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetTags(int $statusCode, string $responseBody): void { $queryParams = []; diff --git a/test/Unit/ApiClient/SelfService/TypeApisTest.php b/test/Unit/ApiClient/SelfService/TypeApisTest.php index e695e6e6..f148a892 100644 --- a/test/Unit/ApiClient/SelfService/TypeApisTest.php +++ b/test/Unit/ApiClient/SelfService/TypeApisTest.php @@ -2,6 +2,7 @@ namespace SupportPal\ApiClient\Tests\Unit\ApiClient\SelfService; +use PHPUnit\Framework\Attributes\DataProvider; use SupportPal\ApiClient\Dictionary\ApiDictionary; use SupportPal\ApiClient\Exception\HttpResponseException; use SupportPal\ApiClient\Http\SelfServiceClient; @@ -42,9 +43,8 @@ public function testHttpExceptionGetTypes(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetTypes(int $statusCode, string $responseBody): void { $queryParams = ['test' => 'value']; @@ -88,9 +88,8 @@ public function testHttpExceptionGetType(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetType(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); diff --git a/test/Unit/ApiClient/Ticket/AttachmentApisTest.php b/test/Unit/ApiClient/Ticket/AttachmentApisTest.php index e92736b8..4742f84e 100644 --- a/test/Unit/ApiClient/Ticket/AttachmentApisTest.php +++ b/test/Unit/ApiClient/Ticket/AttachmentApisTest.php @@ -3,6 +3,7 @@ namespace SupportPal\ApiClient\Tests\Unit\ApiClient\Ticket; use GuzzleHttp\Psr7\Request; +use PHPUnit\Framework\Attributes\DataProvider; use Psr\Http\Message\ResponseInterface; use SupportPal\ApiClient\Dictionary\ApiDictionary; use SupportPal\ApiClient\Exception\HttpResponseException; @@ -45,9 +46,8 @@ public function testHttpExceptionGetAttachments(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetAttachments(int $statusCode, string $responseBody): void { $queryParams = []; @@ -91,9 +91,8 @@ public function testHttpExceptionGetAttachment(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetAttachment(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); diff --git a/test/Unit/ApiClient/Ticket/ChannelSettingsApisTest.php b/test/Unit/ApiClient/Ticket/ChannelSettingsApisTest.php index 46ad13ed..e51ab589 100644 --- a/test/Unit/ApiClient/Ticket/ChannelSettingsApisTest.php +++ b/test/Unit/ApiClient/Ticket/ChannelSettingsApisTest.php @@ -2,6 +2,7 @@ namespace SupportPal\ApiClient\Tests\Unit\ApiClient\Ticket; +use PHPUnit\Framework\Attributes\DataProvider; use SupportPal\ApiClient\Dictionary\ApiDictionary; use SupportPal\ApiClient\Exception\HttpResponseException; use SupportPal\ApiClient\Http\TicketClient; @@ -39,9 +40,8 @@ public function testSuccessfulGetChannelSettings(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetChannelSettings(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); diff --git a/test/Unit/ApiClient/Ticket/CustomFieldApisTest.php b/test/Unit/ApiClient/Ticket/CustomFieldApisTest.php index ffc90cf3..060a12f4 100644 --- a/test/Unit/ApiClient/Ticket/CustomFieldApisTest.php +++ b/test/Unit/ApiClient/Ticket/CustomFieldApisTest.php @@ -2,6 +2,7 @@ namespace SupportPal\ApiClient\Tests\Unit\ApiClient\Ticket; +use PHPUnit\Framework\Attributes\DataProvider; use SupportPal\ApiClient\Dictionary\ApiDictionary; use SupportPal\ApiClient\Exception\HttpResponseException; use SupportPal\ApiClient\Http\TicketClient; @@ -42,9 +43,8 @@ public function testHttpExceptionGetTicketCustomFields(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetTicketCustomFields(int $statusCode, string $responseBody): void { $queryParams = []; @@ -88,9 +88,8 @@ public function testHttpExceptionGetCustomField(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetCustomField(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); diff --git a/test/Unit/ApiClient/Ticket/DepartmentApisTest.php b/test/Unit/ApiClient/Ticket/DepartmentApisTest.php index 458d33a2..5b71480b 100644 --- a/test/Unit/ApiClient/Ticket/DepartmentApisTest.php +++ b/test/Unit/ApiClient/Ticket/DepartmentApisTest.php @@ -2,6 +2,7 @@ namespace SupportPal\ApiClient\Tests\Unit\ApiClient\Ticket; +use PHPUnit\Framework\Attributes\DataProvider; use SupportPal\ApiClient\Dictionary\ApiDictionary; use SupportPal\ApiClient\Exception\HttpResponseException; use SupportPal\ApiClient\Http\TicketClient; @@ -42,9 +43,8 @@ public function testHttpExceptionGetDepartments(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetDepartments(int $statusCode, string $responseBody): void { $queryParams = []; @@ -88,9 +88,8 @@ public function testHttpExceptionGetDepartment(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetDepartment(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); diff --git a/test/Unit/ApiClient/Ticket/MessageApisTest.php b/test/Unit/ApiClient/Ticket/MessageApisTest.php index 33e3940f..020a8a5e 100644 --- a/test/Unit/ApiClient/Ticket/MessageApisTest.php +++ b/test/Unit/ApiClient/Ticket/MessageApisTest.php @@ -2,6 +2,7 @@ namespace SupportPal\ApiClient\Tests\Unit\ApiClient\Ticket; +use PHPUnit\Framework\Attributes\DataProvider; use SupportPal\ApiClient\Dictionary\ApiDictionary; use SupportPal\ApiClient\Exception\HttpResponseException; use SupportPal\ApiClient\Http\TicketClient; @@ -46,9 +47,8 @@ public function testHttpExceptionGetMessages(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetMessages(int $statusCode, string $responseBody): void { $queryParams = ['ticket_id' => $this->testTicketId]; @@ -82,9 +82,8 @@ public function testHttpExceptionGetMessage(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetMessage(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); @@ -109,9 +108,8 @@ public function testPostMessage(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulPostMessage(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); @@ -164,9 +162,8 @@ public function testHttpExceptionUpdateMessage(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulUpdateMessage(int $statusCode, string $responseBody): void { $messageData = new MessageData; @@ -204,9 +201,8 @@ public function testHttpExceptionDeleteMessage(): void $this->apiClient->deleteMessage($this->testMessageId); } - /** - * @dataProvider provideUnsuccessfulTestCases - */ + /** */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulDeleteMessage(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); diff --git a/test/Unit/ApiClient/Ticket/PriorityApisTest.php b/test/Unit/ApiClient/Ticket/PriorityApisTest.php index 4dc88f84..bc4b523d 100644 --- a/test/Unit/ApiClient/Ticket/PriorityApisTest.php +++ b/test/Unit/ApiClient/Ticket/PriorityApisTest.php @@ -2,6 +2,7 @@ namespace SupportPal\ApiClient\Tests\Unit\ApiClient\Ticket; +use PHPUnit\Framework\Attributes\DataProvider; use SupportPal\ApiClient\Dictionary\ApiDictionary; use SupportPal\ApiClient\Exception\HttpResponseException; use SupportPal\ApiClient\Http\TicketClient; @@ -42,9 +43,8 @@ public function testHttpExceptionGetPriorities(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetPriorities(int $statusCode, string $responseBody): void { $queryParams = []; @@ -88,9 +88,8 @@ public function testHttpExceptionGetPriority(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetPriority(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); diff --git a/test/Unit/ApiClient/Ticket/SettingsApisTest.php b/test/Unit/ApiClient/Ticket/SettingsApisTest.php index eb5218e4..9f484ebc 100644 --- a/test/Unit/ApiClient/Ticket/SettingsApisTest.php +++ b/test/Unit/ApiClient/Ticket/SettingsApisTest.php @@ -2,6 +2,7 @@ namespace SupportPal\ApiClient\Tests\Unit\ApiClient\Ticket; +use PHPUnit\Framework\Attributes\DataProvider; use SupportPal\ApiClient\Dictionary\ApiDictionary; use SupportPal\ApiClient\Exception\HttpResponseException; use SupportPal\ApiClient\Http\TicketClient; @@ -30,9 +31,8 @@ public function testSuccessfulGetTicketSettings(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetTicketSettings(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); diff --git a/test/Unit/ApiClient/Ticket/StatusApisTest.php b/test/Unit/ApiClient/Ticket/StatusApisTest.php index 62199c92..4509b465 100644 --- a/test/Unit/ApiClient/Ticket/StatusApisTest.php +++ b/test/Unit/ApiClient/Ticket/StatusApisTest.php @@ -2,6 +2,7 @@ namespace SupportPal\ApiClient\Tests\Unit\ApiClient\Ticket; +use PHPUnit\Framework\Attributes\DataProvider; use SupportPal\ApiClient\Dictionary\ApiDictionary; use SupportPal\ApiClient\Exception\HttpResponseException; use SupportPal\ApiClient\Http\TicketClient; @@ -42,9 +43,8 @@ public function testHttpExceptionGetStatuses(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetStatuses(int $statusCode, string $responseBody): void { $queryParams = []; @@ -88,9 +88,8 @@ public function testHttpExceptionGetStatus(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetStatus(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); diff --git a/test/Unit/ApiClient/Ticket/TicketApisTest.php b/test/Unit/ApiClient/Ticket/TicketApisTest.php index 881fba9f..9fbe786c 100644 --- a/test/Unit/ApiClient/Ticket/TicketApisTest.php +++ b/test/Unit/ApiClient/Ticket/TicketApisTest.php @@ -2,6 +2,7 @@ namespace SupportPal\ApiClient\Tests\Unit\ApiClient\Ticket; +use PHPUnit\Framework\Attributes\DataProvider; use SupportPal\ApiClient\Dictionary\ApiDictionary; use SupportPal\ApiClient\Exception\HttpResponseException; use SupportPal\ApiClient\Http\TicketClient; @@ -42,9 +43,8 @@ public function testHttpExceptionGetTickets(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetTickets(int $statusCode, string $responseBody): void { $queryParams = []; @@ -88,9 +88,8 @@ public function testHttpExceptionGetTicket(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetTicket(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); @@ -120,9 +119,8 @@ public function testPostTicket(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testPostUnsuccessfulTicket(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); @@ -177,9 +175,8 @@ public function testHttpExceptionUpdateTicket(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulUpdateTicket(int $statusCode, string $responseBody): void { $ticketData = new TicketData; @@ -217,9 +214,8 @@ public function testHttpExceptionDeleteTicket(): void $this->apiClient->deleteTicket($this->testTicketId); } - /** - * @dataProvider provideUnsuccessfulTestCases - */ + /** */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulDeleteTicket(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); diff --git a/test/Unit/ApiClient/User/OperatorApisTest.php b/test/Unit/ApiClient/User/OperatorApisTest.php index 50073e93..c872f14e 100644 --- a/test/Unit/ApiClient/User/OperatorApisTest.php +++ b/test/Unit/ApiClient/User/OperatorApisTest.php @@ -2,6 +2,7 @@ namespace SupportPal\ApiClient\Tests\Unit\ApiClient\User; +use PHPUnit\Framework\Attributes\DataProvider; use SupportPal\ApiClient\Dictionary\ApiDictionary; use SupportPal\ApiClient\Exception\HttpResponseException; use SupportPal\ApiClient\Http\UserClient; @@ -42,9 +43,8 @@ public function testHttpExceptionGetOperators(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetOperators(int $statusCode, string $responseBody): void { $queryParams = ['test' => 'value']; @@ -88,9 +88,8 @@ public function testHttpExceptionGetOperator(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetOperator(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); @@ -120,9 +119,8 @@ public function testPostOperator(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testPostUnsuccessfulOperator(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); @@ -175,9 +173,8 @@ public function testHttpExceptionUpdateOperator(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulUpdateOperator(int $statusCode, string $responseBody): void { $userData = new OperatorData; diff --git a/test/Unit/ApiClient/User/OperatorGroupApisTest.php b/test/Unit/ApiClient/User/OperatorGroupApisTest.php index d91441b8..7652f073 100644 --- a/test/Unit/ApiClient/User/OperatorGroupApisTest.php +++ b/test/Unit/ApiClient/User/OperatorGroupApisTest.php @@ -2,6 +2,7 @@ namespace SupportPal\ApiClient\Tests\Unit\ApiClient\User; +use PHPUnit\Framework\Attributes\DataProvider; use SupportPal\ApiClient\Dictionary\ApiDictionary; use SupportPal\ApiClient\Exception\HttpResponseException; use SupportPal\ApiClient\Http\UserClient; @@ -42,9 +43,8 @@ public function testHttpExceptionGetOperatorGroups(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetOperatorGroups(int $statusCode, string $responseBody): void { $queryParams = []; @@ -88,9 +88,8 @@ public function testHttpExceptionGetOperatorGroup(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetOperatorGroup(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); diff --git a/test/Unit/ApiClient/User/OrganisationApisTest.php b/test/Unit/ApiClient/User/OrganisationApisTest.php index c0f36436..10a9f875 100644 --- a/test/Unit/ApiClient/User/OrganisationApisTest.php +++ b/test/Unit/ApiClient/User/OrganisationApisTest.php @@ -2,6 +2,7 @@ namespace SupportPal\ApiClient\Tests\Unit\ApiClient\User; +use PHPUnit\Framework\Attributes\DataProvider; use SupportPal\ApiClient\Dictionary\ApiDictionary; use SupportPal\ApiClient\Exception\HttpResponseException; use SupportPal\ApiClient\Http\UserClient; @@ -42,9 +43,8 @@ public function testHttpExceptionGetOrganisations(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetOrganisations(int $statusCode, string $responseBody): void { $queryParams = ['test' => 'value']; @@ -88,9 +88,8 @@ public function testHttpExceptionGetOrganisation(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetOrganisation(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); @@ -120,9 +119,8 @@ public function testPostOrganisation(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testPostUnsuccessfulOrganisation(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); @@ -175,9 +173,8 @@ public function testHttpExceptionUpdateOrganisation(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulUpdateOrganisation(int $statusCode, string $responseBody): void { $userData = new OrganisationData; diff --git a/test/Unit/ApiClient/User/OrganisationCustomFieldApisTest.php b/test/Unit/ApiClient/User/OrganisationCustomFieldApisTest.php index eb28e6aa..0cb8a8eb 100644 --- a/test/Unit/ApiClient/User/OrganisationCustomFieldApisTest.php +++ b/test/Unit/ApiClient/User/OrganisationCustomFieldApisTest.php @@ -2,6 +2,7 @@ namespace SupportPal\ApiClient\Tests\Unit\ApiClient\User; +use PHPUnit\Framework\Attributes\DataProvider; use SupportPal\ApiClient\Dictionary\ApiDictionary; use SupportPal\ApiClient\Exception\HttpResponseException; use SupportPal\ApiClient\Http\UserClient; @@ -42,9 +43,8 @@ public function testHttpExceptionGetOrganisationCustomFields(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetOrganisationCustomFields(int $statusCode, string $responseBody): void { $queryParams = []; @@ -86,9 +86,8 @@ public function testHttpExceptionGetOrganisationCustomField(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetOrganisationCustomField(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); diff --git a/test/Unit/ApiClient/User/SettingsApisTest.php b/test/Unit/ApiClient/User/SettingsApisTest.php index 4b8017cb..1c2af82d 100644 --- a/test/Unit/ApiClient/User/SettingsApisTest.php +++ b/test/Unit/ApiClient/User/SettingsApisTest.php @@ -2,6 +2,7 @@ namespace SupportPal\ApiClient\Tests\Unit\ApiClient\User; +use PHPUnit\Framework\Attributes\DataProvider; use SupportPal\ApiClient\Dictionary\ApiDictionary; use SupportPal\ApiClient\Exception\HttpResponseException; use SupportPal\ApiClient\Http\UserClient; @@ -30,9 +31,8 @@ public function testSuccessfulGetCoreSettings(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetCoreSettings(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); diff --git a/test/Unit/ApiClient/User/UserApisTest.php b/test/Unit/ApiClient/User/UserApisTest.php index da2540da..debcbb6d 100644 --- a/test/Unit/ApiClient/User/UserApisTest.php +++ b/test/Unit/ApiClient/User/UserApisTest.php @@ -2,6 +2,7 @@ namespace SupportPal\ApiClient\Tests\Unit\ApiClient\User; +use PHPUnit\Framework\Attributes\DataProvider; use SupportPal\ApiClient\Dictionary\ApiDictionary; use SupportPal\ApiClient\Exception\HttpResponseException; use SupportPal\ApiClient\Http\UserClient; @@ -42,9 +43,8 @@ public function testHttpExceptionGetUsers(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetUsers(int $statusCode, string $responseBody): void { $queryParams = ['test' => 'value']; @@ -88,9 +88,8 @@ public function testHttpExceptionGetUser(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetUser(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); @@ -120,9 +119,8 @@ public function testPostUser(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testPostUnsuccessfulUser(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); @@ -175,9 +173,8 @@ public function testHttpExceptionUpdateUser(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulUpdateUser(int $statusCode, string $responseBody): void { $userData = new UserData; @@ -215,9 +212,8 @@ public function testHttpExceptionDeleteUser(): void $this->apiClient->deleteUser($this->testUserId); } - /** - * @dataProvider provideUnsuccessfulTestCases - */ + /** */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulDeleteUser(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); diff --git a/test/Unit/ApiClient/User/UserCustomFieldApisTest.php b/test/Unit/ApiClient/User/UserCustomFieldApisTest.php index a7d2b572..7567b743 100644 --- a/test/Unit/ApiClient/User/UserCustomFieldApisTest.php +++ b/test/Unit/ApiClient/User/UserCustomFieldApisTest.php @@ -2,6 +2,7 @@ namespace SupportPal\ApiClient\Tests\Unit\ApiClient\User; +use PHPUnit\Framework\Attributes\DataProvider; use SupportPal\ApiClient\Dictionary\ApiDictionary; use SupportPal\ApiClient\Exception\HttpResponseException; use SupportPal\ApiClient\Http\UserClient; @@ -42,9 +43,8 @@ public function testHttpExceptionGetUserCustomFields(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetUserCustomFields(int $statusCode, string $responseBody): void { $queryParams = []; @@ -88,9 +88,8 @@ public function testHttpExceptionGetUserCustomField(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetUserCustomField(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); diff --git a/test/Unit/ApiClient/User/UserGroupApisTest.php b/test/Unit/ApiClient/User/UserGroupApisTest.php index 79b2fedd..03584c43 100644 --- a/test/Unit/ApiClient/User/UserGroupApisTest.php +++ b/test/Unit/ApiClient/User/UserGroupApisTest.php @@ -2,6 +2,7 @@ namespace SupportPal\ApiClient\Tests\Unit\ApiClient\User; +use PHPUnit\Framework\Attributes\DataProvider; use SupportPal\ApiClient\Dictionary\ApiDictionary; use SupportPal\ApiClient\Exception\HttpResponseException; use SupportPal\ApiClient\Http\UserClient; @@ -42,9 +43,8 @@ public function testHttpExceptionGetUserGroups(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetUserGroups(int $statusCode, string $responseBody): void { $queryParams = []; @@ -88,9 +88,8 @@ public function testHttpExceptionGetUserGroup(): void /** * @param int $statusCode - * @param string $responseBody - * @dataProvider provideUnsuccessfulTestCases - */ + * @param string $responseBody */ + #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetUserGroup(int $statusCode, string $responseBody): void { self::expectException(HttpResponseException::class); diff --git a/test/Unit/ApiClientTest.php b/test/Unit/ApiClientTest.php index 9a5f379d..04280476 100644 --- a/test/Unit/ApiClientTest.php +++ b/test/Unit/ApiClientTest.php @@ -103,9 +103,15 @@ public function testResponseNonEncodeableException(): void /** * @return iterable */ - public function provideUnsuccessfulTestCases(): iterable + public static function provideUnsuccessfulTestCases(): iterable { - $jsonErrorBody = $this->genericErrorResponse; + $genericErrorResponse = [ + 'status' => 'error', + 'message' => null, + 'data' => [] + ]; + + $jsonErrorBody = $genericErrorResponse; $jsonErrorBody['status'] = 'success'; $jsonSuccessfulBody = json_encode($jsonErrorBody) ?: throw new JsonException('Failed to encode JSON data.'); @@ -114,7 +120,11 @@ public function provideUnsuccessfulTestCases(): iterable yield ['error 403 response' => 403, $jsonSuccessfulBody]; yield ['error 404 response' => 404, $jsonSuccessfulBody]; - $jsonErrorBody = json_encode($this->genericErrorResponse) ?: throw new JsonException('Failed to encode JSON data.'); + $jsonErrorBody = json_encode([ + 'status' => 'error', + 'message' => null, + 'data' => [] + ]) ?: throw new JsonException('Failed to encode JSON data.'); yield [ 'error status response' => 200, $jsonErrorBody, diff --git a/test/Unit/Cache/CacheableRequestMatcherTest.php b/test/Unit/Cache/CacheableRequestMatcherTest.php index 1d7e239d..9c25511c 100644 --- a/test/Unit/Cache/CacheableRequestMatcherTest.php +++ b/test/Unit/Cache/CacheableRequestMatcherTest.php @@ -4,6 +4,7 @@ use GuzzleHttp\Psr7\Request; use GuzzleHttp\Psr7\Uri; +use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; use Prophecy\PhpUnit\ProphecyTrait; use SupportPal\ApiClient\Cache\CacheableRequestMatcher; @@ -24,18 +25,14 @@ protected function setUp(): void ]); } - /** - * @dataProvider provideCachableCases - */ + #[DataProvider('provideCachableCases')] public function testCachableRequest(string $path, string $method): void { $matches = $this->cacheableRequestMatcher->matches(new Request($method, new Uri($path))); self::assertTrue($matches); } - /** - * @dataProvider provideNonCachableCases - */ + #[DataProvider('provideNonCachableCases')] public function testNotCachableRequest(string $path, string $method): void { $matches = $this->cacheableRequestMatcher->matches(new Request($method, new Uri($path))); @@ -45,7 +42,7 @@ public function testNotCachableRequest(string $path, string $method): void /** * @return iterable> */ - public function provideCachableCases(): iterable + public static function provideCachableCases(): iterable { yield [ApiDictionary::CORE_SETTINGS, 'GET']; } @@ -53,7 +50,7 @@ public function provideCachableCases(): iterable /** * @return iterable> */ - public function provideNonCachableCases(): iterable + public static function provideNonCachableCases(): iterable { yield [ApiDictionary::SELF_SERVICE_COMMENT, 'GET']; yield [ApiDictionary::SELF_SERVICE_COMMENT, 'POST']; diff --git a/test/Unit/Config/ApiContextTest.php b/test/Unit/Config/ApiContextTest.php index 06c7ac59..4c9c6360 100644 --- a/test/Unit/Config/ApiContextTest.php +++ b/test/Unit/Config/ApiContextTest.php @@ -2,6 +2,7 @@ namespace SupportPal\ApiClient\Tests\Unit\Config; +use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; use Prophecy\PhpUnit\ProphecyTrait; use SupportPal\ApiClient\Config\ApiContext; @@ -32,8 +33,8 @@ public function testToken(): void /** * @param ApiContext $apiContext * @param string $expected - * @dataProvider provideGetApiUrlCases */ + #[DataProvider('provideGetApiUrlCases')] public function testGetApiUrl(ApiContext $apiContext, string $expected): void { self::assertSame($expected, $apiContext->getApiUrl()); @@ -42,8 +43,8 @@ public function testGetApiUrl(ApiContext $apiContext, string $expected): void /** * @param ApiContext $apiContext * @param string $expected - * @dataProvider provideGetApiPathCases */ + #[DataProvider('provideGetApiPathCases')] public function testGetApiPath(ApiContext $apiContext, string $expected): void { self::assertSame($expected, $apiContext->getApiPath()); @@ -69,8 +70,8 @@ public function testEnableSsl(): void * @param string $url * @param string $expected * @throws InvalidArgumentException - * @dataProvider provideCreateFromUrlCases */ + #[DataProvider('provideCreateFromUrlCases')] public function testCreateFromUrl(string $url, string $expected): void { $apiContext = ApiContext::createFromUrl($url, self::TOKEN); @@ -80,7 +81,7 @@ public function testCreateFromUrl(string $url, string $expected): void /** * @return iterable> */ - public function provideGetApiUrlCases(): iterable + public static function provideGetApiUrlCases(): iterable { $apiContext = (new ApiContext(self::HOST, self::TOKEN))->enableSsl()->setPath('/test/'); @@ -110,7 +111,7 @@ public function provideGetApiUrlCases(): iterable /** * @return iterable> */ - public function provideGetApiPathCases(): iterable + public static function provideGetApiPathCases(): iterable { $apiContext = (new ApiContext(self::HOST, self::TOKEN))->setPath('/test/'); @@ -128,7 +129,7 @@ public function provideGetApiPathCases(): iterable /** * @return iterable> */ - public function provideCreateFromUrlCases(): iterable + public static function provideCreateFromUrlCases(): iterable { yield ['http://localhost/test/test/', 'http://localhost:80/test/test/api/']; yield ['http://localhost/test/test/api/', 'http://localhost:80/test/test/api/api/']; diff --git a/test/Unit/Model/CollectionTest.php b/test/Unit/Model/CollectionTest.php index b7d89fda..94899790 100644 --- a/test/Unit/Model/CollectionTest.php +++ b/test/Unit/Model/CollectionTest.php @@ -65,7 +65,7 @@ public function testCollectionMap(): void public function testCollectionFilter(): void { - $models = $this->getModelsTestData(); + $models = self::getModelsTestData(); $count = count($models); $collection = new Collection($count, $models); @@ -98,9 +98,7 @@ public function testCollectionFirst(): void /** * @param Collection $collection - * @param bool $actualIsEmpty - * @dataProvider provideIsEmptyCases - */ + * @param bool $actualIsEmpty */ public function testCollectionIsEmpty(Collection $collection, bool $actualIsEmpty): void { self::assertSame($collection->isEmpty(), $actualIsEmpty); @@ -110,7 +108,7 @@ public function testCollectionIsEmpty(Collection $collection, bool $actualIsEmpt * @return iterable * @throws InvalidArgumentException */ - public function provideIsEmptyCases(): iterable + public static function provideIsEmptyCases(): iterable { $models = $this->getModelsTestData(); From eae28d2a64d50201f41b861cc0787730e8dd5aec Mon Sep 17 00:00:00 2001 From: bytestream Date: Mon, 1 Jun 2026 12:33:22 +0100 Subject: [PATCH 09/24] update data provider usages --- test/ApiTestCase.php | 27 +++++++++----- test/Functional/SupportPalTest.php | 1 + test/Integration/ApiClient/CoreApisTest.php | 6 ++-- .../ApiClient/SelfServiceApisTest.php | 6 ++-- test/Integration/ApiClient/TicketApisTest.php | 8 ++--- test/Integration/ApiClient/UserApisTest.php | 6 ++-- test/Integration/ApiClientTest.php | 35 +++++++++++++------ 7 files changed, 57 insertions(+), 32 deletions(-) diff --git a/test/ApiTestCase.php b/test/ApiTestCase.php index efa7c801..0730d7a0 100644 --- a/test/ApiTestCase.php +++ b/test/ApiTestCase.php @@ -5,6 +5,7 @@ use Exception; use GuzzleHttp\Psr7\Response; use JsonException; +use PHPUnit\Framework\Attributes\DataProvider; use Psr\Http\Message\StreamInterface; use SupportPal\ApiClient\Api\Api; use SupportPal\ApiClient\Model\Model; @@ -14,7 +15,10 @@ abstract class ApiTestCase extends ContainerAwareBaseTestCase { - /** * @throws Exception + /** + * @param array $data + * @param array $parameters + * @throws Exception */ #[DataProvider('provideGetEndpointsTestCases')] public function testGetEndpoint(array $data, string $functionName, array $parameters): void @@ -36,7 +40,8 @@ public function testGetEndpoint(array $data, string $functionName, array $parame /** * @param Response $response * @param array $parameters - * @throws Exception */ + * @throws Exception + */ #[DataProvider('provideGetEndpointsUnsuccessfulTestCases')] public function testUnsuccessfulGetEndpoint(Response $response, string $endpoint, array $parameters): void { @@ -48,7 +53,8 @@ public function testUnsuccessfulGetEndpoint(Response $response, string $endpoint /** * @param array $responseData - * @throws Exception */ + * @throws Exception + */ #[DataProvider('providePostEndpointsTestCases')] public function testSuccessfulPostEndpoint(Model $model, array $responseData, string $functionName): void { @@ -62,7 +68,8 @@ public function testSuccessfulPostEndpoint(Model $model, array $responseData, st /** * @param array $parameters - * @throws Exception */ + * @throws Exception + */ #[DataProvider('providePostEndpointsUnsuccessfulTestCases')] public function testUnsuccessfulPostEndpoint(Response $response, string $endpoint, array $parameters): void { @@ -74,7 +81,8 @@ public function testUnsuccessfulPostEndpoint(Response $response, string $endpoin /** * @param array $responseData - * @throws Exception */ + * @throws Exception + */ #[DataProvider('providePutEndpointsTestCases')] public function testSuccessfulPutEndpoint( int $id, @@ -92,7 +100,8 @@ public function testSuccessfulPutEndpoint( /** * @param array $parameters - * @throws Exception */ + * @throws Exception + */ #[DataProvider('providePutEndpointsUnsuccessfulTestCases')] public function testUnsuccessfulPutEndpoint(Response $response, string $endpoint, array $parameters): void { @@ -103,7 +112,8 @@ public function testUnsuccessfulPutEndpoint(Response $response, string $endpoint } /** - * @throws Exception */ + * @throws Exception + */ #[DataProvider('provideDeleteEndpointsTestCases')] public function testSuccessfulDeleteEndpoint(int $id, string $functionName): void { @@ -116,7 +126,8 @@ public function testSuccessfulDeleteEndpoint(int $id, string $functionName): voi /** * @param array $parameters - * @throws Exception */ + * @throws Exception + */ #[DataProvider('provideDeleteEndpointsUnsuccessfulTestCases')] public function testUnsuccessfulDeleteEndpoint(Response $response, string $endpoint, array $parameters): void { diff --git a/test/Functional/SupportPalTest.php b/test/Functional/SupportPalTest.php index fe57b4f5..f80334fa 100644 --- a/test/Functional/SupportPalTest.php +++ b/test/Functional/SupportPalTest.php @@ -62,6 +62,7 @@ public function testEscapePercentApiToken(string $apiToken): void /** * @return iterable> */ + public static function provideApiTokens(): iterable { yield ['api_token_without_percent']; yield ['api_token%']; diff --git a/test/Integration/ApiClient/CoreApisTest.php b/test/Integration/ApiClient/CoreApisTest.php index 95313894..b063d978 100644 --- a/test/Integration/ApiClient/CoreApisTest.php +++ b/test/Integration/ApiClient/CoreApisTest.php @@ -12,7 +12,7 @@ class CoreApisTest extends ApiClientTest /** * @inheritDoc */ - protected function getGetEndpoints(): array + protected static function getGetEndpoints(): array { $brandData = new BrandData; @@ -26,7 +26,7 @@ protected function getGetEndpoints(): array /** * @inheritDoc */ - protected function getPostEndpoints(): array + protected static function getPostEndpoints(): array { return []; } @@ -34,7 +34,7 @@ protected function getPostEndpoints(): array /** * @inheritDoc */ - protected function getPutEndpoints(): array + protected static function getPutEndpoints(): array { return []; } diff --git a/test/Integration/ApiClient/SelfServiceApisTest.php b/test/Integration/ApiClient/SelfServiceApisTest.php index d583629c..c5fae96d 100644 --- a/test/Integration/ApiClient/SelfServiceApisTest.php +++ b/test/Integration/ApiClient/SelfServiceApisTest.php @@ -17,7 +17,7 @@ class SelfServiceApisTest extends ApiClientTest /** * @inheritDoc */ - protected function getGetEndpoints(): array + protected static function getGetEndpoints(): array { $typeData = new TypeData; $commentData = new CommentData; @@ -46,7 +46,7 @@ protected function getGetEndpoints(): array /** * @inheritDoc */ - protected function getPostEndpoints(): array + protected static function getPostEndpoints(): array { $commentData = new CommentData; $createCommentData = new CreateCommentData; @@ -59,7 +59,7 @@ protected function getPostEndpoints(): array /** * @inheritDoc */ - public function getPutEndpoints(): array + public static function getPutEndpoints(): array { return []; } diff --git a/test/Integration/ApiClient/TicketApisTest.php b/test/Integration/ApiClient/TicketApisTest.php index ebf50470..69222ab0 100644 --- a/test/Integration/ApiClient/TicketApisTest.php +++ b/test/Integration/ApiClient/TicketApisTest.php @@ -22,7 +22,7 @@ class TicketApisTest extends ApiClientTest /** * @inheritDoc */ - protected function getGetEndpoints(): array + protected static function getGetEndpoints(): array { $departmentData = new DepartmentData; $settingsData = new SettingsData; @@ -57,7 +57,7 @@ protected function getGetEndpoints(): array /** * @inheritDoc */ - protected function getPostEndpoints(): array + protected static function getPostEndpoints(): array { $createTicket = new CreateTicketData; $createMessage = new CreateMessageData; @@ -71,7 +71,7 @@ protected function getPostEndpoints(): array /** * @inheritDoc */ - protected function getPutEndpoints(): array + protected static function getPutEndpoints(): array { $updateTicketData = new UpdateTicketData; @@ -83,7 +83,7 @@ protected function getPutEndpoints(): array /** * @return array */ - protected function getDownloadsEndpoints(): array + protected static function getDownloadsEndpoints(): array { return ['downloadAttachment' => 1]; } diff --git a/test/Integration/ApiClient/UserApisTest.php b/test/Integration/ApiClient/UserApisTest.php index 72f97414..444ef460 100644 --- a/test/Integration/ApiClient/UserApisTest.php +++ b/test/Integration/ApiClient/UserApisTest.php @@ -15,7 +15,7 @@ class UserApisTest extends ApiClientTest /** * @inheritDoc */ - protected function getGetEndpoints(): array + protected static function getGetEndpoints(): array { $userData = new UserData; $customFieldsData = new UserCustomFieldData; @@ -34,7 +34,7 @@ protected function getGetEndpoints(): array /** * @inheritDoc */ - protected function getPostEndpoints(): array + protected static function getPostEndpoints(): array { return [ 'postUser' => [CreateUserData::DATA, (new UserData)->getResponse()], @@ -44,7 +44,7 @@ protected function getPostEndpoints(): array /** * @inheritDoc */ - protected function getPutEndpoints(): array + protected static function getPutEndpoints(): array { return [ 'putUser' => [UpdateUserData::DATA, (new UserData)->getResponse()], diff --git a/test/Integration/ApiClientTest.php b/test/Integration/ApiClientTest.php index 0032581a..810a8250 100644 --- a/test/Integration/ApiClientTest.php +++ b/test/Integration/ApiClientTest.php @@ -7,6 +7,7 @@ use GuzzleHttp\Psr7\Request; use GuzzleHttp\Psr7\Response; use JsonException; +use PHPUnit\Framework\Attributes\DataProvider; use Psr\Http\Message\ResponseInterface; use SupportPal\ApiClient\Exception\HttpResponseException; use SupportPal\ApiClient\Http\Client; @@ -59,7 +60,10 @@ public function testResponseNonEncodeableException(): void $this->apiClient->sendRequest($request); } - /** * @throws Exception + /** + * @param array $data + * @param array $parameters + * @throws Exception */ #[DataProvider('provideGetEndpointsTestCases')] public function testGetEndpoints(array $data, string $functionName, array $parameters): void @@ -79,7 +83,8 @@ public function testGetEndpoints(array $data, string $functionName, array $param * @param Response $response * @param string $endpoint * @param array $parameters - * @throws Exception */ + * @throws Exception + */ #[DataProvider('provideGetEndpointsUnsuccessfulTestCases')] public function testUnsuccessfulGetEndpoint(Response $response, string $endpoint, array $parameters): void { @@ -87,7 +92,10 @@ public function testUnsuccessfulGetEndpoint(Response $response, string $endpoint $this->makeClientCall($endpoint, $parameters); } - /** * @throws Exception + /** + * @param array $modelData + * @param array $responseData + * @throws Exception */ #[DataProvider('providePostEndpointsTestCases')] public function testPostModel(array $modelData, array $responseData, string $endpoint): void @@ -107,7 +115,8 @@ public function testPostModel(array $modelData, array $responseData, string $end * @param Response $response * @param string $endpoint * @param array $data - * @throws Exception */ + * @throws Exception + */ #[DataProvider('providePostEndpointsUnsuccessfulTestCases')] public function testUnsuccessfulPostModel(Response $response, string $endpoint, array $data): void { @@ -115,7 +124,10 @@ public function testUnsuccessfulPostModel(Response $response, string $endpoint, $this->makeClientCall($endpoint, [$data]); } - /** * @throws Exception + /** + * @param array $modelData + * @param array $responseData + * @throws Exception */ #[DataProvider('provideApiClientPutEndpointsTestCases')] public function testPutModel(array $modelData, array $responseData, string $endpoint): void @@ -135,7 +147,8 @@ public function testPutModel(array $modelData, array $responseData, string $endp * @param Response $response * @param string $endpoint * @param array $data - * @throws Exception */ + * @throws Exception + */ #[DataProvider('providePutEndpointsUnsuccessfulTestCases')] public function testUnsuccessfulPutModel(Response $response, string $endpoint, array $data): void { @@ -159,7 +172,7 @@ public function testDownloadEndpoint(int $modelId, string $endpoint): void /** * @return array */ - protected function getGetEndpoints(): array + protected static function getGetEndpoints(): array { return []; } @@ -167,7 +180,7 @@ protected function getGetEndpoints(): array /** * @return array */ - protected function getPostEndpoints(): array + protected static function getPostEndpoints(): array { return []; } @@ -175,7 +188,7 @@ protected function getPostEndpoints(): array /** * @return array */ - protected function getPutEndpoints(): array + protected static function getPutEndpoints(): array { return []; } @@ -183,7 +196,7 @@ protected function getPutEndpoints(): array /** * @return array */ - protected function getDeleteEndpoints(): array + protected static function getDeleteEndpoints(): array { return []; } @@ -191,7 +204,7 @@ protected function getDeleteEndpoints(): array /** * @return array */ - protected function getDownloadsEndpoints(): array + protected static function getDownloadsEndpoints(): array { return []; } From 6295d2e5695df48da6f516179f9aa5f603ce32be Mon Sep 17 00:00:00 2001 From: bytestream Date: Mon, 1 Jun 2026 12:35:24 +0100 Subject: [PATCH 10/24] refactor getModelsTestData to static in CollectionTest --- test/Unit/Model/CollectionTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Unit/Model/CollectionTest.php b/test/Unit/Model/CollectionTest.php index 94899790..c0156ce3 100644 --- a/test/Unit/Model/CollectionTest.php +++ b/test/Unit/Model/CollectionTest.php @@ -110,7 +110,7 @@ public function testCollectionIsEmpty(Collection $collection, bool $actualIsEmpt */ public static function provideIsEmptyCases(): iterable { - $models = $this->getModelsTestData(); + $models = self::getModelsTestData(); yield [new Collection(0, []), true]; yield [ new Collection(15, []), true]; @@ -122,7 +122,7 @@ public static function provideIsEmptyCases(): iterable * @return Model[] * @throws InvalidArgumentException */ - private function getModelsTestData(): array + private static function getModelsTestData(): array { return array_map(function () { return (new CommentData)->getFilledInstance(); From b6ee670ee3d1f1b0b53d06e28bbdccad1bad4879 Mon Sep 17 00:00:00 2001 From: bytestream Date: Mon, 1 Jun 2026 12:54:38 +0100 Subject: [PATCH 11/24] phpstan fixes --- test/Cache/CacheableApisTest.php | 1 + test/E2E/CoreApisTest.php | 6 +++--- test/E2E/SelfServiceApisTest.php | 6 +++--- test/E2E/TicketApisTest.php | 6 +++--- test/E2E/UserApisTest.php | 6 +++--- test/Functional/Api/CoreApisTest.php | 10 +++++----- test/Functional/Api/SelfServiceApisTest.php | 10 +++++----- test/Functional/Api/TicketApisTest.php | 10 +++++----- test/Functional/Api/UserApisTest.php | 10 +++++----- test/Functional/SupportPalTest.php | 1 + test/Integration/Api/CoreApisComponentTest.php | 10 +++++----- test/Integration/Api/SelfServiceApisComponentTest.php | 10 +++++----- test/Integration/Api/TicketApisComponentTest.php | 10 +++++----- test/Integration/Api/UserApisComponentTest.php | 10 +++++----- 14 files changed, 54 insertions(+), 52 deletions(-) diff --git a/test/Cache/CacheableApisTest.php b/test/Cache/CacheableApisTest.php index 938fa2de..393ec462 100644 --- a/test/Cache/CacheableApisTest.php +++ b/test/Cache/CacheableApisTest.php @@ -9,6 +9,7 @@ use GuzzleHttp\Psr7\Response; use Kevinrob\GuzzleCache\CacheMiddleware; use Kevinrob\GuzzleCache\Strategy\CacheStrategyInterface; +use PHPUnit\Framework\Attributes\DataProvider; use SupportPal\ApiClient\Cache\ApiCacheMap; use SupportPal\ApiClient\Cache\CacheStrategyConfigurator; use SupportPal\ApiClient\Http\Client; diff --git a/test/E2E/CoreApisTest.php b/test/E2E/CoreApisTest.php index f39ab4a2..d7d67243 100644 --- a/test/E2E/CoreApisTest.php +++ b/test/E2E/CoreApisTest.php @@ -13,7 +13,7 @@ class CoreApisTest extends BaseTestCase /** * @inheritDoc */ - protected function getGetAllEndpoints(): array + protected static function getGetAllEndpoints(): array { return [ ApiDictionary::CORE_BRAND => 'getBrands', @@ -27,7 +27,7 @@ protected function getGetAllEndpoints(): array /** * @inheritDoc */ - protected function getGetOneEndpoints(): array + protected static function getGetOneEndpoints(): array { return [ ApiDictionary::CORE_BRAND => 'getBrand', @@ -40,7 +40,7 @@ protected function getGetOneEndpoints(): array /** * @inheritDoc */ - protected function getPostEndpoints(): array + protected static function getPostEndpoints(): array { return [ ApiDictionary::CORE_IP_BAN => CreateIpBanData::DATA, diff --git a/test/E2E/SelfServiceApisTest.php b/test/E2E/SelfServiceApisTest.php index b806d441..f1daa599 100644 --- a/test/E2E/SelfServiceApisTest.php +++ b/test/E2E/SelfServiceApisTest.php @@ -11,7 +11,7 @@ class SelfServiceApisTest extends BaseTestCase /** * @inheritDoc */ - protected function getGetAllEndpoints(): array + protected static function getGetAllEndpoints(): array { return [ ApiDictionary::SELF_SERVICE_ARTICLE => 'getArticles', @@ -26,7 +26,7 @@ protected function getGetAllEndpoints(): array /** * @inheritDoc */ - protected function getGetOneEndpoints(): array + protected static function getGetOneEndpoints(): array { return [ ApiDictionary::SELF_SERVICE_ARTICLE => 'getArticle', @@ -41,7 +41,7 @@ protected function getGetOneEndpoints(): array /** * @inheritDoc */ - protected function getPostEndpoints(): array + protected static function getPostEndpoints(): array { return []; } diff --git a/test/E2E/TicketApisTest.php b/test/E2E/TicketApisTest.php index b65aa6f6..ed321931 100644 --- a/test/E2E/TicketApisTest.php +++ b/test/E2E/TicketApisTest.php @@ -10,7 +10,7 @@ class TicketApisTest extends BaseTestCase /** * @inheritDoc */ - protected function getGetAllEndpoints(): array + protected static function getGetAllEndpoints(): array { return [ ApiDictionary::TICKET_CUSTOMFIELD => 'getCustomFields', @@ -26,7 +26,7 @@ protected function getGetAllEndpoints(): array /** * @inheritDoc */ - protected function getGetOneEndpoints(): array + protected static function getGetOneEndpoints(): array { return [ ApiDictionary::TICKET_CUSTOMFIELD => 'getCustomField', @@ -42,7 +42,7 @@ protected function getGetOneEndpoints(): array /** * @inheritDoc */ - protected function getPostEndpoints(): array + protected static function getPostEndpoints(): array { return []; } diff --git a/test/E2E/UserApisTest.php b/test/E2E/UserApisTest.php index 41043d18..9ef5a88d 100644 --- a/test/E2E/UserApisTest.php +++ b/test/E2E/UserApisTest.php @@ -10,7 +10,7 @@ class UserApisTest extends BaseTestCase /** * @inheritDoc */ - protected function getGetAllEndpoints(): array + protected static function getGetAllEndpoints(): array { return [ ApiDictionary::USER_OPERATOR => 'getOperators', @@ -26,7 +26,7 @@ protected function getGetAllEndpoints(): array /** * @inheritDoc */ - protected function getGetOneEndpoints(): array + protected static function getGetOneEndpoints(): array { return [ ApiDictionary::USER_OPERATOR => 'getOperator', @@ -42,7 +42,7 @@ protected function getGetOneEndpoints(): array /** * @inheritDoc */ - protected function getPostEndpoints(): array + protected static function getPostEndpoints(): array { return []; } diff --git a/test/Functional/Api/CoreApisTest.php b/test/Functional/Api/CoreApisTest.php index d8df79c9..87a60f53 100644 --- a/test/Functional/Api/CoreApisTest.php +++ b/test/Functional/Api/CoreApisTest.php @@ -12,7 +12,7 @@ class CoreApisTest extends ApiComponentTest /** * @inheritDoc */ - protected function getGetEndpoints(): array + protected static function getGetEndpoints(): array { return (new CoreApisData)->getApiCalls(); } @@ -20,7 +20,7 @@ protected function getGetEndpoints(): array /** * @inheritDoc */ - protected function getPostEndpoints(): array + protected static function getPostEndpoints(): array { return (new CoreApisData)->postApiCalls(); } @@ -28,7 +28,7 @@ protected function getPostEndpoints(): array /** * @inheritDoc */ - protected function getPutEndpoints(): array + protected static function getPutEndpoints(): array { return (new CoreApisData)->putApiCalls(); } @@ -36,7 +36,7 @@ protected function getPutEndpoints(): array /** * @inheritDoc */ - protected function getDeleteEndpoints(): array + protected static function getDeleteEndpoints(): array { return (new CoreApisData)->deleteApiCalls(); } @@ -44,7 +44,7 @@ protected function getDeleteEndpoints(): array /** * @inheritDoc */ - protected function getDownloadsEndpoints(): array + protected static function getDownloadsEndpoints(): array { return []; } diff --git a/test/Functional/Api/SelfServiceApisTest.php b/test/Functional/Api/SelfServiceApisTest.php index 9a1e2a5b..74744eb7 100644 --- a/test/Functional/Api/SelfServiceApisTest.php +++ b/test/Functional/Api/SelfServiceApisTest.php @@ -13,7 +13,7 @@ class SelfServiceApisTest extends ApiComponentTest /** * @inheritDoc */ - protected function getGetEndpoints(): array + protected static function getGetEndpoints(): array { return (new SelfServiceApisData)->getApiCalls(); } @@ -22,7 +22,7 @@ protected function getGetEndpoints(): array * @return mixed[] * @throws InvalidArgumentException */ - protected function getPostEndpoints(): array + protected static function getPostEndpoints(): array { return (new SelfServiceApisData)->postApiCalls(); } @@ -30,7 +30,7 @@ protected function getPostEndpoints(): array /** * @inheritDoc */ - protected function getPutEndpoints(): array + protected static function getPutEndpoints(): array { return (new SelfServiceApisData)->putApiCalls(); } @@ -38,7 +38,7 @@ protected function getPutEndpoints(): array /** * @inheritDoc */ - protected function getDeleteEndpoints(): array + protected static function getDeleteEndpoints(): array { return (new SelfServiceApisData)->deleteApiCalls(); } @@ -46,7 +46,7 @@ protected function getDeleteEndpoints(): array /** * @inheritDoc */ - protected function getDownloadsEndpoints(): array + protected static function getDownloadsEndpoints(): array { return (new SelfServiceApisData)->downloadApiCalls(); } diff --git a/test/Functional/Api/TicketApisTest.php b/test/Functional/Api/TicketApisTest.php index f2ca161e..1b9f957f 100644 --- a/test/Functional/Api/TicketApisTest.php +++ b/test/Functional/Api/TicketApisTest.php @@ -13,7 +13,7 @@ class TicketApisTest extends ApiComponentTest /** * @inheritDoc */ - protected function getGetEndpoints(): array + protected static function getGetEndpoints(): array { return (new TicketApisData)->getApiCalls(); } @@ -22,7 +22,7 @@ protected function getGetEndpoints(): array * @inheritDoc * @throws InvalidArgumentException */ - protected function getPostEndpoints(): array + protected static function getPostEndpoints(): array { return (new TicketApisData)->postApiCalls(); } @@ -31,7 +31,7 @@ protected function getPostEndpoints(): array * @inheritDoc * @throws InvalidArgumentException */ - protected function getPutEndpoints(): array + protected static function getPutEndpoints(): array { return (new TicketApisData)->putApiCalls(); } @@ -39,7 +39,7 @@ protected function getPutEndpoints(): array /** * @inheritDoc */ - protected function getDeleteEndpoints(): array + protected static function getDeleteEndpoints(): array { return (new TicketApisData)->deleteApiCalls(); } @@ -48,7 +48,7 @@ protected function getDeleteEndpoints(): array * @inheritDoc * @throws InvalidArgumentException */ - protected function getDownloadsEndpoints(): array + protected static function getDownloadsEndpoints(): array { return (new TicketApisData)->downloadApiCalls(); } diff --git a/test/Functional/Api/UserApisTest.php b/test/Functional/Api/UserApisTest.php index 0cae1c10..c31b424f 100644 --- a/test/Functional/Api/UserApisTest.php +++ b/test/Functional/Api/UserApisTest.php @@ -13,7 +13,7 @@ class UserApisTest extends ApiComponentTest /** * @inheritDoc */ - protected function getGetEndpoints(): array + protected static function getGetEndpoints(): array { return (new UserApisData)->getApiCalls(); } @@ -22,7 +22,7 @@ protected function getGetEndpoints(): array * @inheritDoc * @throws InvalidArgumentException */ - protected function getPostEndpoints(): array + protected static function getPostEndpoints(): array { return (new UserApisData)->postApiCalls(); } @@ -31,7 +31,7 @@ protected function getPostEndpoints(): array * @inheritDoc * @throws InvalidArgumentException */ - protected function getPutEndpoints(): array + protected static function getPutEndpoints(): array { return (new UserApisData)->putApiCalls(); } @@ -39,7 +39,7 @@ protected function getPutEndpoints(): array /** * @inheritDoc */ - protected function getDeleteEndpoints(): array + protected static function getDeleteEndpoints(): array { return (new UserApisData)->deleteApiCalls(); } @@ -47,7 +47,7 @@ protected function getDeleteEndpoints(): array /** * @inheritDoc */ - protected function getDownloadsEndpoints(): array + protected static function getDownloadsEndpoints(): array { return []; } diff --git a/test/Functional/SupportPalTest.php b/test/Functional/SupportPalTest.php index f80334fa..9402ec15 100644 --- a/test/Functional/SupportPalTest.php +++ b/test/Functional/SupportPalTest.php @@ -4,6 +4,7 @@ use Exception; use GuzzleHttp\Psr7\Response; +use PHPUnit\Framework\Attributes\DataProvider; use SupportPal\ApiClient\Config\ApiContext; use SupportPal\ApiClient\Exception\HttpResponseException; use SupportPal\ApiClient\Http\Request; diff --git a/test/Integration/Api/CoreApisComponentTest.php b/test/Integration/Api/CoreApisComponentTest.php index 53d4d9ed..f7c3e03c 100644 --- a/test/Integration/Api/CoreApisComponentTest.php +++ b/test/Integration/Api/CoreApisComponentTest.php @@ -11,7 +11,7 @@ class CoreApisComponentTest extends ApiComponentTest /** * @inheritDoc */ - protected function getGetEndpoints(): array + protected static function getGetEndpoints(): array { return (new CoreApisData)->getApiCalls(); } @@ -19,7 +19,7 @@ protected function getGetEndpoints(): array /** * @inheritDoc */ - protected function getPostEndpoints(): array + protected static function getPostEndpoints(): array { return (new CoreApisData)->postApiCalls(); } @@ -27,7 +27,7 @@ protected function getPostEndpoints(): array /** * @inheritDoc */ - protected function getPutEndpoints(): array + protected static function getPutEndpoints(): array { return (new CoreApisData)->putApiCalls(); } @@ -35,7 +35,7 @@ protected function getPutEndpoints(): array /** * @inheritDoc */ - protected function getDeleteEndpoints(): array + protected static function getDeleteEndpoints(): array { return (new CoreApisData)->deleteApiCalls(); } @@ -43,7 +43,7 @@ protected function getDeleteEndpoints(): array /** * @inheritDoc */ - protected function getDownloadsEndpoints(): array + protected static function getDownloadsEndpoints(): array { return []; } diff --git a/test/Integration/Api/SelfServiceApisComponentTest.php b/test/Integration/Api/SelfServiceApisComponentTest.php index f83a7c85..ee5bbb6d 100644 --- a/test/Integration/Api/SelfServiceApisComponentTest.php +++ b/test/Integration/Api/SelfServiceApisComponentTest.php @@ -11,7 +11,7 @@ class SelfServiceApisComponentTest extends ApiComponentTest /** * @inheritDoc */ - protected function getGetEndpoints(): array + protected static function getGetEndpoints(): array { return (new SelfServiceApisData)->getApiCalls(); } @@ -19,7 +19,7 @@ protected function getGetEndpoints(): array /** * @inheritDoc */ - protected function getPostEndpoints(): array + protected static function getPostEndpoints(): array { return (new SelfServiceApisData)->postApiCalls(); } @@ -27,7 +27,7 @@ protected function getPostEndpoints(): array /** * @inheritDoc */ - protected function getPutEndpoints(): array + protected static function getPutEndpoints(): array { return (new SelfServiceApisData)->putApiCalls(); } @@ -35,7 +35,7 @@ protected function getPutEndpoints(): array /** * @inheritDoc */ - protected function getDeleteEndpoints(): array + protected static function getDeleteEndpoints(): array { return (new SelfServiceApisData)->deleteApiCalls(); } @@ -43,7 +43,7 @@ protected function getDeleteEndpoints(): array /** * @inheritDoc */ - protected function getDownloadsEndpoints(): array + protected static function getDownloadsEndpoints(): array { return (new SelfServiceApisData)->downloadApiCalls(); } diff --git a/test/Integration/Api/TicketApisComponentTest.php b/test/Integration/Api/TicketApisComponentTest.php index b5327852..9efd2e64 100644 --- a/test/Integration/Api/TicketApisComponentTest.php +++ b/test/Integration/Api/TicketApisComponentTest.php @@ -12,7 +12,7 @@ class TicketApisComponentTest extends ApiComponentTest /** * @inheritDoc */ - protected function getGetEndpoints(): array + protected static function getGetEndpoints(): array { return (new TicketApisData)->getApiCalls(); } @@ -21,7 +21,7 @@ protected function getGetEndpoints(): array * @inheritDoc * @throws InvalidArgumentException */ - protected function getPostEndpoints(): array + protected static function getPostEndpoints(): array { return (new TicketApisData)->postApiCalls(); } @@ -30,7 +30,7 @@ protected function getPostEndpoints(): array * @inheritDoc * @throws InvalidArgumentException */ - protected function getPutEndpoints(): array + protected static function getPutEndpoints(): array { return (new TicketApisData)->putApiCalls(); } @@ -38,7 +38,7 @@ protected function getPutEndpoints(): array /** * @inheritDoc */ - protected function getDeleteEndpoints(): array + protected static function getDeleteEndpoints(): array { return (new TicketApisData)->deleteApiCalls(); } @@ -47,7 +47,7 @@ protected function getDeleteEndpoints(): array * @inheritDoc * @throws InvalidArgumentException */ - protected function getDownloadsEndpoints(): array + protected static function getDownloadsEndpoints(): array { return (new TicketApisData)->downloadApiCalls(); } diff --git a/test/Integration/Api/UserApisComponentTest.php b/test/Integration/Api/UserApisComponentTest.php index 7491e374..525eeba9 100644 --- a/test/Integration/Api/UserApisComponentTest.php +++ b/test/Integration/Api/UserApisComponentTest.php @@ -12,7 +12,7 @@ class UserApisComponentTest extends ApiComponentTest /** * @inheritDoc */ - protected function getGetEndpoints(): array + protected static function getGetEndpoints(): array { return (new UserApisData)->getApiCalls(); } @@ -21,7 +21,7 @@ protected function getGetEndpoints(): array * @inheritDoc * @throws InvalidArgumentException */ - protected function getPostEndpoints(): array + protected static function getPostEndpoints(): array { return (new UserApisData)->postApiCalls(); } @@ -30,7 +30,7 @@ protected function getPostEndpoints(): array * @inheritDoc * @throws InvalidArgumentException */ - protected function getPutEndpoints(): array + protected static function getPutEndpoints(): array { return (new UserApisData)->putApiCalls(); } @@ -38,7 +38,7 @@ protected function getPutEndpoints(): array /** * @inheritDoc */ - protected function getDeleteEndpoints(): array + protected static function getDeleteEndpoints(): array { return (new UserApisData)->deleteApiCalls(); } @@ -46,7 +46,7 @@ protected function getDeleteEndpoints(): array /** * @inheritDoc */ - protected function getDownloadsEndpoints(): array + protected static function getDownloadsEndpoints(): array { return []; } From ad0e1cb1674d519524bf3f22628e70acee7e74c1 Mon Sep 17 00:00:00 2001 From: bytestream Date: Mon, 1 Jun 2026 13:06:38 +0100 Subject: [PATCH 12/24] wip --- test/Cache/CacheableApisTest.php | 9 ++++++--- test/E2E/BaseTestCase.php | 3 ++- test/Unit/ApiClient/Core/BrandApisTest.php | 6 ++++-- test/Unit/ApiClient/Core/SettingsApisTest.php | 3 ++- .../ApiClient/SelfService/ArticleApisTest.php | 18 ++++++++++++------ .../ApiClient/SelfService/CommentApisTest.php | 9 ++++++--- .../ApiClient/SelfService/SettingsApisTest.php | 3 ++- .../Unit/ApiClient/SelfService/TagApisTest.php | 6 ++++-- .../ApiClient/SelfService/TypeApisTest.php | 6 ++++-- .../ApiClient/Ticket/AttachmentApisTest.php | 6 ++++-- .../Ticket/ChannelSettingsApisTest.php | 3 ++- .../ApiClient/Ticket/CustomFieldApisTest.php | 6 ++++-- .../ApiClient/Ticket/DepartmentApisTest.php | 6 ++++-- test/Unit/ApiClient/Ticket/MessageApisTest.php | 12 ++++++++---- .../Unit/ApiClient/Ticket/PriorityApisTest.php | 6 ++++-- .../Unit/ApiClient/Ticket/SettingsApisTest.php | 3 ++- test/Unit/ApiClient/Ticket/StatusApisTest.php | 6 ++++-- test/Unit/ApiClient/Ticket/TicketApisTest.php | 12 ++++++++---- test/Unit/ApiClient/User/OperatorApisTest.php | 12 ++++++++---- .../ApiClient/User/OperatorGroupApisTest.php | 6 ++++-- .../ApiClient/User/OrganisationApisTest.php | 12 ++++++++---- .../User/OrganisationCustomFieldApisTest.php | 6 ++++-- test/Unit/ApiClient/User/SettingsApisTest.php | 3 ++- test/Unit/ApiClient/User/UserApisTest.php | 12 ++++++++---- .../ApiClient/User/UserCustomFieldApisTest.php | 6 ++++-- test/Unit/ApiClient/User/UserGroupApisTest.php | 6 ++++-- test/Unit/ApiClientTest.php | 12 +++++------- test/Unit/Model/CollectionTest.php | 3 ++- 28 files changed, 131 insertions(+), 70 deletions(-) diff --git a/test/Cache/CacheableApisTest.php b/test/Cache/CacheableApisTest.php index 393ec462..9b7b12d4 100644 --- a/test/Cache/CacheableApisTest.php +++ b/test/Cache/CacheableApisTest.php @@ -61,7 +61,8 @@ class CacheableApisTest extends ContainerAwareBaseTestCase * @param array $data * @param array $parameters * @param class-string $apiClientClass - * @throws Exception */ + * @throws Exception + */ #[DataProvider('provideCacheableApiCalls')] public function testGetCacheableApiTestCacheHit( string $endpoint, @@ -92,7 +93,8 @@ public function testGetCacheableApiTestCacheHit( * @param array $data * @param array $parameters * @param class-string $apiClientClass - * @throws Exception */ + * @throws Exception + */ #[DataProvider('provideCacheableApiCalls')] public function testGetCacheableApiTestCacheMiss( string $endpoint, @@ -139,7 +141,8 @@ public function testGetCacheableApiTestCacheMiss( * @param array $data * @param array $parameters * @param class-string $apiClientClass - * @throws Exception */ + * @throws Exception + */ #[DataProvider('provideNonCacheableApis')] public function testNonCacheableApisAlwaysMiss( string $endpoint, diff --git a/test/E2E/BaseTestCase.php b/test/E2E/BaseTestCase.php index 8832b0a8..b83ddcc8 100644 --- a/test/E2E/BaseTestCase.php +++ b/test/E2E/BaseTestCase.php @@ -56,7 +56,8 @@ public function setUp(): void } /** - * @throws HttpResponseException */ + * @throws HttpResponseException + */ #[DataProvider('provideGetAllEndpoints')] public function testGetAll(string $endpoint, string $apiCall): void { diff --git a/test/Unit/ApiClient/Core/BrandApisTest.php b/test/Unit/ApiClient/Core/BrandApisTest.php index b5e03d93..480b4a69 100644 --- a/test/Unit/ApiClient/Core/BrandApisTest.php +++ b/test/Unit/ApiClient/Core/BrandApisTest.php @@ -43,7 +43,8 @@ public function testHttpExceptionGetBrands(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetBrands(int $statusCode, string $responseBody): void { @@ -88,7 +89,8 @@ public function testHttpExceptionGetBrand(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetBrand(int $statusCode, string $responseBody): void { diff --git a/test/Unit/ApiClient/Core/SettingsApisTest.php b/test/Unit/ApiClient/Core/SettingsApisTest.php index 2112dd4c..33b32f36 100644 --- a/test/Unit/ApiClient/Core/SettingsApisTest.php +++ b/test/Unit/ApiClient/Core/SettingsApisTest.php @@ -31,7 +31,8 @@ public function testSuccessfulGetCoreSettings(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetCoreSettings(int $statusCode, string $responseBody): void { diff --git a/test/Unit/ApiClient/SelfService/ArticleApisTest.php b/test/Unit/ApiClient/SelfService/ArticleApisTest.php index 0d9f634f..4d5acb21 100644 --- a/test/Unit/ApiClient/SelfService/ArticleApisTest.php +++ b/test/Unit/ApiClient/SelfService/ArticleApisTest.php @@ -45,7 +45,8 @@ public function testHttpExceptionGetArticlesByTerm(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetArticlesByTerm(int $statusCode, string $responseBody): void { @@ -90,7 +91,8 @@ public function testHttpExceptionGetArticle(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetArticle(int $statusCode, string $responseBody): void { @@ -129,7 +131,8 @@ public function testHttpExceptionGetArticles(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetArticles(int $statusCode, string $responseBody): void { @@ -174,7 +177,8 @@ public function testHttpExceptionGetRelatedArticles(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetRelatedArticles(int $statusCode, string $responseBody): void { @@ -206,7 +210,8 @@ public function testPostArticle(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testPostUnsuccessfulArticle(int $statusCode, string $responseBody): void { @@ -260,7 +265,8 @@ public function testHttpExceptionUpdateArticle(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulUpdateArticle(int $statusCode, string $responseBody): void { diff --git a/test/Unit/ApiClient/SelfService/CommentApisTest.php b/test/Unit/ApiClient/SelfService/CommentApisTest.php index a5c2b8c8..02176073 100644 --- a/test/Unit/ApiClient/SelfService/CommentApisTest.php +++ b/test/Unit/ApiClient/SelfService/CommentApisTest.php @@ -34,7 +34,8 @@ public function testPostSelfServiceComment(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulPostSelfServiceComment(int $statusCode, string $responseBody): void { @@ -76,7 +77,8 @@ public function testHttpExceptionGetComments(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetComments(int $statusCode, string $responseBody): void { @@ -121,7 +123,8 @@ public function testHttpExceptionGetComment(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetComment(int $statusCode, string $responseBody): void { diff --git a/test/Unit/ApiClient/SelfService/SettingsApisTest.php b/test/Unit/ApiClient/SelfService/SettingsApisTest.php index f5f76bb3..a48dfe97 100644 --- a/test/Unit/ApiClient/SelfService/SettingsApisTest.php +++ b/test/Unit/ApiClient/SelfService/SettingsApisTest.php @@ -39,7 +39,8 @@ public function testHttpExceptionGetSettings(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetSettings(int $statusCode, string $responseBody): void { diff --git a/test/Unit/ApiClient/SelfService/TagApisTest.php b/test/Unit/ApiClient/SelfService/TagApisTest.php index 52ba788b..2cd91df7 100644 --- a/test/Unit/ApiClient/SelfService/TagApisTest.php +++ b/test/Unit/ApiClient/SelfService/TagApisTest.php @@ -53,7 +53,8 @@ public function testHttpExceptionGetTag(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetTag(int $statusCode, string $responseBody): void { @@ -92,7 +93,8 @@ public function testHttpExceptionGetTags(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetTags(int $statusCode, string $responseBody): void { diff --git a/test/Unit/ApiClient/SelfService/TypeApisTest.php b/test/Unit/ApiClient/SelfService/TypeApisTest.php index f148a892..20688b67 100644 --- a/test/Unit/ApiClient/SelfService/TypeApisTest.php +++ b/test/Unit/ApiClient/SelfService/TypeApisTest.php @@ -43,7 +43,8 @@ public function testHttpExceptionGetTypes(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetTypes(int $statusCode, string $responseBody): void { @@ -88,7 +89,8 @@ public function testHttpExceptionGetType(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetType(int $statusCode, string $responseBody): void { diff --git a/test/Unit/ApiClient/Ticket/AttachmentApisTest.php b/test/Unit/ApiClient/Ticket/AttachmentApisTest.php index 4742f84e..61f72c97 100644 --- a/test/Unit/ApiClient/Ticket/AttachmentApisTest.php +++ b/test/Unit/ApiClient/Ticket/AttachmentApisTest.php @@ -46,7 +46,8 @@ public function testHttpExceptionGetAttachments(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetAttachments(int $statusCode, string $responseBody): void { @@ -91,7 +92,8 @@ public function testHttpExceptionGetAttachment(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetAttachment(int $statusCode, string $responseBody): void { diff --git a/test/Unit/ApiClient/Ticket/ChannelSettingsApisTest.php b/test/Unit/ApiClient/Ticket/ChannelSettingsApisTest.php index e51ab589..fb22a170 100644 --- a/test/Unit/ApiClient/Ticket/ChannelSettingsApisTest.php +++ b/test/Unit/ApiClient/Ticket/ChannelSettingsApisTest.php @@ -40,7 +40,8 @@ public function testSuccessfulGetChannelSettings(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetChannelSettings(int $statusCode, string $responseBody): void { diff --git a/test/Unit/ApiClient/Ticket/CustomFieldApisTest.php b/test/Unit/ApiClient/Ticket/CustomFieldApisTest.php index 060a12f4..2f732145 100644 --- a/test/Unit/ApiClient/Ticket/CustomFieldApisTest.php +++ b/test/Unit/ApiClient/Ticket/CustomFieldApisTest.php @@ -43,7 +43,8 @@ public function testHttpExceptionGetTicketCustomFields(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetTicketCustomFields(int $statusCode, string $responseBody): void { @@ -88,7 +89,8 @@ public function testHttpExceptionGetCustomField(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetCustomField(int $statusCode, string $responseBody): void { diff --git a/test/Unit/ApiClient/Ticket/DepartmentApisTest.php b/test/Unit/ApiClient/Ticket/DepartmentApisTest.php index 5b71480b..733a1618 100644 --- a/test/Unit/ApiClient/Ticket/DepartmentApisTest.php +++ b/test/Unit/ApiClient/Ticket/DepartmentApisTest.php @@ -43,7 +43,8 @@ public function testHttpExceptionGetDepartments(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetDepartments(int $statusCode, string $responseBody): void { @@ -88,7 +89,8 @@ public function testHttpExceptionGetDepartment(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetDepartment(int $statusCode, string $responseBody): void { diff --git a/test/Unit/ApiClient/Ticket/MessageApisTest.php b/test/Unit/ApiClient/Ticket/MessageApisTest.php index 020a8a5e..743f5e49 100644 --- a/test/Unit/ApiClient/Ticket/MessageApisTest.php +++ b/test/Unit/ApiClient/Ticket/MessageApisTest.php @@ -47,7 +47,8 @@ public function testHttpExceptionGetMessages(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetMessages(int $statusCode, string $responseBody): void { @@ -82,7 +83,8 @@ public function testHttpExceptionGetMessage(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetMessage(int $statusCode, string $responseBody): void { @@ -108,7 +110,8 @@ public function testPostMessage(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulPostMessage(int $statusCode, string $responseBody): void { @@ -162,7 +165,8 @@ public function testHttpExceptionUpdateMessage(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulUpdateMessage(int $statusCode, string $responseBody): void { diff --git a/test/Unit/ApiClient/Ticket/PriorityApisTest.php b/test/Unit/ApiClient/Ticket/PriorityApisTest.php index bc4b523d..124abf34 100644 --- a/test/Unit/ApiClient/Ticket/PriorityApisTest.php +++ b/test/Unit/ApiClient/Ticket/PriorityApisTest.php @@ -43,7 +43,8 @@ public function testHttpExceptionGetPriorities(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetPriorities(int $statusCode, string $responseBody): void { @@ -88,7 +89,8 @@ public function testHttpExceptionGetPriority(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetPriority(int $statusCode, string $responseBody): void { diff --git a/test/Unit/ApiClient/Ticket/SettingsApisTest.php b/test/Unit/ApiClient/Ticket/SettingsApisTest.php index 9f484ebc..17391226 100644 --- a/test/Unit/ApiClient/Ticket/SettingsApisTest.php +++ b/test/Unit/ApiClient/Ticket/SettingsApisTest.php @@ -31,7 +31,8 @@ public function testSuccessfulGetTicketSettings(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetTicketSettings(int $statusCode, string $responseBody): void { diff --git a/test/Unit/ApiClient/Ticket/StatusApisTest.php b/test/Unit/ApiClient/Ticket/StatusApisTest.php index 4509b465..c3649369 100644 --- a/test/Unit/ApiClient/Ticket/StatusApisTest.php +++ b/test/Unit/ApiClient/Ticket/StatusApisTest.php @@ -43,7 +43,8 @@ public function testHttpExceptionGetStatuses(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetStatuses(int $statusCode, string $responseBody): void { @@ -88,7 +89,8 @@ public function testHttpExceptionGetStatus(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetStatus(int $statusCode, string $responseBody): void { diff --git a/test/Unit/ApiClient/Ticket/TicketApisTest.php b/test/Unit/ApiClient/Ticket/TicketApisTest.php index 9fbe786c..3c5d0a85 100644 --- a/test/Unit/ApiClient/Ticket/TicketApisTest.php +++ b/test/Unit/ApiClient/Ticket/TicketApisTest.php @@ -43,7 +43,8 @@ public function testHttpExceptionGetTickets(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetTickets(int $statusCode, string $responseBody): void { @@ -88,7 +89,8 @@ public function testHttpExceptionGetTicket(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetTicket(int $statusCode, string $responseBody): void { @@ -119,7 +121,8 @@ public function testPostTicket(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testPostUnsuccessfulTicket(int $statusCode, string $responseBody): void { @@ -175,7 +178,8 @@ public function testHttpExceptionUpdateTicket(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulUpdateTicket(int $statusCode, string $responseBody): void { diff --git a/test/Unit/ApiClient/User/OperatorApisTest.php b/test/Unit/ApiClient/User/OperatorApisTest.php index c872f14e..516f04f5 100644 --- a/test/Unit/ApiClient/User/OperatorApisTest.php +++ b/test/Unit/ApiClient/User/OperatorApisTest.php @@ -43,7 +43,8 @@ public function testHttpExceptionGetOperators(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetOperators(int $statusCode, string $responseBody): void { @@ -88,7 +89,8 @@ public function testHttpExceptionGetOperator(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetOperator(int $statusCode, string $responseBody): void { @@ -119,7 +121,8 @@ public function testPostOperator(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testPostUnsuccessfulOperator(int $statusCode, string $responseBody): void { @@ -173,7 +176,8 @@ public function testHttpExceptionUpdateOperator(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulUpdateOperator(int $statusCode, string $responseBody): void { diff --git a/test/Unit/ApiClient/User/OperatorGroupApisTest.php b/test/Unit/ApiClient/User/OperatorGroupApisTest.php index 7652f073..f4ce6491 100644 --- a/test/Unit/ApiClient/User/OperatorGroupApisTest.php +++ b/test/Unit/ApiClient/User/OperatorGroupApisTest.php @@ -43,7 +43,8 @@ public function testHttpExceptionGetOperatorGroups(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetOperatorGroups(int $statusCode, string $responseBody): void { @@ -88,7 +89,8 @@ public function testHttpExceptionGetOperatorGroup(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetOperatorGroup(int $statusCode, string $responseBody): void { diff --git a/test/Unit/ApiClient/User/OrganisationApisTest.php b/test/Unit/ApiClient/User/OrganisationApisTest.php index 10a9f875..2d1ce1ee 100644 --- a/test/Unit/ApiClient/User/OrganisationApisTest.php +++ b/test/Unit/ApiClient/User/OrganisationApisTest.php @@ -43,7 +43,8 @@ public function testHttpExceptionGetOrganisations(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetOrganisations(int $statusCode, string $responseBody): void { @@ -88,7 +89,8 @@ public function testHttpExceptionGetOrganisation(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetOrganisation(int $statusCode, string $responseBody): void { @@ -119,7 +121,8 @@ public function testPostOrganisation(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testPostUnsuccessfulOrganisation(int $statusCode, string $responseBody): void { @@ -173,7 +176,8 @@ public function testHttpExceptionUpdateOrganisation(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulUpdateOrganisation(int $statusCode, string $responseBody): void { diff --git a/test/Unit/ApiClient/User/OrganisationCustomFieldApisTest.php b/test/Unit/ApiClient/User/OrganisationCustomFieldApisTest.php index 0cb8a8eb..0aa2d17d 100644 --- a/test/Unit/ApiClient/User/OrganisationCustomFieldApisTest.php +++ b/test/Unit/ApiClient/User/OrganisationCustomFieldApisTest.php @@ -43,7 +43,8 @@ public function testHttpExceptionGetOrganisationCustomFields(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetOrganisationCustomFields(int $statusCode, string $responseBody): void { @@ -86,7 +87,8 @@ public function testHttpExceptionGetOrganisationCustomField(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetOrganisationCustomField(int $statusCode, string $responseBody): void { diff --git a/test/Unit/ApiClient/User/SettingsApisTest.php b/test/Unit/ApiClient/User/SettingsApisTest.php index 1c2af82d..3b123f5e 100644 --- a/test/Unit/ApiClient/User/SettingsApisTest.php +++ b/test/Unit/ApiClient/User/SettingsApisTest.php @@ -31,7 +31,8 @@ public function testSuccessfulGetCoreSettings(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetCoreSettings(int $statusCode, string $responseBody): void { diff --git a/test/Unit/ApiClient/User/UserApisTest.php b/test/Unit/ApiClient/User/UserApisTest.php index debcbb6d..1c606882 100644 --- a/test/Unit/ApiClient/User/UserApisTest.php +++ b/test/Unit/ApiClient/User/UserApisTest.php @@ -43,7 +43,8 @@ public function testHttpExceptionGetUsers(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetUsers(int $statusCode, string $responseBody): void { @@ -88,7 +89,8 @@ public function testHttpExceptionGetUser(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetUser(int $statusCode, string $responseBody): void { @@ -119,7 +121,8 @@ public function testPostUser(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testPostUnsuccessfulUser(int $statusCode, string $responseBody): void { @@ -173,7 +176,8 @@ public function testHttpExceptionUpdateUser(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulUpdateUser(int $statusCode, string $responseBody): void { diff --git a/test/Unit/ApiClient/User/UserCustomFieldApisTest.php b/test/Unit/ApiClient/User/UserCustomFieldApisTest.php index 7567b743..11f595ce 100644 --- a/test/Unit/ApiClient/User/UserCustomFieldApisTest.php +++ b/test/Unit/ApiClient/User/UserCustomFieldApisTest.php @@ -43,7 +43,8 @@ public function testHttpExceptionGetUserCustomFields(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetUserCustomFields(int $statusCode, string $responseBody): void { @@ -88,7 +89,8 @@ public function testHttpExceptionGetUserCustomField(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetUserCustomField(int $statusCode, string $responseBody): void { diff --git a/test/Unit/ApiClient/User/UserGroupApisTest.php b/test/Unit/ApiClient/User/UserGroupApisTest.php index 03584c43..98689a84 100644 --- a/test/Unit/ApiClient/User/UserGroupApisTest.php +++ b/test/Unit/ApiClient/User/UserGroupApisTest.php @@ -43,7 +43,8 @@ public function testHttpExceptionGetUserGroups(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetUserGroups(int $statusCode, string $responseBody): void { @@ -88,7 +89,8 @@ public function testHttpExceptionGetUserGroup(): void /** * @param int $statusCode - * @param string $responseBody */ + * @param string $responseBody + */ #[DataProvider('provideUnsuccessfulTestCases')] public function testUnsuccessfulGetUserGroup(int $statusCode, string $responseBody): void { diff --git a/test/Unit/ApiClientTest.php b/test/Unit/ApiClientTest.php index 04280476..3810559f 100644 --- a/test/Unit/ApiClientTest.php +++ b/test/Unit/ApiClientTest.php @@ -115,10 +115,10 @@ public static function provideUnsuccessfulTestCases(): iterable $jsonErrorBody['status'] = 'success'; $jsonSuccessfulBody = json_encode($jsonErrorBody) ?: throw new JsonException('Failed to encode JSON data.'); - yield ['error 400 response' => 400, $jsonSuccessfulBody]; - yield ['error 401 response' => 401, $jsonSuccessfulBody]; - yield ['error 403 response' => 403, $jsonSuccessfulBody]; - yield ['error 404 response' => 404, $jsonSuccessfulBody]; + yield 'error 400 response' => [400, $jsonSuccessfulBody]; + yield 'error 401 response' => [401, $jsonSuccessfulBody]; + yield 'error 403 response' => [403, $jsonSuccessfulBody]; + yield 'error 404 response' => [404, $jsonSuccessfulBody]; $jsonErrorBody = json_encode([ 'status' => 'error', @@ -126,9 +126,7 @@ public static function provideUnsuccessfulTestCases(): iterable 'data' => [] ]) ?: throw new JsonException('Failed to encode JSON data.'); - yield [ - 'error status response' => 200, $jsonErrorBody, - ]; + yield 'error status response' => [200, $jsonErrorBody]; } /** diff --git a/test/Unit/Model/CollectionTest.php b/test/Unit/Model/CollectionTest.php index c0156ce3..889da188 100644 --- a/test/Unit/Model/CollectionTest.php +++ b/test/Unit/Model/CollectionTest.php @@ -98,7 +98,8 @@ public function testCollectionFirst(): void /** * @param Collection $collection - * @param bool $actualIsEmpty */ + * @param bool $actualIsEmpty + */ public function testCollectionIsEmpty(Collection $collection, bool $actualIsEmpty): void { self::assertSame($collection->isEmpty(), $actualIsEmpty); From 853d39207cc707b9e6995524fce92565163edd6e Mon Sep 17 00:00:00 2001 From: bytestream Date: Mon, 1 Jun 2026 13:08:42 +0100 Subject: [PATCH 13/24] wip --- test/Unit/Model/CollectionTest.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/Unit/Model/CollectionTest.php b/test/Unit/Model/CollectionTest.php index 889da188..f5b9cccb 100644 --- a/test/Unit/Model/CollectionTest.php +++ b/test/Unit/Model/CollectionTest.php @@ -2,6 +2,7 @@ namespace SupportPal\ApiClient\Tests\Unit\Model; +use PHPUnit\Framework\Attributes\DataProvider; use SupportPal\ApiClient\Exception\InvalidArgumentException; use SupportPal\ApiClient\Model\Collection; use SupportPal\ApiClient\Model\Model; @@ -100,6 +101,7 @@ public function testCollectionFirst(): void * @param Collection $collection * @param bool $actualIsEmpty */ + #[DataProvider('provideIsEmptyCases')] public function testCollectionIsEmpty(Collection $collection, bool $actualIsEmpty): void { self::assertSame($collection->isEmpty(), $actualIsEmpty); From 57c85f1b789537e42c991d5aa7de8250c23de61c Mon Sep 17 00:00:00 2001 From: bytestream Date: Mon, 1 Jun 2026 13:15:30 +0100 Subject: [PATCH 14/24] wip --- .../{BaseCoreApiTest.php => BaseCoreApiTestCaseCase.php} | 4 ++-- test/Unit/Api/Core/BrandApisTest.php | 2 +- test/Unit/Api/Core/IpBanApisTest.php | 2 +- test/Unit/Api/Core/IpWhitelistApisTest.php | 2 +- test/Unit/Api/Core/LanguageApisTest.php | 2 +- test/Unit/Api/Core/SettingsApisTest.php | 2 +- test/Unit/Api/Core/SpamRuleApisTest.php | 2 +- test/Unit/Api/SelfService/ArticleApisTest.php | 2 +- test/Unit/Api/SelfService/AttachmentApisTest.php | 2 +- ...erviceApiTest.php => BaseSelfServiceApiTestCaseCase.php} | 4 ++-- test/Unit/Api/SelfService/CategoryApisTest.php | 2 +- test/Unit/Api/SelfService/CommentApisTest.php | 2 +- test/Unit/Api/SelfService/SettingsApisTest.php | 2 +- test/Unit/Api/SelfService/TagApisTest.php | 2 +- test/Unit/Api/SelfService/TypeApiTest.php | 2 +- .../{BaseTicketApiTest.php => BaseTicketApiTestCase.php} | 4 ++-- test/Unit/Api/Ticket/ChannelApisTest.php | 2 +- test/Unit/Api/Ticket/CustomFieldApisTest.php | 2 +- test/Unit/Api/Ticket/DepartmentApisTest.php | 2 +- test/Unit/Api/Ticket/MessageApisTest.php | 2 +- test/Unit/Api/Ticket/PriorityApisTest.php | 2 +- test/Unit/Api/Ticket/StatusApisTest.php | 2 +- test/Unit/Api/Ticket/TicketApisTest.php | 2 +- test/Unit/Api/Ticket/TicketSettingsApisTest.php | 2 +- .../User/{BaseUserApiTest.php => BaseUserApiTestCase.php} | 4 ++-- test/Unit/Api/User/OperatorApisTest.php | 2 +- test/Unit/Api/User/OperatorGroupApisTest.php | 2 +- test/Unit/Api/User/OrganisationApisTest.php | 2 +- test/Unit/Api/User/OrganisationCustomFieldApisTest.php | 2 +- test/Unit/Api/User/SettingsApisTest.php | 2 +- test/Unit/Api/User/UserApisTest.php | 2 +- test/Unit/Api/User/UserCustomFieldApisTest.php | 2 +- test/Unit/Api/User/UserGroupApisTest.php | 2 +- test/Unit/{ApiTest.php => ApiTestCase.php} | 2 +- .../Unit/Model/{BaseModelTest.php => BaseModelTestCase.php} | 2 +- test/Unit/Model/Ticket/Request/CreateMessageTest.php | 6 +++--- test/Unit/Model/Ticket/Request/CreateTicketTest.php | 6 +++--- test/Unit/Model/Ticket/Request/UpdateTicketTest.php | 6 +++--- test/Unit/Model/User/Request/CreateOperatorTest.php | 6 +++--- test/Unit/Model/User/Request/CreateOrganisationTest.php | 6 +++--- test/Unit/Model/User/Request/CreateUserTest.php | 6 +++--- 41 files changed, 57 insertions(+), 57 deletions(-) rename test/Unit/Api/Core/{BaseCoreApiTest.php => BaseCoreApiTestCaseCase.php} (82%) rename test/Unit/Api/SelfService/{BaseSelfServiceApiTest.php => BaseSelfServiceApiTestCaseCase.php} (82%) rename test/Unit/Api/Ticket/{BaseTicketApiTest.php => BaseTicketApiTestCase.php} (83%) rename test/Unit/Api/User/{BaseUserApiTest.php => BaseUserApiTestCase.php} (83%) rename test/Unit/{ApiTest.php => ApiTestCase.php} (98%) rename test/Unit/Model/{BaseModelTest.php => BaseModelTestCase.php} (89%) diff --git a/test/Unit/Api/Core/BaseCoreApiTest.php b/test/Unit/Api/Core/BaseCoreApiTestCaseCase.php similarity index 82% rename from test/Unit/Api/Core/BaseCoreApiTest.php rename to test/Unit/Api/Core/BaseCoreApiTestCaseCase.php index e85d7355..665870ab 100644 --- a/test/Unit/Api/Core/BaseCoreApiTest.php +++ b/test/Unit/Api/Core/BaseCoreApiTestCaseCase.php @@ -4,9 +4,9 @@ use SupportPal\ApiClient\Api\CoreApi; use SupportPal\ApiClient\Http\CoreClient; -use SupportPal\ApiClient\Tests\Unit\ApiTest; +use SupportPal\ApiClient\Tests\Unit\ApiTestCase; -class BaseCoreApiTest extends ApiTest +class BaseCoreApiTestCaseCase extends ApiTestCase { /** @var CoreApi */ protected $api; diff --git a/test/Unit/Api/Core/BrandApisTest.php b/test/Unit/Api/Core/BrandApisTest.php index ff0d0114..bfce85c6 100644 --- a/test/Unit/Api/Core/BrandApisTest.php +++ b/test/Unit/Api/Core/BrandApisTest.php @@ -5,7 +5,7 @@ use SupportPal\ApiClient\Model\Core\Brand; use SupportPal\ApiClient\Tests\DataFixtures\Core\BrandData; -class BrandApisTest extends BaseCoreApiTest +class BrandApisTest extends BaseCoreApiTestCaseCase { public function testGetBrands(): void { diff --git a/test/Unit/Api/Core/IpBanApisTest.php b/test/Unit/Api/Core/IpBanApisTest.php index 588f9b14..b5278140 100644 --- a/test/Unit/Api/Core/IpBanApisTest.php +++ b/test/Unit/Api/Core/IpBanApisTest.php @@ -9,7 +9,7 @@ use SupportPal\ApiClient\Tests\DataFixtures\Core\Request\CreateIpBanData; use SupportPal\ApiClient\Tests\DataFixtures\Core\Request\UpdateIpBanData; -class IpBanApisTest extends BaseCoreApiTest +class IpBanApisTest extends BaseCoreApiTestCaseCase { public function testGetIpBans(): void { diff --git a/test/Unit/Api/Core/IpWhitelistApisTest.php b/test/Unit/Api/Core/IpWhitelistApisTest.php index f966de33..25856c74 100644 --- a/test/Unit/Api/Core/IpWhitelistApisTest.php +++ b/test/Unit/Api/Core/IpWhitelistApisTest.php @@ -9,7 +9,7 @@ use SupportPal\ApiClient\Tests\DataFixtures\Core\Request\UpdateWhitelistedIpData; use SupportPal\ApiClient\Tests\DataFixtures\Core\WhitelistedIpData; -class IpWhitelistApisTest extends BaseCoreApiTest +class IpWhitelistApisTest extends BaseCoreApiTestCaseCase { public function testGetWhitelistedIps(): void { diff --git a/test/Unit/Api/Core/LanguageApisTest.php b/test/Unit/Api/Core/LanguageApisTest.php index 3339a19e..d5e14908 100644 --- a/test/Unit/Api/Core/LanguageApisTest.php +++ b/test/Unit/Api/Core/LanguageApisTest.php @@ -5,7 +5,7 @@ use SupportPal\ApiClient\Model\Core\Language; use SupportPal\ApiClient\Tests\DataFixtures\Core\LanguageData; -class LanguageApisTest extends BaseCoreApiTest +class LanguageApisTest extends BaseCoreApiTestCaseCase { public function testGetLanguages(): void { diff --git a/test/Unit/Api/Core/SettingsApisTest.php b/test/Unit/Api/Core/SettingsApisTest.php index a4a4a8fc..bc70bb43 100644 --- a/test/Unit/Api/Core/SettingsApisTest.php +++ b/test/Unit/Api/Core/SettingsApisTest.php @@ -5,7 +5,7 @@ use SupportPal\ApiClient\Model\Shared\Settings; use SupportPal\ApiClient\Tests\DataFixtures\Core\SettingsData; -class SettingsApisTest extends BaseCoreApiTest +class SettingsApisTest extends BaseCoreApiTestCaseCase { public function testGetCoreSettings(): void { diff --git a/test/Unit/Api/Core/SpamRuleApisTest.php b/test/Unit/Api/Core/SpamRuleApisTest.php index 47fde7d4..87a585d3 100644 --- a/test/Unit/Api/Core/SpamRuleApisTest.php +++ b/test/Unit/Api/Core/SpamRuleApisTest.php @@ -9,7 +9,7 @@ use SupportPal\ApiClient\Tests\DataFixtures\Core\Request\UpdateSpamRuleData; use SupportPal\ApiClient\Tests\DataFixtures\Core\SpamRuleData; -class SpamRuleApisTest extends BaseCoreApiTest +class SpamRuleApisTest extends BaseCoreApiTestCaseCase { public function testGetSpamRules(): void { diff --git a/test/Unit/Api/SelfService/ArticleApisTest.php b/test/Unit/Api/SelfService/ArticleApisTest.php index 0c42fad6..ea613eda 100644 --- a/test/Unit/Api/SelfService/ArticleApisTest.php +++ b/test/Unit/Api/SelfService/ArticleApisTest.php @@ -9,7 +9,7 @@ use SupportPal\ApiClient\Tests\DataFixtures\SelfService\Request\CreateArticleData; use SupportPal\ApiClient\Tests\DataFixtures\SelfService\Request\UpdateArticleData; -class ArticleApisTest extends BaseSelfServiceApiTest +class ArticleApisTest extends BaseSelfServiceApiTestCaseCase { /** @var int */ protected $testArticleId = 1; diff --git a/test/Unit/Api/SelfService/AttachmentApisTest.php b/test/Unit/Api/SelfService/AttachmentApisTest.php index 6b5b25e5..7814ec0b 100644 --- a/test/Unit/Api/SelfService/AttachmentApisTest.php +++ b/test/Unit/Api/SelfService/AttachmentApisTest.php @@ -9,7 +9,7 @@ use SupportPal\ApiClient\Tests\DataFixtures\SelfService\AttachmentData; use SupportPal\ApiClient\Tests\DataFixtures\SelfService\Request\CreateAttachmentData; -class AttachmentApisTest extends BaseSelfServiceApiTest +class AttachmentApisTest extends BaseSelfServiceApiTestCaseCase { public function testGetAttachments(): void { diff --git a/test/Unit/Api/SelfService/BaseSelfServiceApiTest.php b/test/Unit/Api/SelfService/BaseSelfServiceApiTestCaseCase.php similarity index 82% rename from test/Unit/Api/SelfService/BaseSelfServiceApiTest.php rename to test/Unit/Api/SelfService/BaseSelfServiceApiTestCaseCase.php index f3a35b12..13325f68 100644 --- a/test/Unit/Api/SelfService/BaseSelfServiceApiTest.php +++ b/test/Unit/Api/SelfService/BaseSelfServiceApiTestCaseCase.php @@ -4,9 +4,9 @@ use SupportPal\ApiClient\Api\SelfServiceApi; use SupportPal\ApiClient\Http\SelfServiceClient; -use SupportPal\ApiClient\Tests\Unit\ApiTest; +use SupportPal\ApiClient\Tests\Unit\ApiTestCase; -class BaseSelfServiceApiTest extends ApiTest +class BaseSelfServiceApiTestCaseCase extends ApiTestCase { /** @var SelfServiceApi */ protected $api; diff --git a/test/Unit/Api/SelfService/CategoryApisTest.php b/test/Unit/Api/SelfService/CategoryApisTest.php index 9ed31bcc..5b5c2629 100644 --- a/test/Unit/Api/SelfService/CategoryApisTest.php +++ b/test/Unit/Api/SelfService/CategoryApisTest.php @@ -5,7 +5,7 @@ use SupportPal\ApiClient\Model\SelfService\Category; use SupportPal\ApiClient\Tests\DataFixtures\SelfService\CategoryData; -class CategoryApisTest extends BaseSelfServiceApiTest +class CategoryApisTest extends BaseSelfServiceApiTestCaseCase { public function testGetCategories(): void { diff --git a/test/Unit/Api/SelfService/CommentApisTest.php b/test/Unit/Api/SelfService/CommentApisTest.php index 175db3e0..30d41181 100644 --- a/test/Unit/Api/SelfService/CommentApisTest.php +++ b/test/Unit/Api/SelfService/CommentApisTest.php @@ -6,7 +6,7 @@ use SupportPal\ApiClient\Model\SelfService\Request\CreateComment; use SupportPal\ApiClient\Tests\DataFixtures\SelfService\CommentData; -class CommentApisTest extends BaseSelfServiceApiTest +class CommentApisTest extends BaseSelfServiceApiTestCaseCase { /** @var int */ private $testCommentId = 1; diff --git a/test/Unit/Api/SelfService/SettingsApisTest.php b/test/Unit/Api/SelfService/SettingsApisTest.php index b12e6b13..60bb41c1 100644 --- a/test/Unit/Api/SelfService/SettingsApisTest.php +++ b/test/Unit/Api/SelfService/SettingsApisTest.php @@ -5,7 +5,7 @@ use SupportPal\ApiClient\Model\Shared\Settings; use SupportPal\ApiClient\Tests\DataFixtures\SelfService\SettingsData; -class SettingsApisTest extends BaseSelfServiceApiTest +class SettingsApisTest extends BaseSelfServiceApiTestCaseCase { public function testGetSettings(): void { diff --git a/test/Unit/Api/SelfService/TagApisTest.php b/test/Unit/Api/SelfService/TagApisTest.php index a1d209a4..b622b985 100644 --- a/test/Unit/Api/SelfService/TagApisTest.php +++ b/test/Unit/Api/SelfService/TagApisTest.php @@ -5,7 +5,7 @@ use SupportPal\ApiClient\Model\SelfService\Tag; use SupportPal\ApiClient\Tests\DataFixtures\SelfService\TagData; -class TagApisTest extends BaseSelfServiceApiTest +class TagApisTest extends BaseSelfServiceApiTestCaseCase { public function testGetTags(): void { diff --git a/test/Unit/Api/SelfService/TypeApiTest.php b/test/Unit/Api/SelfService/TypeApiTest.php index 93273fb6..abc112c5 100644 --- a/test/Unit/Api/SelfService/TypeApiTest.php +++ b/test/Unit/Api/SelfService/TypeApiTest.php @@ -5,7 +5,7 @@ use SupportPal\ApiClient\Model\SelfService\Type; use SupportPal\ApiClient\Tests\DataFixtures\SelfService\TypeData; -class TypeApiTest extends BaseSelfServiceApiTest +class TypeApiTest extends BaseSelfServiceApiTestCaseCase { public function testGetTypes(): void { diff --git a/test/Unit/Api/Ticket/BaseTicketApiTest.php b/test/Unit/Api/Ticket/BaseTicketApiTestCase.php similarity index 83% rename from test/Unit/Api/Ticket/BaseTicketApiTest.php rename to test/Unit/Api/Ticket/BaseTicketApiTestCase.php index 7a27f05a..643e9981 100644 --- a/test/Unit/Api/Ticket/BaseTicketApiTest.php +++ b/test/Unit/Api/Ticket/BaseTicketApiTestCase.php @@ -4,9 +4,9 @@ use SupportPal\ApiClient\Api\TicketApi; use SupportPal\ApiClient\Http\TicketClient; -use SupportPal\ApiClient\Tests\Unit\ApiTest; +use SupportPal\ApiClient\Tests\Unit\ApiTestCase; -class BaseTicketApiTest extends ApiTest +class BaseTicketApiTestCase extends ApiTestCase { /** @var TicketApi */ protected $api; diff --git a/test/Unit/Api/Ticket/ChannelApisTest.php b/test/Unit/Api/Ticket/ChannelApisTest.php index 64ac7284..38effb06 100644 --- a/test/Unit/Api/Ticket/ChannelApisTest.php +++ b/test/Unit/Api/Ticket/ChannelApisTest.php @@ -5,7 +5,7 @@ use SupportPal\ApiClient\Model\Ticket\ChannelSettings; use SupportPal\ApiClient\Tests\DataFixtures\Ticket\ChannelSettingsData; -class ChannelApisTest extends BaseTicketApiTest +class ChannelApisTest extends BaseTicketApiTestCase { public function testGetChannelSettings(): void { diff --git a/test/Unit/Api/Ticket/CustomFieldApisTest.php b/test/Unit/Api/Ticket/CustomFieldApisTest.php index fdc0a082..6fdaff2d 100644 --- a/test/Unit/Api/Ticket/CustomFieldApisTest.php +++ b/test/Unit/Api/Ticket/CustomFieldApisTest.php @@ -5,7 +5,7 @@ use SupportPal\ApiClient\Model\Ticket\TicketCustomField; use SupportPal\ApiClient\Tests\DataFixtures\Ticket\TicketCustomFieldData; -class CustomFieldApisTest extends BaseTicketApiTest +class CustomFieldApisTest extends BaseTicketApiTestCase { /** @var int */ private $testId = 1; diff --git a/test/Unit/Api/Ticket/DepartmentApisTest.php b/test/Unit/Api/Ticket/DepartmentApisTest.php index 80fb986e..b6464f62 100644 --- a/test/Unit/Api/Ticket/DepartmentApisTest.php +++ b/test/Unit/Api/Ticket/DepartmentApisTest.php @@ -5,7 +5,7 @@ use SupportPal\ApiClient\Model\Ticket\Department; use SupportPal\ApiClient\Tests\DataFixtures\Ticket\DepartmentData; -class DepartmentApisTest extends BaseTicketApiTest +class DepartmentApisTest extends BaseTicketApiTestCase { /** @var int */ private $testDepartmentId = 1; diff --git a/test/Unit/Api/Ticket/MessageApisTest.php b/test/Unit/Api/Ticket/MessageApisTest.php index d65c0d6f..c3cc2a6a 100644 --- a/test/Unit/Api/Ticket/MessageApisTest.php +++ b/test/Unit/Api/Ticket/MessageApisTest.php @@ -8,7 +8,7 @@ use SupportPal\ApiClient\Tests\DataFixtures\Ticket\MessageData; use SupportPal\ApiClient\Tests\DataFixtures\Ticket\Request\UpdateMessageData; -class MessageApisTest extends BaseTicketApiTest +class MessageApisTest extends BaseTicketApiTestCase { /** @var int */ private $testMessageId = 1; diff --git a/test/Unit/Api/Ticket/PriorityApisTest.php b/test/Unit/Api/Ticket/PriorityApisTest.php index b681dc7b..50c605b0 100644 --- a/test/Unit/Api/Ticket/PriorityApisTest.php +++ b/test/Unit/Api/Ticket/PriorityApisTest.php @@ -5,7 +5,7 @@ use SupportPal\ApiClient\Model\Ticket\Priority; use SupportPal\ApiClient\Tests\DataFixtures\Ticket\PriorityData; -class PriorityApisTest extends BaseTicketApiTest +class PriorityApisTest extends BaseTicketApiTestCase { public function testGetPriorities(): void { diff --git a/test/Unit/Api/Ticket/StatusApisTest.php b/test/Unit/Api/Ticket/StatusApisTest.php index 2b54a81f..ec552e0d 100644 --- a/test/Unit/Api/Ticket/StatusApisTest.php +++ b/test/Unit/Api/Ticket/StatusApisTest.php @@ -5,7 +5,7 @@ use SupportPal\ApiClient\Model\Ticket\Status; use SupportPal\ApiClient\Tests\DataFixtures\Ticket\StatusData; -class StatusApisTest extends BaseTicketApiTest +class StatusApisTest extends BaseTicketApiTestCase { public function testGetStatuses(): void { diff --git a/test/Unit/Api/Ticket/TicketApisTest.php b/test/Unit/Api/Ticket/TicketApisTest.php index 6bffa0fe..8a5cd611 100644 --- a/test/Unit/Api/Ticket/TicketApisTest.php +++ b/test/Unit/Api/Ticket/TicketApisTest.php @@ -9,7 +9,7 @@ use SupportPal\ApiClient\Tests\DataFixtures\Ticket\Request\UpdateTicketData; use SupportPal\ApiClient\Tests\DataFixtures\Ticket\TicketData; -class TicketApisTest extends BaseTicketApiTest +class TicketApisTest extends BaseTicketApiTestCase { public function testGetTickets(): void { diff --git a/test/Unit/Api/Ticket/TicketSettingsApisTest.php b/test/Unit/Api/Ticket/TicketSettingsApisTest.php index a2e8a8ea..ebb42a52 100644 --- a/test/Unit/Api/Ticket/TicketSettingsApisTest.php +++ b/test/Unit/Api/Ticket/TicketSettingsApisTest.php @@ -5,7 +5,7 @@ use SupportPal\ApiClient\Model\Shared\Settings; use SupportPal\ApiClient\Tests\DataFixtures\Ticket\SettingsData; -class TicketSettingsApisTest extends BaseTicketApiTest +class TicketSettingsApisTest extends BaseTicketApiTestCase { public function testGetTicketsSettings(): void { diff --git a/test/Unit/Api/User/BaseUserApiTest.php b/test/Unit/Api/User/BaseUserApiTestCase.php similarity index 83% rename from test/Unit/Api/User/BaseUserApiTest.php rename to test/Unit/Api/User/BaseUserApiTestCase.php index 2d6a506c..ce189221 100644 --- a/test/Unit/Api/User/BaseUserApiTest.php +++ b/test/Unit/Api/User/BaseUserApiTestCase.php @@ -4,9 +4,9 @@ use SupportPal\ApiClient\Api\UserApi; use SupportPal\ApiClient\Http\UserClient; -use SupportPal\ApiClient\Tests\Unit\ApiTest; +use SupportPal\ApiClient\Tests\Unit\ApiTestCase; -class BaseUserApiTest extends ApiTest +class BaseUserApiTestCase extends ApiTestCase { /** @var UserApi */ protected $api; diff --git a/test/Unit/Api/User/OperatorApisTest.php b/test/Unit/Api/User/OperatorApisTest.php index 06e2a8a5..928459ab 100644 --- a/test/Unit/Api/User/OperatorApisTest.php +++ b/test/Unit/Api/User/OperatorApisTest.php @@ -9,7 +9,7 @@ use SupportPal\ApiClient\Tests\DataFixtures\User\Request\CreateOperatorData; use SupportPal\ApiClient\Tests\DataFixtures\User\Request\UpdateOperatorData; -class OperatorApisTest extends BaseUserApiTest +class OperatorApisTest extends BaseUserApiTestCase { public function testGetOperators(): void { diff --git a/test/Unit/Api/User/OperatorGroupApisTest.php b/test/Unit/Api/User/OperatorGroupApisTest.php index bb6c0f2b..286a0877 100644 --- a/test/Unit/Api/User/OperatorGroupApisTest.php +++ b/test/Unit/Api/User/OperatorGroupApisTest.php @@ -5,7 +5,7 @@ use SupportPal\ApiClient\Model\User\Group; use SupportPal\ApiClient\Tests\DataFixtures\User\GroupData; -class OperatorGroupApisTest extends BaseUserApiTest +class OperatorGroupApisTest extends BaseUserApiTestCase { public function testGetOperatorGroups(): void { diff --git a/test/Unit/Api/User/OrganisationApisTest.php b/test/Unit/Api/User/OrganisationApisTest.php index bc1726f9..d3dd1f81 100644 --- a/test/Unit/Api/User/OrganisationApisTest.php +++ b/test/Unit/Api/User/OrganisationApisTest.php @@ -9,7 +9,7 @@ use SupportPal\ApiClient\Tests\DataFixtures\User\Request\CreateOrganisationData; use SupportPal\ApiClient\Tests\DataFixtures\User\Request\UpdateOrganisationData; -class OrganisationApisTest extends BaseUserApiTest +class OrganisationApisTest extends BaseUserApiTestCase { public function testGetOrganisations(): void { diff --git a/test/Unit/Api/User/OrganisationCustomFieldApisTest.php b/test/Unit/Api/User/OrganisationCustomFieldApisTest.php index 81711aae..c361a34b 100644 --- a/test/Unit/Api/User/OrganisationCustomFieldApisTest.php +++ b/test/Unit/Api/User/OrganisationCustomFieldApisTest.php @@ -5,7 +5,7 @@ use SupportPal\ApiClient\Model\User\OrganisationCustomField; use SupportPal\ApiClient\Tests\DataFixtures\User\OrganisationCustomFieldData; -class OrganisationCustomFieldApisTest extends BaseUserApiTest +class OrganisationCustomFieldApisTest extends BaseUserApiTestCase { public function testGetOrganisationCustomFields(): void { diff --git a/test/Unit/Api/User/SettingsApisTest.php b/test/Unit/Api/User/SettingsApisTest.php index 10d87063..c856fe6e 100644 --- a/test/Unit/Api/User/SettingsApisTest.php +++ b/test/Unit/Api/User/SettingsApisTest.php @@ -5,7 +5,7 @@ use SupportPal\ApiClient\Model\Shared\Settings; use SupportPal\ApiClient\Tests\DataFixtures\User\SettingsData; -class SettingsApisTest extends BaseUserApiTest +class SettingsApisTest extends BaseUserApiTestCase { public function testGetCoreSettings(): void { diff --git a/test/Unit/Api/User/UserApisTest.php b/test/Unit/Api/User/UserApisTest.php index 054e8a51..6e3481fe 100644 --- a/test/Unit/Api/User/UserApisTest.php +++ b/test/Unit/Api/User/UserApisTest.php @@ -9,7 +9,7 @@ use SupportPal\ApiClient\Tests\DataFixtures\User\Request\UpdateUserData; use SupportPal\ApiClient\Tests\DataFixtures\User\UserData; -class UserApisTest extends BaseUserApiTest +class UserApisTest extends BaseUserApiTestCase { public function testGetUsers(): void { diff --git a/test/Unit/Api/User/UserCustomFieldApisTest.php b/test/Unit/Api/User/UserCustomFieldApisTest.php index 32d8885f..d38961b6 100644 --- a/test/Unit/Api/User/UserCustomFieldApisTest.php +++ b/test/Unit/Api/User/UserCustomFieldApisTest.php @@ -5,7 +5,7 @@ use SupportPal\ApiClient\Model\User\UserCustomField; use SupportPal\ApiClient\Tests\DataFixtures\User\UserCustomFieldData; -class UserCustomFieldApisTest extends BaseUserApiTest +class UserCustomFieldApisTest extends BaseUserApiTestCase { public function testGetUserCustomFields(): void { diff --git a/test/Unit/Api/User/UserGroupApisTest.php b/test/Unit/Api/User/UserGroupApisTest.php index 94d0d921..52788aed 100644 --- a/test/Unit/Api/User/UserGroupApisTest.php +++ b/test/Unit/Api/User/UserGroupApisTest.php @@ -5,7 +5,7 @@ use SupportPal\ApiClient\Model\User\Group; use SupportPal\ApiClient\Tests\DataFixtures\User\GroupData; -class UserGroupApisTest extends BaseUserApiTest +class UserGroupApisTest extends BaseUserApiTestCase { public function testGetUserGroups(): void { diff --git a/test/Unit/ApiTest.php b/test/Unit/ApiTestCase.php similarity index 98% rename from test/Unit/ApiTest.php rename to test/Unit/ApiTestCase.php index 7509c995..78b3d9b6 100644 --- a/test/Unit/ApiTest.php +++ b/test/Unit/ApiTestCase.php @@ -14,7 +14,7 @@ use function is_array; use function json_encode; -abstract class ApiTest extends TestCase +abstract class ApiTestCase extends TestCase { protected const TEST_ID = 1; diff --git a/test/Unit/Model/BaseModelTest.php b/test/Unit/Model/BaseModelTestCase.php similarity index 89% rename from test/Unit/Model/BaseModelTest.php rename to test/Unit/Model/BaseModelTestCase.php index 2bb3c78a..75417fd7 100644 --- a/test/Unit/Model/BaseModelTest.php +++ b/test/Unit/Model/BaseModelTestCase.php @@ -8,7 +8,7 @@ /** * @template T of Model */ -abstract class BaseModelTest extends TestCase +abstract class BaseModelTestCase extends TestCase { /** @var class-string */ protected string $modelClass; diff --git a/test/Unit/Model/Ticket/Request/CreateMessageTest.php b/test/Unit/Model/Ticket/Request/CreateMessageTest.php index 79a92a69..d5206509 100644 --- a/test/Unit/Model/Ticket/Request/CreateMessageTest.php +++ b/test/Unit/Model/Ticket/Request/CreateMessageTest.php @@ -3,12 +3,12 @@ namespace SupportPal\ApiClient\Tests\Unit\Model\Ticket\Request; use SupportPal\ApiClient\Model\Ticket\Request\CreateMessage; -use SupportPal\ApiClient\Tests\Unit\Model\BaseModelTest; +use SupportPal\ApiClient\Tests\Unit\Model\BaseModelTestCase; /** - * @extends BaseModelTest + * @extends BaseModelTestCase */ -class CreateMessageTest extends BaseModelTest +class CreateMessageTest extends BaseModelTestCase { protected string $modelClass = CreateMessage::class; diff --git a/test/Unit/Model/Ticket/Request/CreateTicketTest.php b/test/Unit/Model/Ticket/Request/CreateTicketTest.php index a13b65a2..58dfa92b 100644 --- a/test/Unit/Model/Ticket/Request/CreateTicketTest.php +++ b/test/Unit/Model/Ticket/Request/CreateTicketTest.php @@ -3,12 +3,12 @@ namespace SupportPal\ApiClient\Tests\Unit\Model\Ticket\Request; use SupportPal\ApiClient\Model\Ticket\Request\CreateTicket; -use SupportPal\ApiClient\Tests\Unit\Model\BaseModelTest; +use SupportPal\ApiClient\Tests\Unit\Model\BaseModelTestCase; /** - * @extends BaseModelTest + * @extends BaseModelTestCase */ -class CreateTicketTest extends BaseModelTest +class CreateTicketTest extends BaseModelTestCase { protected string $modelClass = CreateTicket::class; diff --git a/test/Unit/Model/Ticket/Request/UpdateTicketTest.php b/test/Unit/Model/Ticket/Request/UpdateTicketTest.php index 0ae4cd6a..13b13e89 100644 --- a/test/Unit/Model/Ticket/Request/UpdateTicketTest.php +++ b/test/Unit/Model/Ticket/Request/UpdateTicketTest.php @@ -3,12 +3,12 @@ namespace SupportPal\ApiClient\Tests\Unit\Model\Ticket\Request; use SupportPal\ApiClient\Model\Ticket\Request\UpdateTicket; -use SupportPal\ApiClient\Tests\Unit\Model\BaseModelTest; +use SupportPal\ApiClient\Tests\Unit\Model\BaseModelTestCase; /** - * @extends BaseModelTest + * @extends BaseModelTestCase */ -class UpdateTicketTest extends BaseModelTest +class UpdateTicketTest extends BaseModelTestCase { protected string $modelClass = UpdateTicket::class; diff --git a/test/Unit/Model/User/Request/CreateOperatorTest.php b/test/Unit/Model/User/Request/CreateOperatorTest.php index 180de018..e8fc5e09 100644 --- a/test/Unit/Model/User/Request/CreateOperatorTest.php +++ b/test/Unit/Model/User/Request/CreateOperatorTest.php @@ -3,12 +3,12 @@ namespace SupportPal\ApiClient\Tests\Unit\Model\User\Request; use SupportPal\ApiClient\Model\User\Request\CreateOperator; -use SupportPal\ApiClient\Tests\Unit\Model\BaseModelTest; +use SupportPal\ApiClient\Tests\Unit\Model\BaseModelTestCase; /** - * @extends BaseModelTest + * @extends BaseModelTestCase */ -class CreateOperatorTest extends BaseModelTest +class CreateOperatorTest extends BaseModelTestCase { protected string $modelClass = CreateOperator::class; diff --git a/test/Unit/Model/User/Request/CreateOrganisationTest.php b/test/Unit/Model/User/Request/CreateOrganisationTest.php index 661b5208..95b4cc79 100644 --- a/test/Unit/Model/User/Request/CreateOrganisationTest.php +++ b/test/Unit/Model/User/Request/CreateOrganisationTest.php @@ -3,12 +3,12 @@ namespace SupportPal\ApiClient\Tests\Unit\Model\User\Request; use SupportPal\ApiClient\Model\User\Request\CreateOrganisation; -use SupportPal\ApiClient\Tests\Unit\Model\BaseModelTest; +use SupportPal\ApiClient\Tests\Unit\Model\BaseModelTestCase; /** - * @extends BaseModelTest + * @extends BaseModelTestCase */ -class CreateOrganisationTest extends BaseModelTest +class CreateOrganisationTest extends BaseModelTestCase { protected string $modelClass = CreateOrganisation::class; diff --git a/test/Unit/Model/User/Request/CreateUserTest.php b/test/Unit/Model/User/Request/CreateUserTest.php index fff405e2..d6b5908f 100644 --- a/test/Unit/Model/User/Request/CreateUserTest.php +++ b/test/Unit/Model/User/Request/CreateUserTest.php @@ -4,12 +4,12 @@ use libphonenumber\NumberParseException; use SupportPal\ApiClient\Model\User\Request\CreateUser; -use SupportPal\ApiClient\Tests\Unit\Model\BaseModelTest; +use SupportPal\ApiClient\Tests\Unit\Model\BaseModelTestCase; /** - * @extends BaseModelTest + * @extends BaseModelTestCase */ -class CreateUserTest extends BaseModelTest +class CreateUserTest extends BaseModelTestCase { protected string $modelClass = CreateUser::class; From 7d8b10d5e16977cc60fdb7da8ff012a367816225 Mon Sep 17 00:00:00 2001 From: bytestream Date: Mon, 1 Jun 2026 13:24:37 +0100 Subject: [PATCH 15/24] wip --- test/ApiTestCase.php | 2 ++ test/ContainerAwareBaseTestCase.php | 12 +++++------- test/Functional/ApiComponentTest.php | 3 --- test/Integration/Api/CoreApisComponentTest.php | 4 ++-- .../Integration/Api/SelfServiceApisComponentTest.php | 4 ++-- test/Integration/Api/TicketApisComponentTest.php | 4 ++-- test/Integration/Api/UserApisComponentTest.php | 4 ++-- ...ApiComponentTest.php => ApiComponentTestCase.php} | 5 +---- 8 files changed, 16 insertions(+), 22 deletions(-) rename test/Integration/{ApiComponentTest.php => ApiComponentTestCase.php} (82%) diff --git a/test/ApiTestCase.php b/test/ApiTestCase.php index 0730d7a0..6473470a 100644 --- a/test/ApiTestCase.php +++ b/test/ApiTestCase.php @@ -15,6 +15,8 @@ abstract class ApiTestCase extends ContainerAwareBaseTestCase { + use ApiDataProviders; + /** * @param array $data * @param array $parameters diff --git a/test/ContainerAwareBaseTestCase.php b/test/ContainerAwareBaseTestCase.php index 6697914d..5dd12567 100644 --- a/test/ContainerAwareBaseTestCase.php +++ b/test/ContainerAwareBaseTestCase.php @@ -54,16 +54,14 @@ public static function provideUnsuccessfulResponses(): iterable $jsonSuccessfulBody['status'] = 'success'; $jsonSuccessfulBody = json_encode($jsonSuccessfulBody) ?: throw new JsonException('Failed to encode JSON data.'); - yield ['error 400 response' => new Response(400, [], $jsonSuccessfulBody)]; - yield ['error 401 response' => new Response(401, [], $jsonSuccessfulBody)]; - yield ['error 403 response' => new Response(403, [], $jsonSuccessfulBody)]; - yield ['error 404 response' => new Response(404, [], $jsonSuccessfulBody)]; + yield 'error 400 response' => [new Response(400, [], $jsonSuccessfulBody)]; + yield 'error 401 response' => [new Response(401, [], $jsonSuccessfulBody)]; + yield 'error 403 response' => [new Response(403, [], $jsonSuccessfulBody)]; + yield 'error 404 response' => [new Response(404, [], $jsonSuccessfulBody)]; $jsonErrorBody = json_encode($genericErrorResponse) ?: throw new JsonException('Failed to encode JSON data.'); - yield [ - 'error status response' => new Response(200, [], $jsonErrorBody), - ]; + yield 'error status response' => [new Response(200, [], $jsonErrorBody)]; } /** diff --git a/test/Functional/ApiComponentTest.php b/test/Functional/ApiComponentTest.php index 007bb835..4ce70652 100644 --- a/test/Functional/ApiComponentTest.php +++ b/test/Functional/ApiComponentTest.php @@ -2,13 +2,10 @@ namespace SupportPal\ApiClient\Tests\Functional; -use SupportPal\ApiClient\Tests\ApiDataProviders; use SupportPal\ApiClient\Tests\ApiTestCase; abstract class ApiComponentTest extends ApiTestCase { - use ApiDataProviders; - protected function setUp(): void { parent::setUp(); diff --git a/test/Integration/Api/CoreApisComponentTest.php b/test/Integration/Api/CoreApisComponentTest.php index f7c3e03c..782b6a35 100644 --- a/test/Integration/Api/CoreApisComponentTest.php +++ b/test/Integration/Api/CoreApisComponentTest.php @@ -4,9 +4,9 @@ use SupportPal\ApiClient\Api\CoreApi; use SupportPal\ApiClient\Tests\DataFixtures\ApiCalls\CoreApisData; -use SupportPal\ApiClient\Tests\Integration\ApiComponentTest; +use SupportPal\ApiClient\Tests\Integration\ApiComponentTestCase; -class CoreApisComponentTest extends ApiComponentTest +class CoreApisComponentTest extends ApiComponentTestCase { /** * @inheritDoc diff --git a/test/Integration/Api/SelfServiceApisComponentTest.php b/test/Integration/Api/SelfServiceApisComponentTest.php index ee5bbb6d..b155cb27 100644 --- a/test/Integration/Api/SelfServiceApisComponentTest.php +++ b/test/Integration/Api/SelfServiceApisComponentTest.php @@ -4,9 +4,9 @@ use SupportPal\ApiClient\Api\SelfServiceApi; use SupportPal\ApiClient\Tests\DataFixtures\ApiCalls\SelfServiceApisData; -use SupportPal\ApiClient\Tests\Integration\ApiComponentTest; +use SupportPal\ApiClient\Tests\Integration\ApiComponentTestCase; -class SelfServiceApisComponentTest extends ApiComponentTest +class SelfServiceApisComponentTest extends ApiComponentTestCase { /** * @inheritDoc diff --git a/test/Integration/Api/TicketApisComponentTest.php b/test/Integration/Api/TicketApisComponentTest.php index 9efd2e64..e61009fd 100644 --- a/test/Integration/Api/TicketApisComponentTest.php +++ b/test/Integration/Api/TicketApisComponentTest.php @@ -5,9 +5,9 @@ use SupportPal\ApiClient\Api\TicketApi; use SupportPal\ApiClient\Exception\InvalidArgumentException; use SupportPal\ApiClient\Tests\DataFixtures\ApiCalls\TicketApisData; -use SupportPal\ApiClient\Tests\Integration\ApiComponentTest; +use SupportPal\ApiClient\Tests\Integration\ApiComponentTestCase; -class TicketApisComponentTest extends ApiComponentTest +class TicketApisComponentTest extends ApiComponentTestCase { /** * @inheritDoc diff --git a/test/Integration/Api/UserApisComponentTest.php b/test/Integration/Api/UserApisComponentTest.php index 525eeba9..af0b1513 100644 --- a/test/Integration/Api/UserApisComponentTest.php +++ b/test/Integration/Api/UserApisComponentTest.php @@ -5,9 +5,9 @@ use SupportPal\ApiClient\Api\UserApi; use SupportPal\ApiClient\Exception\InvalidArgumentException; use SupportPal\ApiClient\Tests\DataFixtures\ApiCalls\UserApisData; -use SupportPal\ApiClient\Tests\Integration\ApiComponentTest; +use SupportPal\ApiClient\Tests\Integration\ApiComponentTestCase; -class UserApisComponentTest extends ApiComponentTest +class UserApisComponentTest extends ApiComponentTestCase { /** * @inheritDoc diff --git a/test/Integration/ApiComponentTest.php b/test/Integration/ApiComponentTestCase.php similarity index 82% rename from test/Integration/ApiComponentTest.php rename to test/Integration/ApiComponentTestCase.php index 4f94fa03..216e41a1 100644 --- a/test/Integration/ApiComponentTest.php +++ b/test/Integration/ApiComponentTestCase.php @@ -3,13 +3,10 @@ namespace SupportPal\ApiClient\Tests\Integration; use SupportPal\ApiClient\Api\Api; -use SupportPal\ApiClient\Tests\ApiDataProviders; use SupportPal\ApiClient\Tests\ApiTestCase; -abstract class ApiComponentTest extends ApiTestCase +abstract class ApiComponentTestCase extends ApiTestCase { - use ApiDataProviders; - /** @var Api */ private $api; From 0c6a76869a63a563fa133aca50d024f1e8e1a8a3 Mon Sep 17 00:00:00 2001 From: bytestream Date: Mon, 1 Jun 2026 13:26:53 +0100 Subject: [PATCH 16/24] wip --- test/ContainerAwareBaseTestCase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ContainerAwareBaseTestCase.php b/test/ContainerAwareBaseTestCase.php index 5dd12567..f0e316d5 100644 --- a/test/ContainerAwareBaseTestCase.php +++ b/test/ContainerAwareBaseTestCase.php @@ -40,7 +40,7 @@ abstract class ContainerAwareBaseTestCase extends TestCase protected $mockRequestHandler; /** - * @return iterable> + * @return iterable> */ public static function provideUnsuccessfulResponses(): iterable { From ff93e1e77e45fa65378ba77df86b6142424a0ce0 Mon Sep 17 00:00:00 2001 From: bytestream Date: Mon, 1 Jun 2026 13:32:58 +0100 Subject: [PATCH 17/24] rename ApiComponentTest to ApiComponentTestCase --- test/Functional/Api/CoreApisTest.php | 4 ++-- test/Functional/Api/SelfServiceApisTest.php | 4 ++-- test/Functional/Api/TicketApisTest.php | 4 ++-- test/Functional/Api/UserApisTest.php | 4 ++-- .../{ApiComponentTest.php => ApiComponentTestCase.php} | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) rename test/Functional/{ApiComponentTest.php => ApiComponentTestCase.php} (82%) diff --git a/test/Functional/Api/CoreApisTest.php b/test/Functional/Api/CoreApisTest.php index 87a60f53..2d5f1567 100644 --- a/test/Functional/Api/CoreApisTest.php +++ b/test/Functional/Api/CoreApisTest.php @@ -5,9 +5,9 @@ use Exception; use SupportPal\ApiClient\Api\Api; use SupportPal\ApiClient\Tests\DataFixtures\ApiCalls\CoreApisData; -use SupportPal\ApiClient\Tests\Functional\ApiComponentTest; +use SupportPal\ApiClient\Tests\Functional\ApiComponentTestCase; -class CoreApisTest extends ApiComponentTest +class CoreApisTest extends ApiComponentTestCase { /** * @inheritDoc diff --git a/test/Functional/Api/SelfServiceApisTest.php b/test/Functional/Api/SelfServiceApisTest.php index 74744eb7..6d8d3945 100644 --- a/test/Functional/Api/SelfServiceApisTest.php +++ b/test/Functional/Api/SelfServiceApisTest.php @@ -6,9 +6,9 @@ use SupportPal\ApiClient\Api\Api; use SupportPal\ApiClient\Exception\InvalidArgumentException; use SupportPal\ApiClient\Tests\DataFixtures\ApiCalls\SelfServiceApisData; -use SupportPal\ApiClient\Tests\Functional\ApiComponentTest; +use SupportPal\ApiClient\Tests\Functional\ApiComponentTestCase; -class SelfServiceApisTest extends ApiComponentTest +class SelfServiceApisTest extends ApiComponentTestCase { /** * @inheritDoc diff --git a/test/Functional/Api/TicketApisTest.php b/test/Functional/Api/TicketApisTest.php index 1b9f957f..d771c2be 100644 --- a/test/Functional/Api/TicketApisTest.php +++ b/test/Functional/Api/TicketApisTest.php @@ -6,9 +6,9 @@ use SupportPal\ApiClient\Api\Api; use SupportPal\ApiClient\Exception\InvalidArgumentException; use SupportPal\ApiClient\Tests\DataFixtures\ApiCalls\TicketApisData; -use SupportPal\ApiClient\Tests\Functional\ApiComponentTest; +use SupportPal\ApiClient\Tests\Functional\ApiComponentTestCase; -class TicketApisTest extends ApiComponentTest +class TicketApisTest extends ApiComponentTestCase { /** * @inheritDoc diff --git a/test/Functional/Api/UserApisTest.php b/test/Functional/Api/UserApisTest.php index c31b424f..34883925 100644 --- a/test/Functional/Api/UserApisTest.php +++ b/test/Functional/Api/UserApisTest.php @@ -6,9 +6,9 @@ use SupportPal\ApiClient\Api\Api; use SupportPal\ApiClient\Exception\InvalidArgumentException; use SupportPal\ApiClient\Tests\DataFixtures\ApiCalls\UserApisData; -use SupportPal\ApiClient\Tests\Functional\ApiComponentTest; +use SupportPal\ApiClient\Tests\Functional\ApiComponentTestCase; -class UserApisTest extends ApiComponentTest +class UserApisTest extends ApiComponentTestCase { /** * @inheritDoc diff --git a/test/Functional/ApiComponentTest.php b/test/Functional/ApiComponentTestCase.php similarity index 82% rename from test/Functional/ApiComponentTest.php rename to test/Functional/ApiComponentTestCase.php index 4ce70652..d1df4ba2 100644 --- a/test/Functional/ApiComponentTest.php +++ b/test/Functional/ApiComponentTestCase.php @@ -4,7 +4,7 @@ use SupportPal\ApiClient\Tests\ApiTestCase; -abstract class ApiComponentTest extends ApiTestCase +abstract class ApiComponentTestCase extends ApiTestCase { protected function setUp(): void { From 38949d3fb0336fbaef086de247485b984e96cea4 Mon Sep 17 00:00:00 2001 From: bytestream Date: Mon, 1 Jun 2026 13:46:10 +0100 Subject: [PATCH 18/24] wip --- test/ContainerAwareBaseTestCase.php | 12 +++--------- test/Functional/SupportPalTest.php | 2 +- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/test/ContainerAwareBaseTestCase.php b/test/ContainerAwareBaseTestCase.php index f0e316d5..d04d57bd 100644 --- a/test/ContainerAwareBaseTestCase.php +++ b/test/ContainerAwareBaseTestCase.php @@ -24,7 +24,7 @@ abstract class ContainerAwareBaseTestCase extends TestCase { /** @var array */ - protected $genericErrorResponse = [ + protected const GENERIC_ERROR_RESPONSE = [ 'status' => 'error', 'message' => 'unsuccessful error', 'data' => [] @@ -44,13 +44,7 @@ abstract class ContainerAwareBaseTestCase extends TestCase */ public static function provideUnsuccessfulResponses(): iterable { - $genericErrorResponse = [ - 'status' => 'error', - 'message' => null, - 'data' => [] - ]; - - $jsonSuccessfulBody = $genericErrorResponse; + $jsonSuccessfulBody = self::GENERIC_ERROR_RESPONSE; $jsonSuccessfulBody['status'] = 'success'; $jsonSuccessfulBody = json_encode($jsonSuccessfulBody) ?: throw new JsonException('Failed to encode JSON data.'); @@ -59,7 +53,7 @@ public static function provideUnsuccessfulResponses(): iterable yield 'error 403 response' => [new Response(403, [], $jsonSuccessfulBody)]; yield 'error 404 response' => [new Response(404, [], $jsonSuccessfulBody)]; - $jsonErrorBody = json_encode($genericErrorResponse) ?: throw new JsonException('Failed to encode JSON data.'); + $jsonErrorBody = json_encode(self::GENERIC_ERROR_RESPONSE) ?: throw new JsonException('Failed to encode JSON data.'); yield 'error status response' => [new Response(200, [], $jsonErrorBody)]; } diff --git a/test/Functional/SupportPalTest.php b/test/Functional/SupportPalTest.php index 9402ec15..d19c8593 100644 --- a/test/Functional/SupportPalTest.php +++ b/test/Functional/SupportPalTest.php @@ -42,7 +42,7 @@ public function testSendRequestUnSuccessful(): void $response = new Response( 200, [], - (string) json_encode($this->genericErrorResponse) + (string) json_encode(self::GENERIC_ERROR_RESPONSE) ); $this->appendRequestResponse($response); $request = $this->getSupportPal()->getRequest()->create('GET', 'test_endpoint'); From f91bc4560c1a8bd0d8f1e9a21bc112d274629e58 Mon Sep 17 00:00:00 2001 From: bytestream Date: Mon, 1 Jun 2026 13:53:28 +0100 Subject: [PATCH 19/24] fix phpunit 10 no longer allows empty set returned by data provider --- test/ApiDataProviders.php | 18 ++++++++++++++++-- test/ApiTestCase.php | 15 ++++++++++++--- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/test/ApiDataProviders.php b/test/ApiDataProviders.php index 86cefe69..88f4038b 100644 --- a/test/ApiDataProviders.php +++ b/test/ApiDataProviders.php @@ -121,7 +121,14 @@ public static function provideDeleteEndpointsTestCases(): iterable */ public static function provideDownloadEndpointsTestCases(): iterable { - foreach (static::getDownloadsEndpoints() as $endpoint => $model) { + $endpoints = static::getDownloadsEndpoints(); + if (empty($endpoints)) { + yield [null, null]; + + return; + } + + foreach ($endpoints as $endpoint => $model) { yield [$model, $endpoint]; } } @@ -131,7 +138,14 @@ public static function provideDownloadEndpointsTestCases(): iterable */ public static function provideDownloadUnsuccessfulTestCases(): iterable { - foreach (static::getDownloadsEndpoints() as $endpoint => $model) { + $endpoints = static::getDownloadsEndpoints(); + if (empty($endpoints)) { + yield [null, null, null]; + + return; + } + + foreach ($endpoints as $endpoint => $model) { foreach (static::provideUnsuccessfulResponses() as $testCase) { yield [current($testCase), $endpoint, [$model]]; } diff --git a/test/ApiTestCase.php b/test/ApiTestCase.php index 6473470a..7ccf2ea2 100644 --- a/test/ApiTestCase.php +++ b/test/ApiTestCase.php @@ -140,8 +140,12 @@ public function testUnsuccessfulDeleteEndpoint(Response $response, string $endpo } #[DataProvider('provideDownloadEndpointsTestCases')] - public function testDownloadEndpoint(int $id, string $functionName): void + public function testDownloadEndpoint(?int $id, ?string $functionName): void { + if ($id === null || $functionName === null) { + $this->markTestSkipped('No download endpoints available for this API.'); + } + $this->appendRequestResponse(new Response(200, ['Content-Disposition' => 'test'], '')); /** @var callable $callable */ $callable = [$this->getApi(), $functionName]; @@ -150,11 +154,16 @@ public function testDownloadEndpoint(int $id, string $functionName): void } /** - * @param array $parameters * @throws Exception + * @param array $parameters + * @throws Exception */ #[DataProvider('provideDownloadUnsuccessfulTestCases')] - public function testUnsuccessfulDownloadEndpoint(Response $response, string $endpoint, array $parameters): void + public function testUnsuccessfulDownloadEndpoint(?Response $response, ?string $endpoint, ?array $parameters): void { + if ($response === null || $endpoint === null || $parameters === null) { + $this->markTestSkipped('No download endpoints available for this API.'); + } + $this->prepareUnsuccessfulApiRequest($response); /** @var callable $callable */ $callable = [$this->getApi(), $endpoint]; From 2665bf7b8f440d26558406ee8b1a1dde692b0bb8 Mon Sep 17 00:00:00 2001 From: bytestream Date: Mon, 1 Jun 2026 14:02:17 +0100 Subject: [PATCH 20/24] wip --- test/Integration/ApiClientTest.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/Integration/ApiClientTest.php b/test/Integration/ApiClientTest.php index 810a8250..6136a9ac 100644 --- a/test/Integration/ApiClientTest.php +++ b/test/Integration/ApiClientTest.php @@ -156,13 +156,13 @@ public function testUnsuccessfulPutModel(Response $response, string $endpoint, a $this->makeClientCall($endpoint, [self::TEST_ID, $data]); } - /** - * @param int $modelId - * @param string $endpoint - */ #[DataProvider('provideDownloadEndpointsTestCases')] - public function testDownloadEndpoint(int $modelId, string $endpoint): void + public function testDownloadEndpoint(?int $modelId, ?string $endpoint): void { + if ($modelId === null && $endpoint === null) { + $this->markTestSkipped('No download endpoints available for this API.'); + } + $expectedResponse = new Response(200, ['Content-Disposition' => 'test'], ''); $this->appendRequestResponse($expectedResponse); $response = $this->makeClientCall($endpoint, [$modelId]); From 4c6f4f4f40e2af40827b251a8ce5908d0715d446 Mon Sep 17 00:00:00 2001 From: bytestream Date: Mon, 1 Jun 2026 14:04:25 +0100 Subject: [PATCH 21/24] rename ApiClientTest to ApiClientTestCase --- test/Integration/ApiClient/CoreApisTest.php | 4 ++-- test/Integration/ApiClient/SelfServiceApisTest.php | 4 ++-- test/Integration/ApiClient/TicketApisTest.php | 4 ++-- test/Integration/ApiClient/UserApisTest.php | 4 ++-- test/Integration/{ApiClientTest.php => ApiClientTestCase.php} | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) rename test/Integration/{ApiClientTest.php => ApiClientTestCase.php} (99%) diff --git a/test/Integration/ApiClient/CoreApisTest.php b/test/Integration/ApiClient/CoreApisTest.php index b063d978..f66b62c5 100644 --- a/test/Integration/ApiClient/CoreApisTest.php +++ b/test/Integration/ApiClient/CoreApisTest.php @@ -5,9 +5,9 @@ use SupportPal\ApiClient\Http\CoreClient; use SupportPal\ApiClient\Tests\DataFixtures\Core\BrandData; use SupportPal\ApiClient\Tests\DataFixtures\Core\SettingsData; -use SupportPal\ApiClient\Tests\Integration\ApiClientTest; +use SupportPal\ApiClient\Tests\Integration\ApiClientTestCase; -class CoreApisTest extends ApiClientTest +class CoreApisTest extends ApiClientTestCase { /** * @inheritDoc diff --git a/test/Integration/ApiClient/SelfServiceApisTest.php b/test/Integration/ApiClient/SelfServiceApisTest.php index c5fae96d..a3a0762f 100644 --- a/test/Integration/ApiClient/SelfServiceApisTest.php +++ b/test/Integration/ApiClient/SelfServiceApisTest.php @@ -10,9 +10,9 @@ use SupportPal\ApiClient\Tests\DataFixtures\SelfService\SettingsData; use SupportPal\ApiClient\Tests\DataFixtures\SelfService\TagData; use SupportPal\ApiClient\Tests\DataFixtures\SelfService\TypeData; -use SupportPal\ApiClient\Tests\Integration\ApiClientTest; +use SupportPal\ApiClient\Tests\Integration\ApiClientTestCase; -class SelfServiceApisTest extends ApiClientTest +class SelfServiceApisTest extends ApiClientTestCase { /** * @inheritDoc diff --git a/test/Integration/ApiClient/TicketApisTest.php b/test/Integration/ApiClient/TicketApisTest.php index 69222ab0..e0a6749b 100644 --- a/test/Integration/ApiClient/TicketApisTest.php +++ b/test/Integration/ApiClient/TicketApisTest.php @@ -15,9 +15,9 @@ use SupportPal\ApiClient\Tests\DataFixtures\Ticket\StatusData; use SupportPal\ApiClient\Tests\DataFixtures\Ticket\TicketCustomFieldData; use SupportPal\ApiClient\Tests\DataFixtures\Ticket\TicketData; -use SupportPal\ApiClient\Tests\Integration\ApiClientTest; +use SupportPal\ApiClient\Tests\Integration\ApiClientTestCase; -class TicketApisTest extends ApiClientTest +class TicketApisTest extends ApiClientTestCase { /** * @inheritDoc diff --git a/test/Integration/ApiClient/UserApisTest.php b/test/Integration/ApiClient/UserApisTest.php index 444ef460..60e66ca0 100644 --- a/test/Integration/ApiClient/UserApisTest.php +++ b/test/Integration/ApiClient/UserApisTest.php @@ -8,9 +8,9 @@ use SupportPal\ApiClient\Tests\DataFixtures\User\Request\UpdateUserData; use SupportPal\ApiClient\Tests\DataFixtures\User\UserCustomFieldData; use SupportPal\ApiClient\Tests\DataFixtures\User\UserData; -use SupportPal\ApiClient\Tests\Integration\ApiClientTest; +use SupportPal\ApiClient\Tests\Integration\ApiClientTestCase; -class UserApisTest extends ApiClientTest +class UserApisTest extends ApiClientTestCase { /** * @inheritDoc diff --git a/test/Integration/ApiClientTest.php b/test/Integration/ApiClientTestCase.php similarity index 99% rename from test/Integration/ApiClientTest.php rename to test/Integration/ApiClientTestCase.php index 6136a9ac..28d2d4f9 100644 --- a/test/Integration/ApiClientTest.php +++ b/test/Integration/ApiClientTestCase.php @@ -18,7 +18,7 @@ use function json_decode; use function json_encode; -class ApiClientTest extends ContainerAwareBaseTestCase +class ApiClientTestCase extends ContainerAwareBaseTestCase { use ApiDataProviders; From 78ea2019c968fad6ab9b393d0b4b35650e185d01 Mon Sep 17 00:00:00 2001 From: bytestream Date: Mon, 1 Jun 2026 14:16:56 +0100 Subject: [PATCH 22/24] wip --- test/ApiDataProviders.php | 36 +++++++++++++++++--- test/Integration/ApiClientTestCase.php | 46 ++++++++++++++++++-------- 2 files changed, 64 insertions(+), 18 deletions(-) diff --git a/test/ApiDataProviders.php b/test/ApiDataProviders.php index 88f4038b..b211ef5a 100644 --- a/test/ApiDataProviders.php +++ b/test/ApiDataProviders.php @@ -37,7 +37,14 @@ public static function provideGetEndpointsUnsuccessfulTestCases(): iterable */ public static function providePostEndpointsTestCases(): iterable { - foreach (static::getPostEndpoints() as $endpoint => $value) { + $endpoints = static::getPostEndpoints(); + if (empty($endpoints)) { + yield [null, null, null]; + + return; + } + + foreach ($endpoints as $endpoint => $value) { [$model, $data] = $value; yield [$model, $data, $endpoint]; @@ -61,7 +68,14 @@ public static function providePutEndpointsTestCases(): iterable */ public static function providePostEndpointsUnsuccessfulTestCases(): iterable { - foreach (static::getPostEndpoints() as $endpoint => $value) { + $endpoints = static::getPostEndpoints(); + if (empty($endpoints)) { + yield [null, null, null]; + + return; + } + + foreach ($endpoints as $endpoint => $value) { $model = current($value); foreach (static::provideUnsuccessfulResponses() as $testCase) { yield [current($testCase), $endpoint, [$model]]; @@ -74,7 +88,14 @@ public static function providePostEndpointsUnsuccessfulTestCases(): iterable */ public static function providePutEndpointsUnsuccessfulTestCases(): iterable { - foreach (static::getPutEndpoints() as $endpoint => $value) { + $endpoints = static::getPutEndpoints(); + if (empty($endpoints)) { + yield [null, null, null]; + + return; + } + + foreach ($endpoints as $endpoint => $value) { [$model, $data] = $value; foreach (static::provideUnsuccessfulResponses() as $testCase) { yield [current($testCase), $endpoint, [$model, $data]]; @@ -87,7 +108,14 @@ public static function providePutEndpointsUnsuccessfulTestCases(): iterable */ public static function provideApiClientPutEndpointsTestCases(): iterable { - foreach (static::getPutEndpoints() as $endpoint => $value) { + $endpoints = static::getPutEndpoints(); + if (empty($endpoints)) { + yield [null, null, null]; + + return; + } + + foreach ($endpoints as $endpoint => $value) { [$data, $response] = $value; yield [$data, $response, $endpoint]; diff --git a/test/Integration/ApiClientTestCase.php b/test/Integration/ApiClientTestCase.php index 28d2d4f9..c1686d14 100644 --- a/test/Integration/ApiClientTestCase.php +++ b/test/Integration/ApiClientTestCase.php @@ -93,13 +93,18 @@ public function testUnsuccessfulGetEndpoint(Response $response, string $endpoint } /** - * @param array $modelData - * @param array $responseData + * @param array|null $modelData + * @param array|null $responseData + * @param string|null $endpoint * @throws Exception */ #[DataProvider('providePostEndpointsTestCases')] - public function testPostModel(array $modelData, array $responseData, string $endpoint): void + public function testPostModel(?array $modelData, ?array $responseData, ?string $endpoint): void { + if ($modelData === null && $responseData === null && $endpoint === null) { + $this->markTestSkipped('No POST endpoints available for this API.'); + } + $jsonSuccessfulBody = json_encode($responseData) ?: throw new JsonException('Failed to encode JSON data.'); $expectedResponse = new Response(200, [], $jsonSuccessfulBody); $this->appendRequestResponse($expectedResponse); @@ -112,26 +117,35 @@ public function testPostModel(array $modelData, array $responseData, string $end } /** - * @param Response $response - * @param string $endpoint - * @param array $data + * @param Response|null $response + * @param string|null $endpoint + * @param array|null $data * @throws Exception */ #[DataProvider('providePostEndpointsUnsuccessfulTestCases')] - public function testUnsuccessfulPostModel(Response $response, string $endpoint, array $data): void + public function testUnsuccessfulPostModel(?Response $response, ?string $endpoint, ?array $data): void { + if ($response === null && $endpoint === null && $data === null) { + $this->markTestSkipped('No POST endpoints available for this API.'); + } + $this->prepareUnsuccessfulApiRequest($response); $this->makeClientCall($endpoint, [$data]); } /** - * @param array $modelData - * @param array $responseData + * @param array|null $modelData + * @param array|null $responseData + * @param string|null $endpoint * @throws Exception */ #[DataProvider('provideApiClientPutEndpointsTestCases')] - public function testPutModel(array $modelData, array $responseData, string $endpoint): void + public function testPutModel(?array $modelData, ?array $responseData, ?string $endpoint): void { + if ($modelData === null && $responseData === null && $endpoint === null) { + $this->markTestSkipped('No PUT endpoints available for this API.'); + } + $jsonSuccessfulBody = json_encode($responseData) ?: throw new JsonException('Failed to encode JSON data.'); $expectedResponse = new Response(200, [], $jsonSuccessfulBody); $this->appendRequestResponse($expectedResponse); @@ -144,14 +158,18 @@ public function testPutModel(array $modelData, array $responseData, string $endp } /** - * @param Response $response - * @param string $endpoint - * @param array $data + * @param Response|null $response + * @param string|null $endpoint + * @param array|null $data * @throws Exception */ #[DataProvider('providePutEndpointsUnsuccessfulTestCases')] - public function testUnsuccessfulPutModel(Response $response, string $endpoint, array $data): void + public function testUnsuccessfulPutModel(?Response $response, ?string $endpoint, ?array $data): void { + if ($response === null && $endpoint === null && $data === null) { + $this->markTestSkipped('No PUT endpoints available for this API.'); + } + $this->prepareUnsuccessfulApiRequest($response); $this->makeClientCall($endpoint, [self::TEST_ID, $data]); } From 5b16fd88c16fea5ec60bd000b4aa32907f8c4f53 Mon Sep 17 00:00:00 2001 From: bytestream Date: Mon, 1 Jun 2026 14:20:44 +0100 Subject: [PATCH 23/24] wip --- test/Integration/ApiClientTestCase.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/test/Integration/ApiClientTestCase.php b/test/Integration/ApiClientTestCase.php index c1686d14..fb915cd3 100644 --- a/test/Integration/ApiClientTestCase.php +++ b/test/Integration/ApiClientTestCase.php @@ -14,6 +14,7 @@ use SupportPal\ApiClient\Tests\ApiDataProviders; use SupportPal\ApiClient\Tests\ContainerAwareBaseTestCase; +use function assert; use function call_user_func_array; use function json_decode; use function json_encode; @@ -101,7 +102,7 @@ public function testUnsuccessfulGetEndpoint(Response $response, string $endpoint #[DataProvider('providePostEndpointsTestCases')] public function testPostModel(?array $modelData, ?array $responseData, ?string $endpoint): void { - if ($modelData === null && $responseData === null && $endpoint === null) { + if ($modelData === null || $responseData === null || $endpoint === null) { $this->markTestSkipped('No POST endpoints available for this API.'); } @@ -125,7 +126,7 @@ public function testPostModel(?array $modelData, ?array $responseData, ?string $ #[DataProvider('providePostEndpointsUnsuccessfulTestCases')] public function testUnsuccessfulPostModel(?Response $response, ?string $endpoint, ?array $data): void { - if ($response === null && $endpoint === null && $data === null) { + if ($response === null || $endpoint === null || $data === null) { $this->markTestSkipped('No POST endpoints available for this API.'); } @@ -142,7 +143,7 @@ public function testUnsuccessfulPostModel(?Response $response, ?string $endpoint #[DataProvider('provideApiClientPutEndpointsTestCases')] public function testPutModel(?array $modelData, ?array $responseData, ?string $endpoint): void { - if ($modelData === null && $responseData === null && $endpoint === null) { + if ($modelData === null || $responseData === null || $endpoint === null) { $this->markTestSkipped('No PUT endpoints available for this API.'); } @@ -166,7 +167,7 @@ public function testPutModel(?array $modelData, ?array $responseData, ?string $e #[DataProvider('providePutEndpointsUnsuccessfulTestCases')] public function testUnsuccessfulPutModel(?Response $response, ?string $endpoint, ?array $data): void { - if ($response === null && $endpoint === null && $data === null) { + if ($response === null || $endpoint === null || $data === null) { $this->markTestSkipped('No PUT endpoints available for this API.'); } @@ -177,7 +178,7 @@ public function testUnsuccessfulPutModel(?Response $response, ?string $endpoint, #[DataProvider('provideDownloadEndpointsTestCases')] public function testDownloadEndpoint(?int $modelId, ?string $endpoint): void { - if ($modelId === null && $endpoint === null) { + if ($modelId === null || $endpoint === null) { $this->markTestSkipped('No download endpoints available for this API.'); } From af30d9c5aa29dbb80d10329228d96e65cbfef862 Mon Sep 17 00:00:00 2001 From: bytestream Date: Mon, 1 Jun 2026 14:23:04 +0100 Subject: [PATCH 24/24] wip --- test/Integration/ApiClientTestCase.php | 1 - 1 file changed, 1 deletion(-) diff --git a/test/Integration/ApiClientTestCase.php b/test/Integration/ApiClientTestCase.php index fb915cd3..9d857c44 100644 --- a/test/Integration/ApiClientTestCase.php +++ b/test/Integration/ApiClientTestCase.php @@ -14,7 +14,6 @@ use SupportPal\ApiClient\Tests\ApiDataProviders; use SupportPal\ApiClient\Tests\ContainerAwareBaseTestCase; -use function assert; use function call_user_func_array; use function json_decode; use function json_encode;