Adding SuportsParameters::parameter method

Author: nyamsprod

src/InnerList.php

@@ -7,6 +7,7 @@
 use Countable;
 use Iterator;
 use IteratorAggregate;
+use function array_filter;
 use function array_map;
 use function array_splice;
 use function array_values;
@@ -47,18 +48,32 @@ public static function fromMembers(iterable $members = [], iterable $parameters
         return new self(Parameters::fromAssociative($parameters), ...$newMembers);
     }
 
-    public function toHttpValue(): string
+    private static function filterMember(Item|ByteSequence|Token|bool|int|float|string $member): Item
     {
-        $returnArray = array_map(fn (Item $value): string => $value->toHttpValue(), $this->members);
+        return match (true) {
+            $member instanceof Item => $member,
+            default => Item::from($member),
+        };
+    }
 
-        return '('.implode(' ', $returnArray).')'.$this->parameters->toHttpValue();
+    public function toHttpValue(): string
+    {
+        return '('
+            .implode(' ', array_map(fn (Item $value): string => $value->toHttpValue(), $this->members))
+            .')'
+            .$this->parameters->toHttpValue();
     }
 
     public function parameters(): Parameters
     {
         return $this->parameters;
     }
 
+    public function parameter(string $key): Item|Token|ByteSequence|float|int|bool|string
+    {
+        return $this->parameters->get($key)->value();
+    }
+
     public function count(): int
     {
         return count($this->members);
@@ -113,14 +128,6 @@ public function unshift(Item|ByteSequence|Token|bool|int|float|string ...$member
         $this->members = [...array_map(self::filterMember(...), $members), ...$this->members];
     }
 
-    private static function filterMember(Item|ByteSequence|Token|bool|int|float|string $member): Item
-    {
-        return match (true) {
-            $member instanceof Item => $member,
-            default => Item::from($member),
-        };
-    }
-
     /**
      * Insert members at the end of the list.
      */
@@ -147,25 +154,30 @@ public function insert(int $index, Item|ByteSequence|Token|bool|int|float|string
 
     public function replace(int $index, Item|ByteSequence|Token|bool|int|float|string $member): void
     {
-        if (!$this->has($index)) {
+        if (null === ($offset = $this->filterIndex($index))) {
             throw InvalidOffset::dueToIndexNotFound($index);
         }
 
-        $this->members[$this->filterIndex($index)] = self::filterMember($member);
+        $this->members[$offset] = self::filterMember($member);
     }
 
     /**
      * Delete members associated with the list of instance indexes.
      */
     public function remove(int ...$indexes): void
     {
-        foreach (array_map(fn (int $index): int|null => $this->filterIndex($index), $indexes) as $index) {
-            if (null !== $index) {
-                unset($this->members[$index]);
-            }
+        $offsets = array_filter(
+            array_map(fn (int $index): int|null => $this->filterIndex($index), $indexes),
+            fn (int|null $index): bool => null !== $index
+        );
+
+        foreach ($offsets as $offset) {
+            unset($this->members[$offset]);
         }
 
-        $this->members = array_values($this->members);
+        if ([] !== $offsets) {
+            $this->members = array_values($this->members);
+        }
     }
 
     /**

src/InnerListTest.php

@@ -168,4 +168,25 @@ public function it_can_be_regenerated_with_eval(): void
 
         self::assertEquals($instance, $generatedInstance);
     }
+
+    /**
+     * @test
+     */
+    public function it_can_access_its_parameter_values(): void
+    {
+        $instance = InnerList::fromMembers([false], ['foo' => 'bar']);
+
+        self::assertSame('bar', $instance->parameter('foo'));
+    }
+
+    /**
+     * @test
+     */
+    public function it_fails_to_access_unknown_parameter_values(): void
+    {
+        $this->expectException(InvalidOffset::class);
+
+        $instance = InnerList::fromMembers([false], ['foo' => 'bar']);
+        $instance->parameter('bar');
+    }
 }

src/Item.php

@@ -273,6 +273,11 @@ public function parameters(): Parameters
         return $this->parameters;
     }
 
+    public function parameter(string $key): Item|Token|ByteSequence|float|int|bool|string
+    {
+        return $this->parameters->get($key)->value();
+    }
+
     public function isInteger(): bool
     {
         return is_int($this->value);

src/ItemTest.php

@@ -220,4 +220,25 @@ public function it_can_be_regenerated_with_eval(): void
 
         self::assertEquals($instance, $generatedInstance);
     }
+
+    /**
+     * @test
+     */
+    public function it_can_access_its_parameter_values(): void
+    {
+        $instance = Item::fromHttpValue('1; a; b=?0');
+
+        self::assertTrue($instance->parameter('a'));
+    }
+
+    /**
+     * @test
+     */
+    public function it_fails_to_access_unknown_parameter_values(): void
+    {
+        $this->expectException(InvalidOffset::class);
+
+        $instance = Item::fromHttpValue('1; a; b=?0');
+        $instance->parameter('bar');
+    }
 }

src/SupportsParameters.php

@@ -7,4 +7,10 @@
 interface SupportsParameters
 {
     public function parameters(): Parameters;
+
+    /**
+     * @throws SyntaxError   if the key used is invalid according to RFC8941
+     * @throws InvalidOffset If no value is found for the given key
+     */
+    public function parameter(string $key): Item|Token|ByteSequence|float|int|bool|string;
 }