refactor: removes array_values and supresses phpstan errors

Author: JasonTheAdams

src/Providers/DTO/ProviderModelsMetadata.php

@@ -20,7 +20,7 @@
  *
  * @phpstan-type ProviderModelsMetadataArrayShape array{
  *     provider: ProviderMetadataArrayShape,
- *     models: array<int, ModelMetadataArrayShape>
+ *     models: list<ModelMetadataArrayShape>
  * }
  *
  * @extends AbstractDataValueObject<ProviderModelsMetadataArrayShape>
@@ -108,10 +108,12 @@ public static function getJsonSchema(): array
      */
     public function toArray(): array
     {
+        /** @phpstan-ignore-next-line return.type (array_map doesn't guarantee list, validation will be added later) */
         return [
             self::KEY_PROVIDER => $this->provider->toArray(),
-            self::KEY_MODELS => array_values(
-                array_map(static fn(ModelMetadata $model): array => $model->toArray(), $this->models)
+            self::KEY_MODELS => array_map(
+                static fn(ModelMetadata $model): array => $model->toArray(),
+                $this->models
             ),
         ];
     }

src/Providers/Models/DTO/ModelConfig.php

@@ -20,19 +20,19 @@
  * @phpstan-import-type ToolArrayShape from Tool
  *
  * @phpstan-type ModelConfigArrayShape array{
- *     outputModalities?: array<int, string>,
+ *     outputModalities?: list<string>,
  *     systemInstruction?: string,
  *     candidateCount?: int,
  *     maxTokens?: int,
  *     temperature?: float,
  *     topP?: float,
  *     topK?: int,
- *     stopSequences?: array<int, string>,
+ *     stopSequences?: list<string>,
  *     presencePenalty?: float,
  *     frequencyPenalty?: float,
  *     logprobs?: bool,
  *     topLogprobs?: int,
- *     tools?: array<int, ToolArrayShape>,
+ *     tools?: list<ToolArrayShape>,
  *     outputMimeType?: string,
  *     outputSchema?: array<string, mixed>,
  *     customOptions?: array<string, mixed>
@@ -653,12 +653,12 @@ public function toArray(): array
         $data = [];
 
         if ($this->outputModalities !== null) {
-            $data[self::KEY_OUTPUT_MODALITIES] = array_values(array_map(
+            $data[self::KEY_OUTPUT_MODALITIES] = array_map(
                 static function (ModalityEnum $modality): string {
                     return $modality->value;
                 },
                 $this->outputModalities
-            ));
+            );
         }
 
         if ($this->systemInstruction !== null) {
@@ -686,7 +686,7 @@ static function (ModalityEnum $modality): string {
         }
 
         if ($this->stopSequences !== null) {
-            $data[self::KEY_STOP_SEQUENCES] = array_values($this->stopSequences);
+            $data[self::KEY_STOP_SEQUENCES] = $this->stopSequences;
         }
 
         if ($this->presencePenalty !== null) {
@@ -706,9 +706,9 @@ static function (ModalityEnum $modality): string {
         }
 
         if ($this->tools !== null) {
-            $data[self::KEY_TOOLS] = array_values(array_map(static function (Tool $tool): array {
+            $data[self::KEY_TOOLS] = array_map(static function (Tool $tool): array {
                 return $tool->toArray();
-            }, $this->tools));
+            }, $this->tools);
         }
 
         if ($this->outputMimeType !== null) {
@@ -721,6 +721,7 @@ static function (ModalityEnum $modality): string {
 
         $data[self::KEY_CUSTOM_OPTIONS] = $this->customOptions;
 
+        /** @phpstan-ignore-next-line return.type (array_map doesn't guarantee list, validation will be added later) */
         return $data;
     }
 
@@ -765,7 +766,7 @@ public static function fromArray(array $array): self
         }
 
         if (isset($array[self::KEY_STOP_SEQUENCES])) {
-            $config->setStopSequences(array_values($array[self::KEY_STOP_SEQUENCES]));
+            $config->setStopSequences($array[self::KEY_STOP_SEQUENCES]);
         }
 
         if (isset($array[self::KEY_PRESENCE_PENALTY])) {

src/Providers/Models/DTO/ModelMetadata.php

@@ -20,8 +20,8 @@
  * @phpstan-type ModelMetadataArrayShape array{
  *     id: string,
  *     name: string,
- *     supportedCapabilities: array<int, string>,
- *     supportedOptions: array<int, SupportedOptionArrayShape>
+ *     supportedCapabilities: list<string>,
+ *     supportedOptions: list<SupportedOptionArrayShape>
  * }
  *
  * @extends AbstractDataValueObject<ModelMetadataArrayShape>
@@ -164,17 +164,18 @@ public static function getJsonSchema(): array
      */
     public function toArray(): array
     {
+        /** @phpstan-ignore-next-line return.type (array_map doesn't guarantee list, validation will be added later) */
         return [
             self::KEY_ID => $this->id,
             self::KEY_NAME => $this->name,
-            self::KEY_SUPPORTED_CAPABILITIES => array_values(array_map(
+            self::KEY_SUPPORTED_CAPABILITIES => array_map(
                 static fn(CapabilityEnum $capability): string => $capability->value,
                 $this->supportedCapabilities
-            )),
-            self::KEY_SUPPORTED_OPTIONS => array_values(array_map(
+            ),
+            self::KEY_SUPPORTED_OPTIONS => array_map(
                 static fn(SupportedOption $option): array => $option->toArray(),
                 $this->supportedOptions
-            )),
+            ),
         ];
     }
 

src/Providers/Models/DTO/ModelRequirements.php

@@ -18,8 +18,8 @@
  * @phpstan-import-type RequiredOptionArrayShape from RequiredOption
  *
  * @phpstan-type ModelRequirementsArrayShape array{
- *     requiredCapabilities: array<int, string>,
- *     requiredOptions: array<int, RequiredOptionArrayShape>
+ *     requiredCapabilities: list<string>,
+ *     requiredOptions: list<RequiredOptionArrayShape>
  * }
  *
  * @extends AbstractDataValueObject<ModelRequirementsArrayShape>
@@ -114,15 +114,16 @@ public static function getJsonSchema(): array
      */
     public function toArray(): array
     {
+        /** @phpstan-ignore-next-line return.type (array_map doesn't guarantee list, validation will be added later) */
         return [
-            self::KEY_REQUIRED_CAPABILITIES => array_values(array_map(
+            self::KEY_REQUIRED_CAPABILITIES => array_map(
                 static fn(CapabilityEnum $capability): string => $capability->value,
                 $this->requiredCapabilities
-            )),
-            self::KEY_REQUIRED_OPTIONS => array_values(array_map(
+            ),
+            self::KEY_REQUIRED_OPTIONS => array_map(
                 static fn(RequiredOption $option): array => $option->toArray(),
                 $this->requiredOptions
-            )),
+            ),
         ];
     }
 

src/Providers/Models/DTO/SupportedOption.php

@@ -16,7 +16,7 @@
  *
  * @phpstan-type SupportedOptionArrayShape array{
  *     name: string,
- *     supportedValues?: array<int, mixed>
+ *     supportedValues?: list<mixed>
  * }
  *
  * @extends AbstractDataValueObject<SupportedOptionArrayShape>
@@ -139,9 +139,10 @@ public function toArray(): array
         ];
 
         if ($this->supportedValues !== null) {
-            $data[self::KEY_SUPPORTED_VALUES] = array_values($this->supportedValues);
+            $data[self::KEY_SUPPORTED_VALUES] = $this->supportedValues;
         }
 
+        /** @phpstan-ignore-next-line return.type (array doesn't guarantee list, validation will be added later) */
         return $data;
     }