Retrofit add and adapt Parser implementation from gapple

Author: nyamsprod

src/Dictionary.php

@@ -63,58 +63,7 @@ public static function fromPairs(iterable $pairs = []): self
      */
     public static function fromHttpValue(string $httpValue): self
     {
-        $instance = new self();
-        $httpValue = trim($httpValue, ' ');
-        if ('' === $httpValue) {
-            return $instance;
-        }
-
-        if (1 === preg_match("/[^\x20-\x7E\t]/", $httpValue) || str_starts_with($httpValue, "\t")) {
-            throw new SyntaxError("The HTTP textual representation `$httpValue` for dictionary contains invalid characters.");
-        }
-
-        $parser = fn (string $element): Item|InnerList => str_starts_with($element, '(')
-            ? InnerList::fromHttpValue($element)
-            : Item::fromHttpValue($element);
-
-        return array_reduce(explode(',', $httpValue), function (self $instance, string $element) use ($parser): self {
-            [$key, $value] = self::extractPair($element);
-
-            $instance->set($key, $parser($value));
-
-            return $instance;
-        }, $instance);
-    }
-
-    /**
-     * Extracts a dictionary pair from an HTTP textual representation.
-     *
-     * @throws SyntaxError
-     *
-     * @return array{0:string, 1:string}
-     */
-    private static function extractPair(string $pair): array
-    {
-        $pair = trim($pair);
-
-        if ('' === $pair) {
-            throw new SyntaxError('The HTTP textual representation for a dictionary pair can not be empty.');
-        }
-
-        if (1 !== preg_match('/^(?<key>[a-z*][a-z0-9.*_-]*)(=)?(?<value>.*)/', $pair, $found)) {
-            throw new SyntaxError("The HTTP textual representation `$pair` for a dictionary pair contains invalid characters.");
-        }
-
-        if (rtrim($found['key']) !== $found['key'] || ltrim($found['value']) !== $found['value']) {
-            throw new SyntaxError("The HTTP textual representation `$pair` for a dictionary pair contains invalid characters.");
-        }
-
-        $found['value'] = trim($found['value']);
-        if ('' === $found['value'] || str_starts_with($found['value'], ';')) {
-            $found['value'] = '?1'.$found['value'];
-        }
-
-        return [$found['key'], $found['value']];
+        return Parser::parseDictionary($httpValue);
     }
 
     public function toHttpValue(): string

src/DictionaryTest.php

@@ -185,4 +185,16 @@ public function it_can_merge_without_argument_and_not_throw(): void
         $instance->merge();
         self::assertCount(1, $instance);
     }
+
+    /**
+     * @test
+     */
+    public function it_can_handle_string_with_comma(): void
+    {
+        $expected = 'a=foobar;test="bar, baz", b=toto';
+        $instance = Dictionary::fromHttpValue($expected);
+
+        self::assertSame($expected, $instance->toHttpValue());
+        self::assertCount(2, $instance);
+    }
 }

src/InnerList.php

@@ -35,61 +35,6 @@ public static function fromElements(iterable $elements = [], iterable $parameter
         return new self(Parameters::fromAssociative($parameters), ...$newElements);
     }
 
-    /**
-     * Returns an instance from an HTTP textual representation.
-     *
-     * @see https://www.rfc-editor.org/rfc/rfc8941.html#section-3.1.1
-     */
-    public static function fromHttpValue(string $httpValue): self
-    {
-        $field = trim($httpValue);
-
-        if (1 !== preg_match("/^\((?<content>.*)\)(?<parameters>[^,]*)/", $field, $found)) {
-            throw new SyntaxError("The HTTP textual representation `$httpValue` for a inner list contains invalid characters.");
-        }
-
-        if ('' !== $found['parameters'] && !str_starts_with($found['parameters'], ';')) {
-            throw new SyntaxError("The HTTP textual representation `$httpValue` for a inner list contains invalid characters.");
-        }
-
-        /** @var string $content */
-        $content = preg_replace('/[ ]+/', ' ', $found['content']);
-        $content = trim($content);
-
-        $components = array_reduce(explode(' ', $content), function (array $components, string $component): array {
-            if ([] === $components) {
-                return [$component];
-            }
-
-            $lastIndex = count($components) - 1;
-
-            if (str_starts_with($component, ';')) {
-                $components[$lastIndex] .= $component;
-
-                return $components;
-            }
-
-            $lastAddition = $components[$lastIndex];
-            if (str_ends_with($lastAddition, ';')) {
-                $components[$lastIndex] .= $component;
-
-                return $components;
-            }
-
-            $components[] = $component;
-
-            return $components;
-        }, []);
-
-        return new self(
-            Parameters::fromHttpValue($found['parameters']),
-            ...array_filter(array_map(
-                fn (string $field): Item|null => '' === $field ? null : Item::fromHttpValue($field),
-                $components
-            ))
-        );
-    }
-
     public function toHttpValue(): string
     {
         $returnArray = array_map(fn (Item $value): string => $value->toHttpValue(), $this->elements);

src/InnerListTest.php

@@ -61,16 +61,6 @@ public function it_can_add_or_remove_elements(): void
         self::assertTrue($instance->isEmpty());
     }
 
-    /**
-     * @test
-     */
-    public function it_fails_to_instantiate_with_wrong_parameters_in_field(): void
-    {
-        $this->expectException(SyntaxError::class);
-
-        InnerList::fromHttpValue('(1 42)foobar');
-    }
-
     /**
      * @test
      */

src/OrderedList.php

@@ -41,22 +41,7 @@ public static function fromElements(iterable $elements = []): self
      */
     public static function fromHttpValue(string $httpValue): self
     {
-        $httpValue = trim($httpValue, ' ');
-        if ('' === $httpValue) {
-            return new self();
-        }
-
-        $parser = fn (string $element): Item|InnerList => str_starts_with($element, '(')
-            ? InnerList::fromHttpValue($element)
-            : Item::fromHttpValue($element);
-
-        $reducer = function (self $carry, string $element) use ($parser): self {
-            $carry->push($parser(trim($element, " \t")));
-
-            return $carry;
-        };
-
-        return array_reduce(explode(',', $httpValue), $reducer, new self());
+        return Parser::parseList($httpValue);
     }
 
     public function toHttpValue(): string