chore: Clean up

Author: marcreichel

src/Client/Options/ClientOptions.php

@@ -26,7 +26,7 @@ class ClientOptions
     private bool $addReferer;
 
     /** @var resource|null */
-    private mixed $sink;
+    private mixed $sink = null;
 
     private bool $httpErrors;
 

src/Http/Uri.php

@@ -262,7 +262,7 @@ private function filterUserInfoComponent(string $component): string
 
     private function rawurlencodeMatchZero(array $match): string
     {
-        return rawurlencode($match[0]);
+        return rawurlencode((string) $match[0]);
     }
 
     /**

tests/Integration/RequestTest.php

@@ -10,24 +10,20 @@
 use GuzzleHttp\Psr7\MessageTrait;
 use GuzzleHttp\Psr7\Uri as GuzzleUri;
 use GuzzleHttp\Psr7\Utils;
-use InvalidArgumentException;
-use PHPUnit\Framework\AssertionFailedError;
+use PHPUnit\Framework\Attributes\CoversClass;
 use Psr\Http\Message\RequestInterface;
-use Psr\Http\Message\UriInterface;
+use Psr\Http\Message\StreamInterface;
 use RuntimeException;
-use Throwable;
-use TypeError;
 
 /**
- * @covers \Artemeon\HttpClient\Http\Request
- *
  * @internal
  */
+#[CoversClass(Request::class)]
 class RequestTest extends TestCase
 {
     use MessageTrait;
 
-    protected function buildUri($uri)
+    protected function buildUri($uri): GuzzleUri
     {
         if (class_exists(GuzzleUri::class)) {
             return new GuzzleUri($uri);
@@ -39,15 +35,12 @@ protected function buildUri($uri)
     /**
      * Overwrite, parent code doesn't work witz Guzzle > 7.2, remove when paren code is fixed.
      */
-    protected function buildStream($data)
+    protected function buildStream($data): StreamInterface
     {
         return Utils::streamFor($data);
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    public function createSubject()
+    public function createSubject(): Request
     {
         $this->skippedTests['testMethodIsExtendable'] = '';
 
@@ -124,58 +117,18 @@ public function testMethodIsExtendable(): void
         $this->assertEquals('CUSTOM', $request->getMethod());
     }
 
-    /**
-     * @dataProvider getInvalidMethods
-     */
-    public function testMethodWithInvalidArguments($method): void
-    {
-        if (isset($this->skippedTests[__FUNCTION__])) {
-            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
-        }
-
-        try {
-            $this->request->withMethod($method);
-            $this->fail('withMethod() should have raised exception on invalid argument');
-        } catch (AssertionFailedError $e) {
-            // invalid argument not caught
-            throw $e;
-        } catch (InvalidArgumentException | TypeError $e) {
-            // valid
-            $this->assertInstanceOf(Throwable::class, $e);
-        } catch (Throwable $e) {
-            // invalid
-            $this->fail(sprintf(
-                'Unexpected exception (%s) thrown from withMethod(); expected TypeError or InvalidArgumentException',
-                gettype($e),
-            ));
-        }
-    }
-
-    public static function getInvalidMethods()
-    {
-        return [
-            'null' => [null],
-            'false' => [false],
-            'array' => [['foo']],
-            'object' => [new \stdClass()],
-        ];
-    }
-
     public function testUri(): void
     {
         if (isset($this->skippedTests[__FUNCTION__])) {
             $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
         }
         $original = clone $this->request;
 
-        $this->assertInstanceOf(UriInterface::class, $this->request->getUri());
-
         $uri = $this->buildUri('http://www.foo.com/bar');
         $request = $this->request->withUri($uri);
         $this->assertNotSame($this->request, $request);
         $this->assertEquals($this->request, $original, 'Request object MUST not be mutated');
         $this->assertEquals('www.foo.com', $request->getHeaderLine('host'));
-        $this->assertInstanceOf(UriInterface::class, $request->getUri());
         $this->assertEquals('http://www.foo.com/bar', (string) $request->getUri());
 
         $request = $request->withUri($this->buildUri('/foobar'));

tests/Integration/ResponseTest.php

@@ -7,16 +7,11 @@
 use Artemeon\HttpClient\Http\Response;
 use Artemeon\HttpClient\Tests\TestCase;
 use GuzzleHttp\Psr7\Utils;
-use InvalidArgumentException;
-use PHPUnit\Framework\AssertionFailedError;
-use Throwable;
-use TypeError;
 
 /**
- * @covers \Artemeon\HttpClient\Http\Response
- *
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(Response::class)]
 class ResponseTest extends TestCase
 {
     private Response $response;
@@ -32,7 +27,7 @@ protected function buildStream($data)
     /**
      * {@inheritDoc}
      */
-    public function createSubject()
+    public function createSubject(): Response
     {
         return new Response(200, '1.1');
     }
@@ -60,44 +55,6 @@ public function testStatusCode(): void
         $this->assertSame(204, $response->getStatusCode());
     }
 
-    /**
-     * @dataProvider getInvalidStatusCodeArguments
-     */
-    public function testStatusCodeInvalidArgument($statusCode): void
-    {
-        if (isset($this->skippedTests[__FUNCTION__])) {
-            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
-        }
-
-        try {
-            $this->response->withStatus($statusCode);
-            $this->fail('withStatus() should have raised exception on invalid argument');
-        } catch (AssertionFailedError $e) {
-            // invalid argument not caught
-            throw $e;
-        } catch (InvalidArgumentException | TypeError $e) {
-            // valid
-            $this->assertInstanceOf(Throwable::class, $e);
-        } catch (Throwable $e) {
-            // invalid
-            $this->fail(sprintf(
-                'Unexpected exception (%s) thrown from withStatus(); expected TypeError or InvalidArgumentException',
-                gettype($e),
-            ));
-        }
-    }
-
-    public static function getInvalidStatusCodeArguments()
-    {
-        return [
-            'true' => [true],
-            'string' => ['foobar'],
-            'too-low' => [99],
-            'too-high' => [600],
-            'object' => [new \stdClass()],
-        ];
-    }
-
     public function testReasonPhrase(): void
     {
         if (isset($this->skippedTests[__FUNCTION__])) {

tests/Integration/UriTest.php

@@ -9,16 +9,15 @@
 use Psr\Http\Message\UriInterface;
 
 /**
- * @covers \Artemeon\HttpClient\Http\Uri
- *
  * @internal
  */
+#[\PHPUnit\Framework\Attributes\CoversClass(Uri::class)]
 class UriTest extends TestCase
 {
     /**
      * {@inheritDoc}
      */
-    public function createUri($uri)
+    public function createUri(string $uri)
     {
         return Uri::fromString($uri);
     }
@@ -55,10 +54,9 @@ public function testGetPathNormalizesMultipleLeadingSlashesToSingleSlashToPreven
      * leading slashes in the path is presented verbatim (in contrast to what is
      * provided when calling getPath()).
      *
-     * @depends testGetPathNormalizesMultipleLeadingSlashesToSingleSlashToPreventXSS
-     *
      * @psalm-param array{expected: non-empty-string, uri: UriInterface} $test
      */
+    #[\PHPUnit\Framework\Attributes\Depends('testGetPathNormalizesMultipleLeadingSlashesToSingleSlashToPreventXSS')]
     public function testStringRepresentationWithMultipleSlashes(array $test): void
     {
         $this->assertSame($test['expected'], (string) $test['uri']);

tests/Unit/Client/ArtemeonHttpClientTest.php

@@ -41,6 +41,7 @@
 use Mockery;
 use Mockery\MockInterface;
 use Override;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -114,9 +115,7 @@ public function testSendConvertsGuzzleResponseToValidResponse(): void
         self::assertSame($expectedHeaders, $response->getHeaders());
     }
 
-    /**
-     * @dataProvider provideExceptionMappings
-     */
+    #[DataProvider('provideExceptionMappings')]
     public function testSendGuzzleThrowsExceptionMappedToHttpClientException(
         \RuntimeException $guzzleException,
         string $httpClientException,

tests/Unit/Stream/StreamTest.php

@@ -19,6 +19,7 @@
 use org\bovigo\vfs\vfsStream;
 use org\bovigo\vfs\vfsStreamDirectory;
 use Override;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -195,9 +196,7 @@ public function testCloseIsDetachedShouldNotCallClose(): void
         $fcloseMock = Mockery::mock('overload:fclose');
         $fcloseMock->shouldReceive('__invoke')
             ->with(Mockery::type('resource'))
-            ->andReturnUsing(function ($resource) {
-                return fclose($resource);
-            });
+            ->andReturnUsing(static fn ($resource) => fclose($resource));
 
         $this->stream = Stream::fromString('content');
         $this->stream->detach();
@@ -390,9 +389,7 @@ public function testIsWritableIsDetachedReturnsFalse(): void
         self::assertFalse($this->stream->isWritable());
     }
 
-    /**
-     * @dataProvider provideIsModeWriteable
-     */
+    #[DataProvider('provideIsModeWriteable')]
     public function testIsWritableReturnsExpectedValue(string $mode, bool $isWritable, string $file): void
     {
         $file = $this->filesystem->url() . '/' . $file;
@@ -409,10 +406,7 @@ public function testIsReadableIsDetachedReturnsFalse(): void
         self::assertFalse($this->stream->isReadable());
     }
 
-    /**
-     * @dataProvider provideIsReadable
-     */
-
+    #[DataProvider('provideIsReadable')]
     public function testIsReadableReturnsExpectedValue(string $mode, bool $isReadable, string $file): void
     {
         $file = $this->filesystem->url() . '/' . $file;