Fix issues found after updating psalm

imbo · Jan 23, 2023 · d59769e · d59769e
1 parent 7ccd5a0
commit d59769e
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 5 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -177,7 +177,7 @@ public function addImageFromUrl(string $url): AddedImage
         try {
             $blob = $this->httpClient->get($url)->getBody()->getContents();
         } catch (BadResponseException $e) {
-            throw new RuntimeException('Unable to fetch file at URL: ' . $url, (int) $e->getCode(), $e);
+            throw new RuntimeException('Unable to fetch file at URL: ' . $url, $e->getCode(), $e);
         }
 
         return $this->addImageFromString($blob);
@@ -381,7 +381,7 @@ public function getImageDataFromUrl(ImageUrl $url): string
         try {
             $blob = $this->httpClient->get($url)->getBody()->getContents();
         } catch (BadResponseException $e) {
-            throw new RuntimeException('Unable to fetch file at URL: ' . $url, (int) $e->getCode(), $e);
+            throw new RuntimeException('Unable to fetch file at URL: ' . $url, $e->getCode(), $e);
         }
 
         return $blob;

diff --git a/src/Response/AccessControlRules.php b/src/Response/AccessControlRules.php
@@ -6,6 +6,9 @@
 use Iterator;
 use Psr\Http\Message\ResponseInterface;
 
+/**
+ * @template-implements Iterator<int, AccessControlRule>
+ */
 class AccessControlRules extends ApiResponse implements Iterator, Countable
 {
     private int $iteratorIndex = 0;

diff --git a/src/Response/ApiResponse.php b/src/Response/ApiResponse.php
@@ -5,6 +5,9 @@
 use ImboClient\Exception\RuntimeException;
 use Psr\Http\Message\ResponseInterface;
 
+/**
+ * @template-implements ArrayAccess<string, mixed>
+ */
 abstract class ApiResponse implements ArrayAccess
 {
     private ?ResponseInterface $response = null;
@@ -41,7 +44,7 @@ public function offsetExists($offset): bool
      * @param string $offset
      * @return mixed
      */
-    public function offsetGet($offset)
+    public function offsetGet($offset): mixed
     {
         $offsets = $this->getArrayOffsets();
         return array_key_exists($offset, $offsets) ? $offsets[$offset]() : null;

diff --git a/src/Response/Images.php b/src/Response/Images.php
@@ -10,6 +10,9 @@
 use Iterator;
 use Psr\Http\Message\ResponseInterface;
 
+/**
+ * @template-implements Iterator<int, Image>
+ */
 class Images extends ApiResponse implements Iterator, Countable
 {
     private int $iteratorIndex = 0;

diff --git a/src/Response/ResourceGroups.php b/src/Response/ResourceGroups.php
@@ -8,6 +8,9 @@
 use Iterator;
 use Psr\Http\Message\ResponseInterface;
 
+/**
+ * @template-implements Iterator<int, ResourceGroup>
+ */
 class ResourceGroups extends ApiResponse implements Iterator, Countable
 {
     private int $iteratorIndex = 0;

diff --git a/src/Url/ImageUrl.php b/src/Url/ImageUrl.php
@@ -134,6 +134,7 @@ public function convert(string $extension): self
         $extensions = implode('|', $this->validExtensions);
         $pathWithNoExtension = preg_replace('#(\.(' . $extensions . '))$#', '', $this->getPath());
 
+        /** @var static */
         return $this->withPath(
             $pathWithNoExtension . '.' . $extension,
         );
@@ -477,6 +478,7 @@ public function withTransformation(string $transformation): self
         }
 
         $query['t'][] = $transformation;
+        /** @var static */
         return $this->withQuery(http_build_query($query));
     }
 
@@ -487,6 +489,7 @@ public function reset(): self
             '',
             $this->getPath(),
         );
+        /** @var static */
         return $this
             ->withPath($pathWithNoExtension)
             ->withQuery('');

diff --git a/tests/Response/AccessControlRulesTest.php b/tests/Response/AccessControlRulesTest.php
@@ -81,7 +81,7 @@ public function testArrayAccess(): void
         $this->assertArrayHasKey('rules', $accessControlRules);
         $this->assertArrayNotHasKey('foobar', $accessControlRules);
 
-        /** @var array<AccessControlRule> */
+        /** @var array<int, AccessControlRule> */
         $acrs = $accessControlRules['rules'];
 
         $this->assertSame(2, count($acrs));

diff --git a/tests/Response/ResourceGroupsTest.php b/tests/Response/ResourceGroupsTest.php
@@ -104,7 +104,7 @@ public function testArrayAccess(): void
         $this->assertArrayHasKey('groups', $groups);
         $this->assertArrayNotHasKey('foobar', $groups);
 
-        /** @var array<ResourceGroup> */
+        /** @var array<int, ResourceGroup> */
         $rg = $groups['groups'];
 
         $this->assertSame(3, count($rg));