Merge pull request #40 from veewee/bump-psl

Bump PSL
phpro · Sep 6, 2024 · ee9ca4b · ee9ca4b
2 parents e848144 + 743afbd
commit ee9ca4b
Show file tree

Hide file tree

Showing 31 changed files with 46,082 additions and 35,271 deletions.
diff --git a/.github/workflows/grumphp.yaml b/.github/workflows/grumphp.yaml
@@ -7,7 +7,7 @@ jobs:
         strategy:
             matrix:
                 operating-system: [ubuntu-latest]
-                php-versions: ['8.1', '8.2', '8.3']
+                php-versions: ['8.2', '8.3']
                 composer-options: ['', '--prefer-lowest']
             fail-fast: false
         name: PHP ${{ matrix.php-versions }} @ ${{ matrix.operating-system }} with ${{ matrix.composer-options }}

diff --git a/composer.json b/composer.json
@@ -15,9 +15,9 @@
         }
     ],
     "require": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+        "php": "~8.2.0 || ~8.3.0",
         "ext-json": "*",
-        "azjezz/psl": "^2.5",
+        "azjezz/psl": "^3.0",
         "cardinalby/content-disposition": "^1.1",
         "league/uri": "^7.3",
         "php-http/client-common": "^2.7",

diff --git a/phive.xml b/phive.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="psalm" version="^5.15.0" installed="5.16.0" location="./tools/psalm.phar" copy="true"/>
-  <phar name="phpunit" version="^9.6.13" installed="9.6.13" location="./tools/phpunit.phar" copy="true"/>
-  <phar name="php-cs-fixer" version="^3.30.0" installed="3.39.0" location="./tools/php-cs-fixer.phar" copy="true"/>
+  <phar name="psalm" version="^5.15.0" installed="5.25.0" location="./tools/psalm.phar" copy="true"/>
+  <phar name="phpunit" version="^9.6.13" installed="9.6.20" location="./tools/phpunit.phar" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.30.0" installed="3.64.0" location="./tools/php-cs-fixer.phar" copy="true"/>
 </phive>
diff --git a/src/Encoding/Binary/BinaryFile.php b/src/Encoding/Binary/BinaryFile.php
@@ -14,7 +14,7 @@ public function __construct(
         private readonly ?string $mimeType,
         private readonly ?string $fileName,
         private readonly ?string $extension,
-        private readonly ?string $hash
+        private readonly ?string $hash,
     ) {
     }
 

diff --git a/src/Encoding/Binary/BinaryFileDecoder.php b/src/Encoding/Binary/BinaryFileDecoder.php
@@ -50,7 +50,7 @@ public function __construct(
         callable $mimeTypeExtractor,
         callable $fileNameExtractor,
         callable $extensionExtractor,
-        callable $hashExtractor
+        callable $hashExtractor,
     ) {
         $this->sizeExtractor = $sizeExtractor;
         $this->mimeTypeExtractor = $mimeTypeExtractor;
@@ -66,7 +66,7 @@ public static function createWithAutodiscoveredPsrFactories(): self
             new Extractor\MimeTypeExtractor(),
             new Extractor\FilenameExtractor(),
             new Extractor\ExtensionExtractor(),
-            new Extractor\HashExtractor(Algorithm::MD5),
+            new Extractor\HashExtractor(Algorithm::Md5),
         );
     }
 

diff --git a/src/Encoding/Binary/Extractor/ExtensionExtractor.php b/src/Encoding/Binary/Extractor/ExtensionExtractor.php
@@ -15,15 +15,17 @@ final class ExtensionExtractor
 {
     public function __invoke(ResponseInterface $response): ?string
     {
-        if ($mimeType = (new MimeTypeExtractor())($response)) {
+        $mimeType = (new MimeTypeExtractor())($response);
+        if (null !== $mimeType) {
             SymfonyMimeDependency::guard();
             $extensions = MimeTypes::getDefault()->getExtensions($mimeType);
             if ($extensions) {
                 return first($extensions);
             }
         }
 
-        if ($originalName = (new FilenameExtractor())($response)) {
+        $originalName = (new FilenameExtractor())($response);
+        if (null !== $originalName) {
             return pathinfo($originalName, PATHINFO_EXTENSION) ?: null;
         }
 

diff --git a/src/Encoding/Binary/Extractor/FilenameExtractor.php b/src/Encoding/Binary/Extractor/FilenameExtractor.php
@@ -15,7 +15,8 @@ final class FilenameExtractor
 {
     public function __invoke(ResponseInterface $response): ?string
     {
-        if (!$disposition = first($response->getHeader('Content-Disposition'))) {
+        $disposition = first($response->getHeader('Content-Disposition'));
+        if (null === $disposition) {
             return null;
         }
 

diff --git a/src/Encoding/Binary/Extractor/HashExtractor.php b/src/Encoding/Binary/Extractor/HashExtractor.php
@@ -11,7 +11,7 @@
 final class HashExtractor
 {
     public function __construct(
-        private readonly Algorithm $algorithm
+        private readonly Algorithm $algorithm,
     ) {
     }
 

diff --git a/src/Encoding/Binary/Extractor/MimeTypeExtractor.php b/src/Encoding/Binary/Extractor/MimeTypeExtractor.php
@@ -15,11 +15,13 @@ final class MimeTypeExtractor
 {
     public function __invoke(ResponseInterface $response): ?string
     {
-        if ($contentType = first($response->getHeader('Content-Type'))) {
+        $contentType = first($response->getHeader('Content-Type'));
+        if (null !== $contentType && '' !== $contentType) {
             return $contentType;
         }
 
-        if ($originalName = (new FilenameExtractor())($response)) {
+        $originalName = (new FilenameExtractor())($response);
+        if (null !== $originalName) {
             if ($extension = pathinfo($originalName, PATHINFO_EXTENSION)) {
                 SymfonyMimeDependency::guard();
                 $mimeTypes = MimeTypes::getDefault()->getMimeTypes($extension);

diff --git a/src/Encoding/Binary/Extractor/SizeExtractor.php b/src/Encoding/Binary/Extractor/SizeExtractor.php
@@ -19,7 +19,8 @@ public function __invoke(ResponseInterface $response): ?int
             return $size;
         }
 
-        if ($length = first($response->getHeader('Content-Length'))) {
+        $length = first($response->getHeader('Content-Length'));
+        if (null !== $length) {
             return try_catch(
                 static fn () => int()->coerce($length),
                 static fn () => null

diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -8,7 +8,7 @@
 
 abstract class RuntimeException extends \RuntimeException
 {
-    protected function __construct(string $message = '', int $code = 0, Throwable $previous = null)
+    protected function __construct(string $message = '', int $code = 0, ?Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
     }

diff --git a/src/Formatter/RemoveSensitiveQueryStringsFormatter.php b/src/Formatter/RemoveSensitiveQueryStringsFormatter.php
@@ -22,7 +22,7 @@ final class RemoveSensitiveQueryStringsFormatter implements HttpFormatter
      */
     public function __construct(
         HttpFormatter $formatter,
-        array $sensitiveKeys
+        array $sensitiveKeys,
     ) {
         $this->formatter = $formatter;
         $this->sensitiveKeys = $sensitiveKeys;

diff --git a/src/Test/UseHttpToolsFactories.php b/src/Test/UseHttpToolsFactories.php
@@ -21,7 +21,7 @@ private function createToolsRequest(
         string $method,
         string $uri,
         array $uriParams = [],
-        $body = null
+        $body = null,
     ): RequestInterface {
         return new Request($method, $uri, $uriParams, $body);
     }

diff --git a/src/Test/UseMockClient.php b/src/Test/UseMockClient.php
@@ -14,7 +14,7 @@ trait UseMockClient
     /**
      * @param callable(Client $client): Client|null $configurator
      */
-    private function mockClient(callable $configurator = null): Client
+    private function mockClient(?callable $configurator = null): Client
     {
         MockClientDependency::guard();
         $configurator ??= fn (Client $client) => $client;

diff --git a/src/Test/UseVcrClient.php b/src/Test/UseVcrClient.php
@@ -19,7 +19,7 @@ trait UseVcrClient
     /**
      * @return array{RecordPlugin, ReplayPlugin}
      */
-    private function useRecording(string $path, NamingStrategyInterface $namingStrategy = null): array
+    private function useRecording(string $path, ?NamingStrategyInterface $namingStrategy = null): array
     {
         VcrPluginDependency::guard();
 

diff --git a/src/Transport/CallbackTransport.php b/src/Transport/CallbackTransport.php
@@ -39,7 +39,7 @@ final class CallbackTransport implements TransportInterface
     public function __construct(
         callable $requestConverter,
         callable $sender,
-        callable $responseConverter
+        callable $responseConverter,
     ) {
         $this->requestConverter = $requestConverter;
         $this->sender = $sender;

diff --git a/src/Transport/EncodedTransportFactory.php b/src/Transport/EncodedTransportFactory.php
@@ -27,7 +27,7 @@ public static function create(
         ClientInterface $client,
         UriBuilderInterface $uriBuilder,
         EncoderInterface $encoder,
-        DecoderInterface $decoder
+        DecoderInterface $decoder,
     ): TransportInterface {
         /** @var CallbackTransport<RequestType, ResponseType> $transport */
         $transport = new CallbackTransport(

diff --git a/src/Transport/IO/Input/EncodingRequestConverter.php b/src/Transport/IO/Input/EncodingRequestConverter.php
@@ -31,7 +31,7 @@ final class EncodingRequestConverter implements RequestConverterInterface
     public function __construct(
         RequestFactoryInterface $requestFactory,
         UriBuilderInterface $uriBuilder,
-        EncoderInterface $encoder
+        EncoderInterface $encoder,
     ) {
         $this->requestFactory = $requestFactory;
         $this->encoder = $encoder;
@@ -40,7 +40,7 @@ public function __construct(
 
     public static function createWithAutodiscoveredPsrFactories(
         UriBuilderInterface $uriBuilder,
-        EncoderInterface $encoder
+        EncoderInterface $encoder,
     ): self {
         return new self(
             Psr17FactoryDiscovery::findRequestFactory(),

diff --git a/src/Transport/Presets/BinaryDownloadPreset.php b/src/Transport/Presets/BinaryDownloadPreset.php
@@ -23,7 +23,7 @@ final class BinaryDownloadPreset
      */
     public static function create(
         ClientInterface $client,
-        UriBuilderInterface $uriBuilder
+        UriBuilderInterface $uriBuilder,
     ): TransportInterface {
         return self::withEmptyRequest($client, $uriBuilder);
     }
@@ -33,7 +33,7 @@ public static function create(
      */
     public static function withEmptyRequest(
         ClientInterface $client,
-        UriBuilderInterface $uriBuilder
+        UriBuilderInterface $uriBuilder,
     ): TransportInterface {
         return EncodedTransportFactory::create(
             $client,
@@ -48,7 +48,7 @@ public static function withEmptyRequest(
      */
     public static function withMultiPartRequest(
         ClientInterface $client,
-        UriBuilderInterface $uriBuilder
+        UriBuilderInterface $uriBuilder,
     ): TransportInterface {
         return EncodedTransportFactory::create(
             $client,

diff --git a/src/Transport/Presets/JsonPreset.php b/src/Transport/Presets/JsonPreset.php
@@ -18,7 +18,7 @@ final class JsonPreset
      */
     public static function create(
         ClientInterface $client,
-        UriBuilderInterface $uriBuilder
+        UriBuilderInterface $uriBuilder,
     ): TransportInterface {
         return EncodedTransportFactory::create(
             $client,

diff --git a/src/Transport/Presets/PsrPreset.php b/src/Transport/Presets/PsrPreset.php
@@ -19,7 +19,7 @@ final class PsrPreset
      */
     public static function create(
         ClientInterface $client,
-        UriBuilderInterface $uriBuilder
+        UriBuilderInterface $uriBuilder,
     ): TransportInterface {
         return EncodedTransportFactory::create(
             $client,

diff --git a/src/Transport/Presets/RawPreset.php b/src/Transport/Presets/RawPreset.php
@@ -18,7 +18,7 @@ final class RawPreset
      */
     public static function create(
         ClientInterface $client,
-        UriBuilderInterface $uriBuilder
+        UriBuilderInterface $uriBuilder,
     ): TransportInterface {
         return EncodedTransportFactory::create(
             $client,

diff --git a/src/Transport/Serializer/SerializerTransport.php b/src/Transport/Serializer/SerializerTransport.php
@@ -33,7 +33,7 @@ final class SerializerTransport implements TransportInterface
      */
     public function __construct(
         SerializerInterface $serializer,
-        TransportInterface $transport
+        TransportInterface $transport,
     ) {
         $this->transport = $transport;
         $this->serializer = $serializer;

diff --git a/tests/Unit/Encoding/Binary/BinaryFileDecoderTest.php b/tests/Unit/Encoding/Binary/BinaryFileDecoderTest.php
@@ -22,7 +22,7 @@ final class BinaryFileDecoderTest extends TestCase
     public function it_can_decode_binary_files(
         BinaryFileDecoder $decoder,
         ResponseInterface $response,
-        BinaryFile $expected
+        BinaryFile $expected,
     ): void {
         $actual = $decoder($response);
 

diff --git a/tests/Unit/Encoding/Binary/Extractor/HashExtractorTest.php b/tests/Unit/Encoding/Binary/Extractor/HashExtractorTest.php
@@ -24,7 +24,7 @@ final class HashExtractorTest extends TestCase
      */
     public function it_can_extract_hash(ResponseInterface $response, string $expected, int $endPosition = 0): void
     {
-        $extractor = new HashExtractor(Algorithm::MD5);
+        $extractor = new HashExtractor(Algorithm::Md5);
         $actual = $extractor($response);
 
         self::assertSame($actual, $expected);
@@ -35,23 +35,23 @@ public function provideCases()
     {
         yield 'from-empty-stream-size' => [
             $this->createResponse(),
-            hash('', Algorithm::MD5),
+            hash('', Algorithm::Md5),
         ];
 
         yield 'from-stream-size' => [
             $this->createResponse()
                 ->withBody(
                     $this->createStream('12345')
                 ),
-            hash('12345', Algorithm::MD5),
+            hash('12345', Algorithm::Md5),
         ];
 
         $stream = $this->createStream('12345');
         $stream->seek(3);
         yield 'from-partially-read-stream' => [
             $this->createResponse()
                 ->withBody($stream),
-            hash('12345', Algorithm::MD5),
+            hash('12345', Algorithm::Md5),
             3,
         ];
     }

diff --git a/tests/Unit/Formatter/RemoveSensitiveHeaderKeysFormatterTest.php b/tests/Unit/Formatter/RemoveSensitiveHeaderKeysFormatterTest.php
@@ -70,7 +70,7 @@ public function it_can_remove_sensitive_keys_from_response(array $headers, array
      */
     public function it_can_remove_sensitive_keys_from_response_with_request_context(
         array $headers,
-        array $expected
+        array $expected,
     ): void {
         $request = $this->createRequest('GET', 'something');
 
@@ -96,7 +96,7 @@ public function it_can_remove_sensitive_keys_from_response_with_request_context(
      */
     public function it_can_remove_sensitive_keys_from_response_with_request_context_even_if_base_method_does_not_exist(
         array $headers,
-        array $expected
+        array $expected,
     ): void {
         $request = $this->createRequest('GET', 'something');
 

diff --git a/tests/Unit/Formatter/RemoveSensitiveJsonKeysFormatterTest.php b/tests/Unit/Formatter/RemoveSensitiveJsonKeysFormatterTest.php
@@ -67,7 +67,7 @@ public function it_can_remove_sensitive_json_keys_from_response(array $content,
      */
     public function it_can_remove_sensitive_json_keys_from_response_with_request_context(
         array $content,
-        array $expected
+        array $expected,
     ): void {
         $request = $this->createRequest('GET', 'something')
             ->withBody(
@@ -91,7 +91,7 @@ public function it_can_remove_sensitive_json_keys_from_response_with_request_con
      */
     public function it_can_remove_sensitive_json_keys_from_response_with_request_context_if_base_method_does_not_exist(
         array $content,
-        array $expected
+        array $expected,
     ): void {
         $request = $this->createRequest('GET', 'something')
             ->withBody(

diff --git a/tests/Unit/Formatter/RemoveSensitiveQueryStringsFormatterTest.php b/tests/Unit/Formatter/RemoveSensitiveQueryStringsFormatterTest.php
@@ -31,7 +31,7 @@ protected function setUp(): void
      */
     public function it_can_remove_sensitive_query_strings_from_request(
         string $actual,
-        string $expected
+        string $expected,
     ): void {
         $request = $this->createRequest('GET', $actual);
         $formatted = $this->formatter->formatRequest($request);

diff --git a/tools/php-cs-fixer.phar b/tools/php-cs-fixer.phar