Merge pull request #60 from list-interop/upgrade-phpunit

Upgrade PHPUnit to 10.2.x

Author: gsteel

composer.json

@@ -22,7 +22,7 @@
         "psr/http-client-implementation": "*",
         "psr/http-factory": "^1.0",
         "psr/http-message": "^1.1 || ^2.0",
-        "webmozart/assert": "^1.10"
+        "webmozart/assert": "^1.11"
     },
     "provide": {
         "symfony/polyfill-php73": "*"
@@ -33,7 +33,7 @@
         "ergebnis/composer-normalize": "^2.31",
         "laminas/laminas-diactoros": "^3.0.0",
         "php-http/curl-client": "^2.3",
-        "phpunit/phpunit": "^9.6.9",
+        "phpunit/phpunit": "^10.2.2",
         "psalm/plugin-phpunit": "^0.18.4",
         "react/child-process": "^0.6.5",
         "react/http": "^1.9",

composer.lock

@@ -2,9 +2,17 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
-         cacheResultFile=".cache/test-results"
+         cacheDirectory=".cache/phpunit"
          failOnWarning="true"
-         verbose="true">
+         failOnNotice="true"
+         failOnDeprecation="true"
+         displayDetailsOnSkippedTests="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerNotices="true"
+         displayDetailsOnTestsThatTriggerWarnings="true"
+         displayDetailsOnIncompleteTests="true"
+>
     <testsuites>
         <testsuite name="Unit">
             <directory>test/Unit</directory>
@@ -14,10 +22,9 @@
         </testsuite>
     </testsuites>
 
-    <coverage cacheDirectory=".cache/code-coverage"
-              processUncoveredFiles="true">
+    <source>
         <include>
             <directory suffix=".php">src</directory>
         </include>
-    </coverage>
+    </source>
 </phpunit>

phpunit.xml.dist

@@ -6,6 +6,9 @@
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
     errorBaseline="psalm-baseline.xml"
+    findUnusedCode="true"
+    findUnusedPsalmSuppress="true"
+    findUnusedBaselineEntry="true"
 >
     <projectFiles>
         <directory name="src" />

psalm.xml

@@ -10,18 +10,22 @@
 use RuntimeException;
 use Throwable;
 
-/** @internal */
 abstract class ResponseError extends RuntimeException implements ConvertKitError
 {
     protected RequestInterface|null $request = null;
     protected ResponseInterface|null $response = null;
 
+    /** @internal */
     final public function __construct(string $message, int $code, ?Throwable $previous = null) // phpcs:ignore
     {
         parent::__construct($message, $code, $previous);
     }
 
-    /** @return static */
+    /**
+     * @internal
+     *
+     * @return static
+     */
     final protected static function withHttpExchange(
         string $message,
         RequestInterface $request,

src/Exception/ResponseError.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Exception;
+
+use Laminas\Diactoros\Request;
+use Laminas\Diactoros\Response;
+use ListInterop\ConvertKit\Exception\ApiError;
+use PHPUnit\Framework\TestCase;
+
+class ResponseErrorTest extends TestCase
+{
+    public function testThatTheRequestAndResponseCanBeRetrieved(): void
+    {
+        $request = new Request();
+        $response = new Response();
+
+        $error = ApiError::fromExchange($request, $response);
+
+        self::assertSame($request, $error->request());
+        self::assertSame($response, $error->response());
+    }
+}

test/Exception/ResponseErrorTest.php

@@ -34,9 +34,4 @@ public function lastRequest(): RequestInterface|null
     {
         return $this->lastRequest;
     }
-
-    public function lastResponse(): ResponseInterface|null
-    {
-        return $this->lastResponse;
-    }
 }

test/Integration/HttpClient.php

@@ -8,6 +8,7 @@
 use Laminas\Diactoros\RequestFactory;
 use Laminas\Diactoros\StreamFactory;
 use Laminas\Diactoros\UriFactory;
+use ListInterop\ConvertKit\Client as ConvertKitClient;
 use ListInterop\ConvertKit\Container\ClientFactory;
 use ListInterop\ConvertKit\Exception\AssertionFailed;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -32,7 +33,7 @@ protected function setUp(): void
     }
 
     /** @return array<string, array{0: bool, 1: mixed, 2: string}> */
-    public function erroneousConfig(): array
+    public static function erroneousConfig(): array
     {
         return [
             'No Config' => [
@@ -108,7 +109,7 @@ public function testThatTheContainerMustHaveConfiguration(bool $has, mixed $get,
 
         $this->expectException(AssertionFailed::class);
         $this->expectExceptionMessage($expectedErrorMessage);
-        ($this->factory)($this->container);
+        $this->factory->__invoke($this->container);
     }
 
     public function testClientCreationWillProceedWhenTheContainerHasAllRequiredDependencies(): void
@@ -127,7 +128,8 @@ public function testClientCreationWillProceedWhenTheContainerHasAllRequiredDepen
                 [StreamFactoryInterface::class, new StreamFactory()],
             ]);
 
-        ($this->factory)($this->container);
+        $client = $this->factory->__invoke($this->container);
+        self::assertInstanceOf(ConvertKitClient::class, $client);
     }
 
     public function testClientCreationWillProceedWhenOnlyConfigIsAvailable(): void
@@ -145,7 +147,7 @@ public function testClientCreationWillProceedWhenOnlyConfigIsAvailable(): void
             ->method('get')
             ->willReturn(['convertkit' => ['api-key' => 'foo', 'secret-key' => 'bar']]);
 
-        ($this->factory)($this->container);
+        $this->factory->__invoke($this->container);
     }
 
     public function testAnAssertionErrorWillBeThrownWhenTheContainerSendsSomethingWeird(): void
@@ -162,6 +164,6 @@ public function testAnAssertionErrorWillBeThrownWhenTheContainerSendsSomethingWe
             ]);
 
         $this->expectException(AssertionFailed::class);
-        ($this->factory)($this->container);
+        $this->factory->__invoke($this->container);
     }
 }