Improve internal codebase

Author: nyamsprod

src/Item.php

@@ -29,6 +29,27 @@ private function __construct(
     ) {
     }
 
+    /**
+     * Returns a new instance from an HTTP Header or Trailer value string
+     * in compliance with RFC8941.
+     *
+     * @see https://www.rfc-editor.org/rfc/rfc8941.html#section-3.3
+     */
+    public static function fromHttpValue(Stringable|string $httpValue): self
+    {
+        $itemString = trim((string) $httpValue, ' ');
+        if ('' === $itemString || 1 === preg_match("/[\r\t\n]|[^\x20-\x7E]/", $itemString)) {
+            throw new SyntaxError('The HTTP textual representation "'.$httpValue.'" for an item contains invalid characters.');
+        }
+
+        [$value, $offset] = Parser::parseBareItem($itemString);
+        if (!str_contains($itemString, ';') && $offset !== strlen($itemString)) {
+            throw new SyntaxError('The HTTP textual representation "'.$httpValue.'" for an item contains invalid characters.');
+        }
+
+        return new self(new Value($value), Parameters::fromHttpValue(substr($itemString, $offset)));
+    }
+
     /**
      * Returns a new instance from a value type and an iterable of key-value parameters.
      *
@@ -69,24 +90,11 @@ public static function fromPair(array $pair): self
     }
 
     /**
-     * Returns a new instance from an HTTP Header or Trailer value string
-     * in compliance with RFC8941.
-     *
-     * @see https://www.rfc-editor.org/rfc/rfc8941.html#section-3.3
+     * Returns a new bare instance from value.
      */
-    public static function fromHttpValue(Stringable|string $httpValue): self
+    private static function fromValue(Value $value): self
     {
-        $itemString = trim((string) $httpValue, ' ');
-        if ('' === $itemString || 1 === preg_match("/[\r\t\n]|[^\x20-\x7E]/", $itemString)) {
-            throw new SyntaxError('The HTTP textual representation "'.$httpValue.'" for an item contains invalid characters.');
-        }
-
-        [$value, $offset] = Parser::parseBareItem($itemString);
-        if (!str_contains($itemString, ';') && $offset !== strlen($itemString)) {
-            throw new SyntaxError('The HTTP textual representation "'.$httpValue.'" for an item contains invalid characters.');
-        }
-
-        return new self(new Value($value), Parameters::fromHttpValue(substr($itemString, $offset)));
+        return new self($value, Parameters::create());
     }
 
     /**
@@ -97,14 +105,6 @@ public static function fromEncodedByteSequence(Stringable|string $value): self
         return self::fromValue(Value::fromEncodedByteSequence($value));
     }
 
-    /**
-     * Returns a new bare instance from value.
-     */
-    private static function fromValue(Value $value): self
-    {
-        return new self($value, Parameters::create());
-    }
-
     /**
      * Returns a new instance from a decoded byte sequence and an iterable of key-value parameters.
      */
@@ -219,11 +219,6 @@ public function parameter(string $key): mixed
         }
     }
 
-    public function __toString(): string
-    {
-        return $this->toHttpValue();
-    }
-
     /**
      * Serialize the Item value according to RFC8941.
      *
@@ -234,6 +229,11 @@ public function toHttpValue(): string
         return $this->value->serialize().$this->parameters->toHttpValue();
     }
 
+    public function __toString(): string
+    {
+        return $this->toHttpValue();
+    }
+
     /**
      * @return array{0:SfItemInput, 1:MemberOrderedMap<string, SfItem>}
      */