Cleaned up code after Mago code analysis

Author: rimi-itk

Taskfile.yml

@@ -29,12 +29,14 @@ tasks:
     - task: coding-standards:composer:apply
     - task: coding-standards:markdown:apply
     - task: coding-standards:php:apply
+    - task: coding-standards:php:mago:apply
     - task: coding-standards:yaml:apply
 
   coding-standards:check:
     - task: coding-standards:composer:check
     - task: coding-standards:markdown:check
     - task: coding-standards:php:check
+    - task: coding-standards:php:mago:check
     - task: coding-standards:yaml:check
 
   coding-standards:composer:apply:
@@ -73,6 +75,17 @@ tasks:
       vars:
         TASK_ARGS: run --rm phpfpm vendor/bin/php-cs-fixer fix --dry-run --diff
 
+  coding-standards:php:mago:apply:
+    - task: compose
+      vars:
+        TASK_ARGS: run --rm mago format
+
+  coding-standards:php:mago:check:
+    - task: coding-standards:php:mago:apply
+    - task: compose
+      vars:
+        TASK_ARGS: run --rm mago lint
+
   coding-standards:yaml:apply:
     - task: compose
       vars:

src/Client/ApiClient.php

@@ -28,14 +28,14 @@
  * @phpstan-type AccessToken array{access_token: string, token_type: string, expires_in: int, refresh_token: string}
  * @phpstan-type ServiceIndex array<string, array{href: string, title: string}>
  * @phpstan-type OptionsInput array{
- *   api_uri: non-empty-string,
- *   api_username: non-empty-string,
- *   api_secret: non-empty-string,
- *   f2_username: non-empty-string,
+ *   api_uri: string,
+ *   api_username: string,
+ *   api_secret: string,
+ *   f2_username: string,
  *   cache_item_pool: CacheItemPoolInterface,
  *   cache_item_lifetime?: int,
  * }
- * @phpstan-type Options array{
+ * @phpstan-type OptionsResolved array{
  *    api_uri: non-empty-string,
  *    api_username: non-empty-string,
  *    api_secret: non-empty-string,
@@ -48,7 +48,7 @@ class ApiClient
     use LoggerAwareTrait;
     use LoggerTrait;
 
-    /** @var Options */
+    /** @var OptionsResolved */
     private readonly array $options;
 
     private ?HttpClientInterface $client = null;
@@ -61,7 +61,9 @@ public function __construct(array $options)
         $resolver = new OptionsResolver();
         $this->configureOptions($resolver);
 
-        $this->options = $resolver->resolve($options);
+        /** @var OptionsResolved $options */
+        $options = $resolver->resolve($options);
+        $this->options = $options;
     }
 
     /**
@@ -78,6 +80,7 @@ public function getServiceIndex(): array
         $cache = $this->getCache();
         $cacheKey = sha1(__METHOD__);
 
+        // @mago-ignore analysis:less-specific-return-statement
         return $cache->get($cacheKey, function (CacheItemInterface $item): array {
             $item->expiresAfter((int) $this->options['cache_item_lifetime']);
 
@@ -455,7 +458,6 @@ function (array $matches) use ($url, $values): string {
 
     protected function getCache(): CacheInterface
     {
-        /** @var CacheItemPoolInterface $pool */
         $pool = $this->options['cache_item_pool'];
 
         return new ProxyAdapter(pool: $pool);
@@ -491,7 +493,7 @@ protected function createItemResult(ResponseInterface $response, string $class):
     {
         $item = new \SimpleXMLElement($response->getContent());
 
-        /* @var T */
+        // @mago-ignore analysis:invalid-return-statement
         return $class::fromSimpleXMLElement($item);
     }
 

src/Command/F2ApiClientCommand.php

@@ -82,7 +82,7 @@ private function createClient(?string $cacheDirectory): ApiClient
     }
 
     /**
-     * @return array<string, mixed>
+     * @return array<array-key, mixed>
      */
     private function responseToArray(array|AbstractItem $response): array
     {