Use list collection

inspirum · Sep 5, 2024 · d38c86a · d38c86a
1 parent 1800f54
commit d38c86a
Show file tree

Hide file tree

Showing 72 changed files with 247 additions and 217 deletions.
diff --git a/composer.json b/composer.json
@@ -20,16 +20,16 @@
     "ext-curl": "*",
     "ext-json": "*",
     "guzzlehttp/psr7": "^1.5 || ^2.0",
-    "inspirum/arrayable": "^1.2",
+    "inspirum/arrayable": "^1.3",
     "psr/http-message": "^1.1 || ^2.0"
   },
   "require-dev": {
-    "inspirum/coding-standard": "^1.5",
+    "inspirum/coding-standard": "^1.6",
     "inspirum/phpunit-extension": "^1.0",
-    "phpstan/phpstan": "^1.10",
+    "phpstan/phpstan": "^1.12",
     "phpunit/phpunit": "^10.5",
-    "shipmonk/composer-dependency-analyser": "^1.5",
-    "squizlabs/php_codesniffer": "^3.9"
+    "shipmonk/composer-dependency-analyser": "^1.7",
+    "squizlabs/php_codesniffer": "^3.10"
   },
   "autoload": {
     "psr-4": {

diff --git a/phpstan.neon b/phpstan.neon
@@ -8,7 +8,7 @@ parameters:
 	treatPhpDocTypesAsCertain: false
 	ignoreErrors:
 		-
-			message: '#^Parameter \#2 \$value of method Inspirum\\Balikobot\\Model\\BasePerCarrierCollection\<TItemKey of \(int\|string\),TItemValue,TKey of \(int\|string\),TValue of Inspirum\\Arrayable\\Arrayable\<TItemKey of \(int\|string\), TItemValue\>&Inspirum\\Balikobot\\Model\\WithCarrierId\>\:\:offsetSet\(\) expects TValue of Inspirum\\Arrayable\\Arrayable\<TItemKey of \(int\|string\), TItemValue\>&Inspirum\\Balikobot\\Model\\WithCarrierId, Inspirum\\Arrayable\\Arrayable\<TItemKey of \(int\|string\), TItemValue\>&Inspirum\\Balikobot\\Model\\WithCarrierId given\.$#'
+			message: '#^Parameter \#2 \$value of method Inspirum\\Balikobot\\Model\\BasePerCarrierCollection\<TItemKey of \(int\|string\),TItemValue,TValue of Inspirum\\Arrayable\\Arrayable\<TItemKey of \(int\|string\), TItemValue\>&Inspirum\\Balikobot\\Model\\WithCarrierId\>\:\:offsetSet\(\) expects TValue of Inspirum\\Arrayable\\Arrayable\<TItemKey of \(int\|string\), TItemValue\>&Inspirum\\Balikobot\\Model\\WithCarrierId, Inspirum\\Arrayable\\Arrayable\<TItemKey of \(int\|string\), TItemValue\>&Inspirum\\Balikobot\\Model\\WithCarrierId given\.$#'
 			count: 1
 			path: src/Model/BasePerCarrierCollection.php
 		-

diff --git a/src/Client/Response/Validator.php b/src/Client/Response/Validator.php
@@ -86,7 +86,7 @@ public function validateResponseItemHasAttribute(array $item, string $attribute,
      * Validate that response item has some attributes
      *
      * @param array<string,mixed> $item
-     * @param array<string> $attributes
+     * @param list<string> $attributes
      * @param array<mixed,mixed> $response
      *
      * @throws \Inspirum\Balikobot\Exception\BadRequestException

diff --git a/src/Definitions/BaseEnum.php b/src/Definitions/BaseEnum.php
@@ -10,7 +10,7 @@
 abstract class BaseEnum
 {
     /**
-     * @return array<string>
+     * @return list<string>
      */
     public static function getAll(): array
     {

diff --git a/src/Definitions/Service.php b/src/Definitions/Service.php
@@ -2242,15 +2242,15 @@ final class Service extends BaseEnum
     public const SDS_STANDART = 'Standard';
 
     /**
-     * @return array<string>|null
+     * @return list<string>|null
      */
     public static function getForCarrier(string $carrier): ?array
     {
         return self::getForCarriers()[$carrier] ?? null;
     }
 
     /**
-     * @return array<string,array<string>>
+     * @return array<string,list<string>>
      */
     private static function getForCarriers(): array
     {
@@ -2293,7 +2293,7 @@ private static function getForCarriers(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function cp(): array
     {
         return [
@@ -2326,7 +2326,7 @@ private static function cp(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function dpd(): array
     {
         return [
@@ -2341,7 +2341,7 @@ private static function dpd(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function dhl(): array
     {
         return [
@@ -2356,7 +2356,7 @@ private static function dhl(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function geis(): array
     {
         return [
@@ -2370,7 +2370,7 @@ private static function geis(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function gls(): array
     {
         return [
@@ -2383,7 +2383,7 @@ private static function gls(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function intime(): array
     {
         return [
@@ -2401,7 +2401,7 @@ private static function intime(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function pbh(): array
     {
         return [
@@ -2440,7 +2440,7 @@ private static function pbh(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function ppl(): array
     {
         return [
@@ -2458,7 +2458,7 @@ private static function ppl(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function sp(): array
     {
         return [
@@ -2475,7 +2475,7 @@ private static function sp(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function sps(): array
     {
         return [
@@ -2486,7 +2486,7 @@ private static function sps(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function topTrans(): array
     {
         return [
@@ -2499,7 +2499,7 @@ private static function topTrans(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function ulozenka(): array
     {
         return [
@@ -2520,7 +2520,7 @@ private static function ulozenka(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function ups(): array
     {
         return [
@@ -2531,7 +2531,7 @@ private static function ups(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function zasilkovna(): array
     {
         return [
@@ -2684,7 +2684,7 @@ private static function zasilkovna(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function tnt(): array
     {
         return [
@@ -2708,7 +2708,7 @@ private static function tnt(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function gw(): array
     {
         return [
@@ -2724,7 +2724,7 @@ private static function gw(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function gwcz(): array
     {
         return [
@@ -2736,7 +2736,7 @@ private static function gwcz(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function messenger(): array
     {
         return [
@@ -2754,7 +2754,7 @@ private static function messenger(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function dhlde(): array
     {
         return [
@@ -2766,7 +2766,7 @@ private static function dhlde(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function fedex(): array
     {
         return [
@@ -2789,7 +2789,7 @@ private static function fedex(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function fofr(): array
     {
         return [
@@ -2803,7 +2803,7 @@ private static function fofr(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function dachser(): array
     {
         return [
@@ -2821,15 +2821,15 @@ private static function dachser(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function dhlparcel(): array
     {
         return [
             self::DHLPARCEL_CONNECT,
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function raben(): array
     {
         return [
@@ -2842,7 +2842,7 @@ private static function raben(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function spring(): array
     {
         return [
@@ -2852,7 +2852,7 @@ private static function spring(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function dsv(): array
     {
         return [
@@ -2861,7 +2861,7 @@ private static function dsv(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function dhlfreightec(): array
     {
         return [
@@ -2872,7 +2872,7 @@ private static function dhlfreightec(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function kurier(): array
     {
         return [
@@ -2884,7 +2884,7 @@ private static function kurier(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function dbschenker(): array
     {
         return [
@@ -2902,7 +2902,7 @@ private static function dbschenker(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function airway(): array
     {
         return [
@@ -2918,15 +2918,15 @@ private static function airway(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function japo(): array
     {
         return [
             self::JAPO_STANDARD,
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function liftago(): array
     {
         return [
@@ -2946,7 +2946,7 @@ private static function liftago(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function magyarposta(): array
     {
         return [
@@ -2959,7 +2959,7 @@ private static function magyarposta(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function sameday(): array
     {
         return [
@@ -2975,7 +2975,7 @@ private static function sameday(): array
         ];
     }
 
-    /** @return array<string> */
+    /** @return list<string> */
     private static function sds(): array
     {
         return [

diff --git a/src/Exception/ServiceContainerNotFoundException.php b/src/Exception/ServiceContainerNotFoundException.php
@@ -11,7 +11,7 @@
 class ServiceContainerNotFoundException extends InvalidArgumentException
 {
     /**
-     * @param array<string> $alternatives
+     * @param list<string> $alternatives
      */
     public function __construct(string $connection, array $alternatives)
     {

diff --git a/src/Model/AdrUnit/DefaultAdrUnitFactory.php b/src/Model/AdrUnit/DefaultAdrUnitFactory.php
@@ -28,7 +28,7 @@ public function createCollection(string $carrier, array $data): AdrUnitCollectio
     {
         return new DefaultAdrUnitCollection(
             $carrier,
-            array_map(fn(array $unit): AdrUnit => $this->create($carrier, $unit), $data['units'] ?? []),
+            array_map(fn (array $unit): AdrUnit => $this->create($carrier, $unit), $data['units'] ?? []),
         );
     }
 }