Upgrade Psalm to 6.13 (#1973)

* Use `get_debug_type` for error reporting

* Harden code against error cases

* Upgrade Psalm to 6.13

Author: stof

CHANGELOG.md

@@ -18,6 +18,7 @@
 ### Changed
 
 - Apply new CodingStandard from latest php-cs-fixer.
+- Harden code against error cases
 
 ## 2.10.0
 

src/S3Client.php

@@ -3313,7 +3313,10 @@ protected function getEndpoint(string $uri, array $query, ?string $region): stri
             return parent::getEndpoint($uri, $query, $region);
         }
 
-        return preg_replace('|https?://|', '${0}' . $bucket . '.', parent::getEndpoint('/' . $uriWithOutBucket, $query, $region));
+        $endpoint = preg_replace('|https?://|', '${0}' . $bucket . '.', parent::getEndpoint('/' . $uriWithOutBucket, $query, $region));
+        \assert(null !== $endpoint); // We assume that the regex does not fail as we know it is valid.
+
+        return $endpoint;
     }
 
     protected function getEndpointMetadata(?string $region): array

src/Signer/SignerV4ForS3.php

@@ -55,6 +55,9 @@ public function __construct(string $scopeName, string $region, array $s3SignerOp
         $this->sendChunkedBody = $s3SignerOptions[Configuration::OPTION_SEND_CHUNKED_BODY] ?? false;
         unset($s3SignerOptions[Configuration::OPTION_SEND_CHUNKED_BODY]);
 
+        /**
+         * @psalm-suppress TypeDoesNotContainType -- this validates the input without trusting the type alone.
+         */
         if (!empty($s3SignerOptions)) {
             throw new InvalidArgument(\sprintf('Invalid option(s) "%s" passed to "%s::%s". ', implode('", "', array_keys($s3SignerOptions)), __CLASS__, __METHOD__));
         }