Improve decoupling from Parser

Author: nyamsprod

README.md

@@ -529,19 +529,21 @@ echo InnerList::new('foo', 'bar')
 
 ### Advanced usages
 
-Starting with version `1.1.0` the parser is made public with the following static methods:
+Starting with version `1.1.0` the parser is made public with the following public static methods:
 
-- `Parser::parseList(Stringable|String $value): array`
-- `Parser::parseInnerList(Stringable|String $value): array`
-- `Parser::parseDictionary(Stringable|String $value): array`
-- `Parser::parseItem(Stringable|String $value): array`
-- `Parser::parseParameters(Stringable|String $value): array`
+```php
+Parser::parseList(Stringable|String $value): array
+Parser::parseDictionary(Stringable|String $value): array
+Parser::parseItem(Stringable|String $value): array
+Parser::parseInnerList(Stringable|String $value): array
+Parser::parseParameters(Stringable|String $value): array
+```
 
-All these static methods parse the HTTP Header string value and return a `array` structure
+All these static methods parse the HTTP Header string value and return an `array` structure
 representing the parsed string. It is possible to use this representation if you want
-to build your own structure field objects. Those methods are the ones used by all the 
-`fromHttpValue` named constructors to generate `StructuredField` instances from their
-returned `array`.
+to build your own structure field objects. Those methods are the ones used inside the
+respective `fromHttpValue` named constructors to generate `StructuredField` instances
+from their returned value.
 
 ## Contributing
 

src/Parser.php

@@ -48,7 +48,7 @@ public static function parseItem(Stringable|string $httpValue): array
             throw new SyntaxError('The HTTP textual representation "'.$httpValue.'" for an item contains invalid characters.');
         }
 
-        [$value, $offset] = Parser::parseValue($itemString);
+        [$value, $offset] = Parser::extractValue($itemString);
         $remainder = substr($itemString, $offset);
         if ('' !== $remainder && !str_contains($remainder, ';')) {
             throw new SyntaxError('The HTTP textual representation "'.$httpValue.'" for an item contains invalid characters.');
@@ -69,7 +69,7 @@ public static function parseItem(Stringable|string $httpValue): array
     public static function parseParameters(Stringable|string $httpValue): array
     {
         $httpValue = trim((string) $httpValue);
-        [$parameters, $offset] = Parser::parseParametersValues($httpValue);
+        [$parameters, $offset] = Parser::extractParametersValues($httpValue);
         if (strlen($httpValue) !== $offset) {
             throw new SyntaxError('The HTTP textual representation "'.$httpValue.'" for Parameters contains invalid characters.');
         }
@@ -212,7 +212,7 @@ private static function parseInnerListValue(string $httpValue): array
 
             if (')' === $remainder[0]) {
                 $remainder = substr($remainder, 1);
-                [$parameters, $offset] = self::parseParametersValues($remainder);
+                [$parameters, $offset] = self::extractParametersValues($remainder);
                 $remainder = substr($remainder, $offset);
 
                 return [[$list, $parameters], strlen($httpValue) - strlen($remainder)];
@@ -235,9 +235,9 @@ private static function parseInnerListValue(string $httpValue): array
      */
     private static function parseItemValue(string $remainder): array
     {
-        [$value, $offset] = self::parseValue($remainder);
+        [$value, $offset] = self::extractValue($remainder);
         $remainder = substr($remainder, $offset);
-        [$parameters, $offset] = self::parseParametersValues($remainder);
+        [$parameters, $offset] = self::extractParametersValues($remainder);
 
         return [[$value, $parameters], substr($remainder, $offset)];
     }
@@ -249,7 +249,7 @@ private static function parseItemValue(string $remainder): array
      *
      * @return array{0:SfType, 1:int}
      */
-    private static function parseValue(string $httpValue): array
+    private static function extractValue(string $httpValue): array
     {
         return match (true) {
             '"' === $httpValue[0] => self::parseString($httpValue),
@@ -269,7 +269,7 @@ private static function parseValue(string $httpValue): array
      *
      * @return array{0:array<string, SfType>, 1:int}
      */
-    private static function parseParametersValues(Stringable|string $httpValue): array
+    private static function extractParametersValues(Stringable|string $httpValue): array
     {
         $map = [];
         $httpValue = (string) $httpValue;
@@ -284,7 +284,7 @@ private static function parseParametersValues(Stringable|string $httpValue): arr
             if ('' !== $remainder && '=' === $remainder[0]) {
                 $remainder = substr($remainder, 1);
 
-                [$map[$key], $offset] = self::parseValue($remainder);
+                [$map[$key], $offset] = self::extractValue($remainder);
                 $remainder = substr($remainder, $offset);
             }
         }