#8 Apply phpstan level 10

Author: njoubert-cleverage

phpstan.neon

@@ -1,5 +1,5 @@
 parameters:
-    level: 6
+    level: 10
     paths:
         - src
         - tests

src/Client/Client.php

@@ -20,7 +20,7 @@
 use Symfony\Contracts\HttpClient\ResponseInterface;
 
 /**
- * @phpstan-import-type Options from \CleverAge\RestProcessBundle\Task\RequestTask
+ * @phpstan-import-type RequestOptions from \CleverAge\RestProcessBundle\Task\RequestTask
  */
 class Client implements ClientInterface
 {
@@ -53,7 +53,7 @@ public function setUri(string $uri): void
     }
 
     /**
-     * @param Options $options
+     * @param RequestOptions $options
      *
      * @throws RestRequestException
      */
@@ -116,28 +116,31 @@ protected function configureOptions(OptionsResolver $resolver): void
     }
 
     /**
-     * @param Options $options
+     * @param RequestOptions $options
      *
-     * @return Options
+     * @return RequestOptions
      */
     protected function getOptions(array $options = []): array
     {
         $resolver = new OptionsResolver();
         $this->configureOptions($resolver);
 
-        return $resolver->resolve($options);
+        /** @var RequestOptions $resolved */
+        $resolved = $resolver->resolve($options);
+
+        return $resolved;
     }
 
     /**
-     * @param Options $options
+     * @param RequestOptions $options
      */
     protected function getRequestUri(array $options = []): string
     {
         return $this->replaceParametersInUri($this->constructUri($options), $options);
     }
 
     /**
-     * @param Options $options
+     * @param RequestOptions $options
      *
      * @return array{
      *     'headers': array<mixed>,
@@ -168,7 +171,7 @@ protected function getRequestOptions(array $options = []): array
     }
 
     /**
-     * @param Options $options
+     * @param RequestOptions $options
      */
     protected function constructUri(array $options): string
     {
@@ -183,18 +186,20 @@ protected function getApiUrl(): string
     }
 
     /**
-     * @param Options $options
+     * @param RequestOptions $options
      */
     protected function replaceParametersInUri(string $uri, array $options = []): string
     {
         if ($options['url_parameters']) {
+            /** @var array<string> $search */
             $search = array_keys($options['url_parameters']);
             array_walk(
                 $search,
                 static function (&$item, $key) {
                     $item = '{'.$item.'}';
                 }
             );
+            /** @var array<string> $replace */
             $replace = array_values($options['url_parameters']);
             array_walk(
                 $replace,

src/Client/ClientInterface.php

@@ -16,7 +16,7 @@
 use Symfony\Contracts\HttpClient\ResponseInterface;
 
 /**
- * @phpstan-import-type Options from \CleverAge\RestProcessBundle\Task\RequestTask
+ * @phpstan-import-type RequestOptions from \CleverAge\RestProcessBundle\Task\RequestTask
  */
 interface ClientInterface
 {
@@ -30,7 +30,7 @@ public function geUri(): string;
     public function setUri(string $uri): void;
 
     /**
-     * @param Options $options
+     * @param RequestOptions $options
      */
     public function call(array $options = []): ResponseInterface;
 }

src/Task/RequestTask.php

@@ -29,14 +29,26 @@
 
 /**
  * @phpstan-type Options array{
+ *      'client': string,
+ *      'url': string,
+ *      'method': string,
+ *      'headers': array<mixed>,
+ *      'url_parameters': array<mixed>,
+ *      'data': array<mixed>|string|null,
+ *      'sends': string,
+ *      'expects': string,
+ *      'valid_response_code': array<int>,
+ *      'log_response': bool,
+ * }
+ * @phpstan-type RequestOptions array{
  *      'url': string,
  *      'method': string,
  *      'headers': array<mixed>,
  *      'url_parameters': array<mixed>,
  *      'sends': string,
  *      'expects': string,
  *      'data': array<mixed>|string|null
- *  }
+ * }
  */
 class RequestTask extends AbstractConfigurableTask
 {
@@ -54,6 +66,7 @@ public function __construct(protected LoggerInterface $logger, protected ClientR
      */
     public function execute(ProcessState $state): void
     {
+        /** @var Options $options */
         $options = $this->getOptions($state);
 
         $requestOptions = $this->getRequestOptions($state);
@@ -137,10 +150,11 @@ protected function configureOptions(OptionsResolver $resolver): void
     }
 
     /**
-     * @return Options
+     * @return RequestOptions
      */
     protected function getRequestOptions(ProcessState $state): array
     {
+        /** @var Options $options */
         $options = $this->getOptions($state);
 
         $requestOptions = [
@@ -153,8 +167,12 @@ protected function getRequestOptions(ProcessState $state): array
             'data' => $options['data'],
         ];
 
+        /** @var array<mixed> $input */
         $input = $state->getInput() ?: [];
 
-        return array_merge($requestOptions, $input);
+        /** @var RequestOptions $mergedOptions */
+        $mergedOptions = array_merge($requestOptions, $input);
+
+        return $mergedOptions;
     }
 }