Improve InnerList::fromPair

Author: nyamsprod

README.md

@@ -423,7 +423,7 @@ use Bakame\Http\StructuredFields\InnerList;
 use Bakame\Http\StructuredFields\ValueAccess;
 
 InnerList::fromAssociative(iterable<string, Value|DataType> $parameters, ...$members): self;
-InnerList::fromPairs(iterable<array{0:string, 1:Value|DataType}>} $parameters, ...$members): self;
+InnerList::fromPair(array{0:list<Item>, iterable<array{0:string, 1:Value|DataType}>} $pair): self;
 ```
 
 ## Contributing

src/InnerList.php

@@ -59,13 +59,28 @@ public static function from(StructuredField|Value|Token|ByteSequence|DateTimeInt
     }
 
     /**
-     * @param MemberOrderedMap<string, SfItem>|iterable<array{0:string, 1:SfItemInput}> $parameters
+     * @param array{
+     *     0:iterable<SfItemInput>,
+     *     1?:MemberOrderedMap<string, SfItem>|iterable<array{0:string, 1:SfItemInput}>
+     * } $pair
      */
-    public static function fromPairs(
-        iterable $parameters,
-        StructuredField|Value|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool ...$members
-    ): self {
-        return new self(Parameters::fromPairs($parameters), $members);
+    public static function fromPair(array $pair): self
+    {
+        $pair[1] = $pair[1] ?? [];
+
+        if (!array_is_list($pair)) { /* @phpstan-ignore-line */
+            throw new SyntaxError('The pair must be represented by an array as a list.');
+        }
+
+        if (2 !== count($pair)) { /* @phpstan-ignore-line */
+            throw new SyntaxError('The pair first value should be the member list and the optional second value the inner list parameters.');
+        }
+
+        if (!$pair[1] instanceof Parameters) {
+            $pair[1] = Parameters::fromPairs($pair[1]);
+        }
+
+        return new self($pair[1], $pair[0]);
     }
 
     /**

src/InnerListTest.php

@@ -195,12 +195,10 @@ public function it_can_create_via_with_parameters_method_a_new_object(): void
             'a',
             true
         );
-        $instance1bis = InnerList::fromPairs(
+        $instance1bis = InnerList::fromPair([
+            [Token::fromString('babayaga'), 'a', true],
             [['a', true]],
-            Token::fromString('babayaga'),
-            'a',
-            true
-        );
+        ]);
         $instance2 = $instance1->withParameters(Parameters::fromAssociative(['a' => true]));
         $instance3 = $instance1->withParameters(Parameters::fromAssociative(['a' => false]));