Merge pull request #22 from laudis-technologies/debug

Updated dependencies and code maintainability

Author: transistive

composer.json

@@ -21,7 +21,7 @@
     ],
     "require": {
         "php": "^7.4 || ^8.0",
-        "youngsource/typed-enum": "^1.1",
+        "laudis/typed-enum": "^1.1",
         "php-http/discovery": "^1.13",
         "psr/http-message": "^1.0",
         "psr/http-factory": "^1.0",

composer.lock

@@ -32,25 +32,68 @@ public static function asMap(iterable $iterable): Map
     }
 
     /**
-     * @param iterable|scalar|null $value
+     * @param mixed $value
      *
      * @return iterable|scalar|stdClass|null
      */
     public static function asParameter($value)
+    {
+        return self::emptySequenceToArray($value) ??
+            self::emptyDictionaryToStdClass($value) ??
+            self::filledIterableToArray($value) ??
+            self::filterInvalidType($value);
+    }
+
+    /**
+     * @param mixed $value
+     *
+     * @return scalar|null
+     */
+    private static function filterInvalidType($value)
+    {
+        if ($value !== null && !is_scalar($value)) {
+            throw new InvalidArgumentException('Parameters must be iterable, scalar or null');
+        }
+
+        return $value;
+    }
+
+    /**
+     * @param mixed $value
+     */
+    private static function emptySequenceToArray($value): ?array
     {
         if ($value instanceof Sequence && $value->count() === 0) {
             return [];
         }
+
+        return null;
+    }
+
+    /**
+     * @param mixed $value
+     */
+    private static function emptyDictionaryToStdClass($value): ?stdClass
+    {
         if (($value instanceof Map && $value->count() === 0) ||
             (is_array($value) && count($value) === 0)
         ) {
             return new stdClass();
         }
+
+        return null;
+    }
+
+    /**
+     * @param mixed $value
+     */
+    private static function filledIterableToArray($value): ?array
+    {
         if (is_iterable($value)) {
             return self::iterableToArray($value);
         }
 
-        return $value;
+        return null;
     }
 
     /**
@@ -82,7 +125,6 @@ private static function iterableToArray(iterable $value): array
          */
         foreach ($value as $key => $val) {
             if (is_int($key) || is_string($key)) {
-                /** @psalm-suppress MixedAssignment */
                 $tbr[$key] = self::asParameter($val);
             } else {
                 $msg = 'Iterable parameters must have an integer or string as key values, '.gettype($key).' received.';

src/ParameterHelper.php

@@ -29,6 +29,7 @@ final class ParameterHelperTest extends TestCase
     public static function setUpBeforeClass(): void
     {
         parent::setUpBeforeClass();
+        /** @psalm-suppress MixedPropertyTypeCoercion */
         self::$invalidIterable = new class() implements Iterator {
             private bool $initial = true;