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

@@ -15,12 +15,12 @@
 
 - Apply new CodingStandard from latest php-cs-fixer.
 - Fix PHP 8.5 deprecation by avoiding using `null` as an array offset.
+- Harden code against error cases
 
 ### Fixed
 
 - Buffer the response in temporary file to avoid issues when stream is used by another request's body
 
-
 ## 1.27.1
 
 ### Fixed

src/Credentials/ContainerProvider.php

@@ -118,6 +118,10 @@ private function isLoopBackAddress(string $host)
         // Convert the IP address to binary format
         $packedIp = inet_pton($host);
 
+        if (false === $packedIp) {
+            return false;
+        }
+
         // Check if the IP is in the 127.0.0.0/8 range
         if (4 === \strlen($packedIp)) {
             return 127 === \ord($packedIp[0]);

src/Credentials/IniFileLoader.php

@@ -62,6 +62,7 @@ public function loadProfiles(array $filepaths): array
 
             foreach ($this->parseIniFile($filepath) as $name => $profile) {
                 $name = preg_replace('/^profile /', '', (string) $name);
+                \assert(null !== $name);
                 if (!isset($profilesData[$name])) {
                     $profilesData[$name] = array_map('trim', $profile);
                 } else {
@@ -96,8 +97,16 @@ private function getHomeDir(): string
      */
     private function parseIniFile(string $filepath): array
     {
+        $content = file_get_contents($filepath);
+
+        if (false === $content) {
+            $this->logger->warning('The ini file {path} is not readable.', ['path' => $filepath]);
+
+            return [];
+        }
+
         if (false === $data = parse_ini_string(
-            preg_replace('/^#/m', ';', file_get_contents($filepath)),
+            preg_replace('/^#/m', ';', $content),
             true,
             \INI_SCANNER_RAW
         )) {

src/Credentials/SsoTokenProvider.php

@@ -124,7 +124,7 @@ private function dumpSsoToken(string $sessionName, array $tokenData): void
     {
         $filepath = \sprintf('%s/.aws/sso/cache/%s.json', $this->getHomeDir(), sha1($sessionName));
 
-        file_put_contents($filepath, json_encode(array_filter($tokenData)));
+        file_put_contents($filepath, json_encode(array_filter($tokenData), \JSON_THROW_ON_ERROR));
     }
 
     /**

src/Credentials/TokenFileLoader.php

@@ -23,8 +23,10 @@ public function getTokenFileContent(string $tokenFile): string
 
         $tokenDir = \dirname($tokenFile);
         $tokenLink = readlink($tokenFile);
-        clearstatcache(true, $tokenDir . \DIRECTORY_SEPARATOR . $tokenLink);
-        clearstatcache(true, $tokenDir . \DIRECTORY_SEPARATOR . \dirname($tokenLink));
+        if (false !== $tokenLink) {
+            clearstatcache(true, $tokenDir . \DIRECTORY_SEPARATOR . $tokenLink);
+            clearstatcache(true, $tokenDir . \DIRECTORY_SEPARATOR . \dirname($tokenLink));
+        }
         clearstatcache(true, $tokenFile);
 
         if (false === $token = file_get_contents($tokenFile)) {

src/Stream/CallableStream.php

@@ -45,7 +45,7 @@ public static function create($content, int $chunkSize = 64 * 1024): CallableStr
             return new self($content, $chunkSize);
         }
 
-        throw new InvalidArgument(\sprintf('Expect content to be a "callable". "%s" given.', \is_object($content) ? \get_class($content) : \gettype($content)));
+        throw new InvalidArgument(\sprintf('Expect content to be a "callable". "%s" given.', get_debug_type($content)));
     }
 
     public function length(): ?int
@@ -62,7 +62,7 @@ public function getIterator(): \Traversable
     {
         while (true) {
             if (!\is_string($data = ($this->content)($this->chunkSize))) {
-                throw new InvalidArgument(\sprintf('The return value of content callback must be a string, %s returned.', \is_object($data) ? \get_class($data) : \gettype($data)));
+                throw new InvalidArgument(\sprintf('The return value of content callback must be a string, %s returned.', get_debug_type($data)));
             }
             if ('' === $data) {
                 break;

src/Stream/FixedSizeStream.php

@@ -56,7 +56,7 @@ public function getIterator(): \Traversable
         $chunk = '';
         foreach ($this->content as $buffer) {
             if (!\is_string($buffer)) {
-                throw new InvalidArgument(\sprintf('The return value of content callback must be a string, %s returned.', \is_object($buffer) ? \get_class($buffer) : \gettype($buffer)));
+                throw new InvalidArgument(\sprintf('The return value of content callback must be a string, %s returned.', get_debug_type($buffer)));
             }
 
             $chunk .= $nextBytes = substr($buffer, 0, $this->chunkSize - \strlen($chunk));

src/Stream/IterableStream.php

@@ -36,7 +36,7 @@ public static function create($content): IterableStream
             return new self($content);
         }
 
-        throw new InvalidArgument(\sprintf('Expect content to be an iterable. "%s" given.', \is_object($content) ? \get_class($content) : \gettype($content)));
+        throw new InvalidArgument(\sprintf('Expect content to be an iterable. "%s" given.', get_debug_type($content)));
     }
 
     public function length(): ?int

src/Stream/ResourceStream.php

@@ -3,6 +3,7 @@
 namespace AsyncAws\Core\Stream;
 
 use AsyncAws\Core\Exception\InvalidArgument;
+use AsyncAws\Core\Exception\RuntimeException;
 
 /**
  * Convert a resource into a Stream.
@@ -48,7 +49,7 @@ public static function create($content, int $chunkSize = 64 * 1024): ResourceStr
             return new self($content, $chunkSize);
         }
 
-        throw new InvalidArgument(\sprintf('Expect content to be a "resource". "%s" given.', \is_object($content) ? \get_class($content) : \gettype($content)));
+        throw new InvalidArgument(\sprintf('Expect content to be a "resource". "%s" given.', get_debug_type($content)));
     }
 
     public function length(): ?int
@@ -62,7 +63,13 @@ public function stringify(): string
             throw new InvalidArgument('Unable to seek the content.');
         }
 
-        return stream_get_contents($this->content);
+        $data = stream_get_contents($this->content);
+
+        if (false === $data) {
+            throw new RuntimeException('Unable to read the content.');
+        }
+
+        return $data;
     }
 
     public function getIterator(): \Traversable
@@ -72,7 +79,13 @@ public function getIterator(): \Traversable
         }
 
         while (!feof($this->content)) {
-            yield fread($this->content, $this->chunkSize);
+            $data = fread($this->content, $this->chunkSize);
+
+            if (false === $data) {
+                throw new RuntimeException('Unable to read the content.');
+            }
+
+            yield $data;
         }
     }
 
@@ -88,6 +101,10 @@ public function hash(string $algo = 'sha256', bool $raw = false): string
     {
         $pos = ftell($this->content);
 
+        if (false === $pos) {
+            throw new InvalidArgument('Unable to read the content position.');
+        }
+
         if ($pos > 0 && -1 === fseek($this->content, 0)) {
             throw new InvalidArgument('Unable to seek the content.');
         }

src/Stream/ResponseBodyResourceStream.php

@@ -37,13 +37,23 @@ public function __toString(): string
     public function getChunks(): iterable
     {
         $pos = ftell($this->resource);
+        if (false === $pos) {
+            throw new RuntimeException('Unable to read the content position.');
+        }
+
         if (0 !== $pos && !rewind($this->resource)) {
             throw new RuntimeException('The stream is not rewindable');
         }
 
         try {
             while (!feof($this->resource)) {
-                yield fread($this->resource, 64 * 1024);
+                $data = fread($this->resource, 64 * 1024);
+
+                if (false === $data) {
+                    throw new RuntimeException('Unable to read the content.');
+                }
+
+                yield $data;
             }
         } finally {
             fseek($this->resource, $pos);
@@ -57,12 +67,22 @@ public function getContentAsString(): string
     {
         $pos = ftell($this->resource);
 
+        if (false === $pos) {
+            throw new RuntimeException('Failed to read the stream position.');
+        }
+
         try {
             if (!rewind($this->resource)) {
                 throw new RuntimeException('Failed to rewind the stream');
             }
 
-            return stream_get_contents($this->resource);
+            $data = stream_get_contents($this->resource);
+
+            if (false === $data) {
+                throw new RuntimeException('Unable to read the content.');
+            }
+
+            return $data;
         } finally {
             fseek($this->resource, $pos);
         }