Bugfix Parameters:merge and InnerList::merge

Author: nyamsprod

README.md

@@ -74,9 +74,12 @@ The `toHttpValue` method returns the normalized string representation suited for
 
 #### Types
 
-Defined in the RFC, this package translates them to PHP native type when possible.
+Defined in the RFC, bare type are translated to PHP native type when possible. Two additional classes:
 
-The information is represented in the table below:
+- `Bakame\Http\StructuredFields\Token` and
+- `Bakame\Http\StructuredFields\ByteSequence`
+
+are used to represent non-native types as shown in the table below: 
 
 | HTTP DataType | Returned value       | validation method      |
 |---------------|----------------------|------------------------|
@@ -87,17 +90,10 @@ The information is represented in the table below:
 | Token         | class `Token`        | `Item::isToken`        |
 | Byte Sequence | class `ByteSequence` | `Item::isByteSequence` |
 
-Two additional classes:
-
-- `Bakame\Http\StructuredFields\Token` and
-- `Bakame\Http\StructuredFields\ByteSequence`
-
-are used to represent non-native types.
-
 #### Parameters
 
 As explain in the RFC, `Parameters` are containers of `Item` instances. It can be associated
-to other structure **BUT** the items it contains can not themselves contain `Parameters`
+to other structures **BUT** the items it contains can not themselves contain `Parameters`
 instance. More on parameters public API will be cover in subsequent paragraphs.
 
 #### Examples

src/InnerList.php

@@ -147,7 +147,10 @@ public function remove(int ...$indexes): void
     public function merge(self ...$others): void
     {
         foreach ($others as $other) {
-            $this->elements = [...$this->elements, ...$other->elements];
+            foreach ($other as $value) {
+                $this->push($value);
+                $this->parameters->merge($other->parameters());
+            }
         }
     }
 

src/InnerListTest.php

@@ -153,10 +153,10 @@ public function it_can_returns_the_container_element_keys(): void
      */
     public function it_can_merge_one_or_more_instances(): void
     {
-        $instance1 = new InnerList([Item::from(false)]);
-        $instance2 = new InnerList([Item::from(true)]);
-        $instance3 = new InnerList([Item::from(42)]);
-        $expected = new InnerList([Item::from(false), Item::from(true), Item::from(42)]);
+        $instance1 = new InnerList([false], ['foo' => 'bar']);
+        $instance2 = new InnerList([true]);
+        $instance3 = new InnerList([42], ['foo' => 'baz']);
+        $expected = new InnerList([false, true, 42], ['foo' => 'baz']);
 
         $instance1->merge($instance2, $instance3);
 
@@ -169,7 +169,7 @@ public function it_can_merge_one_or_more_instances(): void
      */
     public function it_can_merge_without_argument_and_not_throw(): void
     {
-        $instance = new InnerList([Item::from(false)]);
+        $instance = new InnerList([false]);
         $instance->merge();
         self::assertCount(1, $instance);
     }
@@ -179,10 +179,10 @@ public function it_can_merge_without_argument_and_not_throw(): void
      */
     public function it_can_merge_two_or_more_instances_to_yield_different_result(): void
     {
-        $instance1 = new InnerList([Item::from(false)]);
-        $instance2 = new InnerList([Item::from(true)]);
-        $instance3 = new InnerList([Item::from(42)]);
-        $expected = new InnerList([Item::from(42), Item::from(true), Item::from(false)]);
+        $instance1 = new InnerList([false], ['foo' => 'bar']);
+        $instance2 = new InnerList([true]);
+        $instance3 = new InnerList([42], ['foo' => 'baz']);
+        $expected = new InnerList([42, true, false], ['foo' => 'bar']);
 
         $instance3->merge($instance2, $instance1);
 

src/Parameters.php

@@ -208,7 +208,9 @@ public function prepend(string $key, Item|ByteSequence|Token|bool|int|float|stri
     public function merge(self ...$others): void
     {
         foreach ($others as $other) {
-            $this->elements = [...$this->elements, ...$other->elements];
+            foreach ($other as $key => $value) {
+                $this->set($key, $value);
+            }
         }
     }
 }