Improve parameters invalid state check

Author: nyamsprod

src/Parameters.php

@@ -9,7 +9,6 @@
 use IteratorAggregate;
 use function array_key_exists;
 use function array_keys;
-use function array_values;
 use function count;
 use function explode;
 use function ltrim;
@@ -24,7 +23,7 @@ final class Parameters implements Countable, IteratorAggregate, StructuredField
 {
     private function __construct(
         /** @var array<string, Item> */
-        private array $members = []
+        private array $members
     ) {
     }
 
@@ -46,7 +45,7 @@ public static function __set_state(array $properties): self
      */
     public static function fromAssociative(iterable $members = []): self
     {
-        $instance = new self();
+        $instance = new self([]);
         foreach ($members as $key => $member) {
             $instance->set($key, $member);
         }
@@ -65,7 +64,7 @@ public static function fromAssociative(iterable $members = []): self
      */
     public static function fromPairs(iterable $pairs = []): self
     {
-        $instance = new self();
+        $instance = new self([]);
         foreach ($pairs as [$key, $member]) {
             $instance->set($key, $member);
         }
@@ -80,7 +79,7 @@ public static function fromPairs(iterable $pairs = []): self
      */
     public static function fromHttpValue(string $httpValue): self
     {
-        $instance = new self();
+        $instance = new self([]);
         if ('' === $httpValue) {
             return $instance;
         }
@@ -105,9 +104,7 @@ public function toHttpValue(): string
         $returnValue = [];
 
         foreach ($this->members as $key => $val) {
-            if (!$val->parameters->isEmpty()) {
-                throw new ForbiddenStateError('Parameters instances can not contain parameterized Items.');
-            }
+            $val = $this->validateMember($val);
 
             $value = ';'.$key;
             if ($val->value !== true) {
@@ -120,6 +117,15 @@ public function toHttpValue(): string
         return implode('', $returnValue);
     }
 
+    private function validateMember(Item $item): Item
+    {
+        if (!$item->parameters->isEmpty()) {
+            throw new ForbiddenStateError('Parameters instances can not contain parameterized Items.');
+        }
+
+        return $item;
+    }
+
     public function count(): int
     {
         return count($this->members);
@@ -138,8 +144,8 @@ public function isEmpty(): bool
      */
     public function getIterator(): Iterator
     {
-        foreach ($this->members as $key => $value) {
-            yield $key => $value;
+        foreach ($this->members as $key => $member) {
+            yield $key => $this->validateMember($member);
         }
     }
 
@@ -151,7 +157,7 @@ public function getIterator(): Iterator
     public function toPairs(): Iterator
     {
         foreach ($this->members as $index => $member) {
-            yield [$index, $member];
+            yield [$index, $this->validateMember($member)];
         }
     }
 
@@ -172,7 +178,7 @@ public function keys(): array
      */
     public function values(): array
     {
-        return array_map(fn (Item $item): Token|ByteSequence|float|int|bool|string => $item->value, $this->members);
+        return array_map(fn (Item $item): Token|ByteSequence|float|int|bool|string => $this->validateMember($item)->value, $this->members);
     }
 
     /**
@@ -198,12 +204,7 @@ public function get(string $key): Item
             throw InvalidOffset::dueToKeyNotFound($key);
         }
 
-        $item = $this->members[$key];
-        if (!$item->parameters->isEmpty()) {
-            throw new ForbiddenStateError('Parameters instances can not contain parameterized Items.');
-        }
-
-        return $item;
+        return $this->validateMember($this->members[$key]);
     }
 
     /**
@@ -217,12 +218,7 @@ public function value(string $key): Token|ByteSequence|float|int|bool|string|nul
             return null;
         }
 
-        $item = $this->members[$key];
-        if (!$item->parameters->isEmpty()) {
-            throw new ForbiddenStateError('Parameters instances can not contain parameterized Items.');
-        }
-
-        return $item->value;
+        return $this->validateMember($this->members[$key])->value;
     }
 
     /**
@@ -259,12 +255,15 @@ public function pair(int $index): array
             throw InvalidOffset::dueToIndexNotFound($index);
         }
 
-        $item = array_values($this->members)[$offset];
-        if (!$item->parameters->isEmpty()) {
-            throw new ForbiddenStateError('Parameters instances can not contain parameterized Items.');
+        foreach ($this->toPairs() as $k => $pair) {
+            if ($k === $offset) {
+                return $pair;
+            }
         }
 
-        return [array_keys($this->members)[$offset], $item];
+        // @codeCoverageIgnoreStart
+        throw InvalidOffset::dueToIndexNotFound($index);
+        // @codeCoverageIgnoreEnd
     }
 
     /**

src/ParametersTest.php

@@ -270,4 +270,14 @@ public function it_can_return_bare_items_values(): void
         self::assertSame('helloWorld', $instance->value('string'));
         self::assertSame(['string' => 'helloWorld', 'boolean' => true], $instance->values());
     }
+
+    /**
+     * @test
+     */
+    public function it_fails_to_parse_invalid_parameters_pairs(): void
+    {
+        $this->expectException(SyntaxError::class);
+
+        Parameters::fromHttpValue(';foo =  bar');
+    }
 }