Adding Item::fromPair

Author: nyamsprod

CHANGELOG.md

@@ -6,7 +6,7 @@ All Notable changes to `bakame/http-strucured-fields` will be documented in this
 
 ### Added
 
-- None
+- `Item::fromPair`  named constructor to create a new instance from a pair expressed as an array list with two values.
 
 ### Fixed
 

src/Item.php

@@ -4,6 +4,7 @@
 
 namespace Bakame\Http\StructuredFields;
 
+use function count;
 use function in_array;
 use function is_bool;
 use function is_float;
@@ -34,6 +35,26 @@ public static function __set_state(array $properties): self
         return new self($properties['value'], $properties['parameters']);
     }
 
+    /**
+     * @param array{
+     *     0:Token|ByteSequence|int|float|string|bool,
+     *     1?:iterable<string,Item|ByteSequence|Token|bool|int|float|string>
+     * } $pair
+     */
+    public static function fromPair(array $pair): self
+    {
+        if (!array_is_list($pair)) { /* @phpstan-ignore-line */
+            throw new SyntaxError('The pair must be represented by an array as a list.');
+        }
+
+        $pair[1] = $pair[1] ?? [];
+        if (2 !== count($pair)) { /* @phpstan-ignore-line */
+            throw new SyntaxError('The pair first value should be the item value and the optional second value the item parameters.');
+        }
+
+        return self::from(...$pair);
+    }
+
     /**
      * Returns a new instance from a value type and an iterable of key-value parameters.
      *

src/ItemTest.php

@@ -256,4 +256,39 @@ public function it_can_exchange_parameters(): void
         self::assertCount(1, $instance->parameters);
         self::assertSame('bar', $instance->parameters->value('foo'));
     }
+
+    /**
+     * @test
+     */
+    public function it_can_create_an_item_from_a_array_pair(): void
+    {
+        $instance1 = Item::from(Token::fromString('babayaga'));
+        $instance2 = Item::fromPair([Token::fromString('babayaga')]);
+        $instance3 = Item::fromPair([Token::fromString('babayaga'), []]);
+
+        self::assertEquals($instance2, $instance1);
+        self::assertEquals($instance3, $instance1);
+    }
+
+    /**
+     * @test
+     * @dataProvider invalidPairProvider
+     * @param array<mixed> $pair
+     */
+    public function it_fails_to_create_an_item_from_a_array_pair(array $pair): void
+    {
+        $this->expectException(SyntaxError::class);
+
+        Item::fromPair($pair);  /* @phpstan-ignore-line */
+    }
+
+    /**
+     * @return iterable<string, array{pair:array<mixed>}>
+     */
+    public function invalidPairProvider(): iterable
+    {
+        yield 'empty pair' => ['pair' => []];
+        yield 'empty extra filled pair' => ['pair' => [1, [2], 3]];
+        yield 'associative array' => ['pair' => ['value' => 'bar', 'parameters' => ['foo' => 'bar']]];
+    }
 }

src/MapKey.php

@@ -10,8 +10,6 @@
  */
 final class MapKey
 {
-    private const REGEXP_KEY = '/^(?<key>[a-z*][a-z0-9.*_-]*)/';
-
     private function __construct(
         public readonly string $value
     ) {
@@ -35,7 +33,7 @@ public static function fromString(string $httpValue): self
      */
     public static function fromStringBeginning(string $httpValue): self
     {
-        if (1 !== preg_match(self::REGEXP_KEY, $httpValue, $found)) {
+        if (1 !== preg_match('/^(?<key>[a-z*][a-z0-9.*_-]*)/', $httpValue, $found)) {
             throw new SyntaxError("No valid http value key could be extracted from `$httpValue`.");
         }