Improve internal codebase

Author: nyamsprod

src/Item.php

@@ -101,16 +101,16 @@ private static function filterInteger(int $value): int
      */
     public static function fromHttpValue(string $httpValue): self
     {
-        $httpValue = trim($httpValue, ' ');
+        $itemString = trim($httpValue, ' ');
+
         [$value, $parameters] = match (true) {
-            '' === $httpValue,
-            1 === preg_match("/[\r\t\n]/", $httpValue),
-            1 === preg_match("/[^\x20-\x7E]/", $httpValue) => throw new SyntaxError("The HTTP textual representation `$httpValue` for an item contains invalid characters."),
-            1 === preg_match('/^(-?[0-9])/', $httpValue) => self::parseNumber($httpValue),
-            '"' === $httpValue[0] => self::parseString($httpValue),
-            ':' === $httpValue[0] => self::parseBytesSequence($httpValue),
-            '?' === $httpValue[0] => self::parseBoolean($httpValue),
-            1 === preg_match('/^([a-z*])/i', $httpValue) => self::parseToken($httpValue),
+            1 === preg_match("/[\r\t\n]|[^\x20-\x7E]/", $itemString),
+            '' === $itemString => throw new SyntaxError("The HTTP textual representation `$httpValue` for an item contains invalid characters."),
+            '"' === $itemString[0] => self::parseString($itemString),
+            ':' === $itemString[0] => self::parseBytesSequence($itemString),
+            '?' === $itemString[0] => self::parseBoolean($itemString),
+            1 === preg_match('/^(-?[0-9])/', $itemString) => self::parseNumber($itemString),
+            1 === preg_match('/^([a-z*])/i', $itemString) => self::parseToken($itemString),
             default => throw new SyntaxError("The HTTP textual representation `$httpValue` for an item is unknown or unsupported."),
         };
 

src/Parser.php

@@ -8,7 +8,6 @@
 use function ltrim;
 use function ord;
 use function preg_match;
-use function preg_quote;
 use function strlen;
 use function substr;
 
@@ -211,11 +210,10 @@ private static function parseInnerListValue(string $httpValue): array
     private static function parseBareItem(string $httpValue): array
     {
         return match (true) {
-            '' === $httpValue => throw new SyntaxError('Unexpected empty string for The HTTP textual representation of an item.'),
-            1 === preg_match('/^(-|\d)/', $httpValue) => self::parseNumber($httpValue),
             '"' === $httpValue[0] => self::parseString($httpValue),
             ':' === $httpValue[0] => self::parseByteSequence($httpValue),
             '?' === $httpValue[0] => self::parseBoolean($httpValue),
+            1 === preg_match('/^(-|\d)/', $httpValue) => self::parseNumber($httpValue),
             1 === preg_match('/^([a-z*])/i', $httpValue) => self::parseToken($httpValue),
             default => throw new SyntaxError('Unknown or unsupported string for The HTTP textual representation of an item.'),
         };
@@ -353,7 +351,7 @@ private static function parseString(string $httpValue): array
      */
     private static function parseToken(string $httpValue): array
     {
-        preg_match('/^(?<token>[a-z*][a-z0-9:\/'.preg_quote("!#$%&'*+-.^_`|~").']*)/i', $httpValue, $found);
+        preg_match("/^(?<token>[a-z*][a-z0-9:\/\!\#\$%&'\*\+\-\.\^_`\|~]*)/i", $httpValue, $found);
 
         return [Token::fromString($found['token']), strlen($found['token'])];
     }