Remove Parameters::fromItems

Author: nyamsprod

src/Dictionary.php

@@ -57,20 +57,20 @@ public static function fromHttpValue(string $httpValue): self
      *
      * @return array{0:string, 1:string}
      */
-    private static function extractPair(string $element): array
+    private static function extractPair(string $pair): array
     {
-        $element = trim($element);
+        $pair = trim($pair);
 
-        if ('' === $element) {
-            throw new SyntaxError('Dictionary pair can not be empty.');
+        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>.*)/', $element, $found)) {
-            throw new SyntaxError("The HTTP textual representation `$element` for a dictionary pair contains invalid characters.");
+        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 `$element` for a dictionary pair contains invalid characters.");
+            throw new SyntaxError("The HTTP textual representation `$pair` for a dictionary pair contains invalid characters.");
         }
 
         $found['value'] = trim($found['value']);

src/InnerList.php

@@ -28,7 +28,7 @@ public function __construct(iterable $elements = [], iterable $parameters = [])
             $this->push($element);
         }
 
-        $this->parameters = $parameters instanceof Parameters ? $parameters : Parameters::fromItems($parameters);
+        $this->parameters = $parameters instanceof Parameters ? $parameters : new Parameters($parameters);
     }
 
     public static function fromHttpValue(string $httpValue): self

src/Item.php

@@ -24,7 +24,7 @@ public static function from(
             is_float($value) => self::filterDecimal($value),
             is_string($value) => self::filterString($value),
             default => $value,
-        }, $parameters instanceof Parameters ? $parameters : Parameters::fromItems($parameters));
+        }, $parameters instanceof Parameters ? $parameters : new Parameters($parameters));
     }
 
     public static function filterDecimal(float $value): float

src/Parameters.php

@@ -17,29 +17,16 @@ final class Parameters implements Countable, IteratorAggregate, StructuredField
     private array $elements;
 
     /**
-     * @param iterable<string, Item> $elements
+     * @param iterable<array-key, Item|Token|ByteSequence|float|int|bool|string> $elements
      */
     public function __construct(iterable $elements = [])
     {
         $this->elements = [];
-        foreach ($elements as $key => $value) {
-            $this->set($key, $value);
+        foreach ($elements as $key => $element) {
+            $this->set($key, self::filterElement($element));
         }
     }
 
-    /**
-     * @param iterable<array-key, Item|Token|ByteSequence|float|int|bool|string> $items
-     */
-    public static function fromItems(iterable $items): self
-    {
-        $instance = new self();
-        foreach ($items as $key => $item) {
-            $instance->set($key, self::filterElement($item));
-        }
-
-        return $instance;
-    }
-
     private static function filterElement(Item|ByteSequence|Token|bool|int|float|string $element): Item
     {
         return match (true) {