Improve Container implementation

Author: nyamsprod

src/Dictionary.php

@@ -26,16 +26,19 @@
 final class Dictionary implements MemberOrderedMap
 {
     /** @var array<string, Value|(MemberList<int, Value>&ParameterAccess)> */
-    private array $members = [];
+    private readonly array $members;
 
     /**
      * @param iterable<string, (MemberList<int, Value>&ParameterAccess)|iterable<Value|DataType>|Value|DataType> $members
      */
     private function __construct(iterable $members = [])
     {
+        $filteredMembers = [];
         foreach ($members as $key => $member) {
-            $this->members[MapKey::fromString($key)->value] = self::filterMember($member);
+            $filteredMembers[MapKey::fromString($key)->value] = self::filterMember($member);
         }
+
+        $this->members = $filteredMembers;
     }
 
     /**
@@ -107,7 +110,7 @@ public static function fromHttpValue(Stringable|string $httpValue): self
     {
         return new self((function (iterable $pairs) {
             foreach ($pairs as $key => $value) {
-                yield $key => is_array($value) ? InnerList::fromMembers(...$value[0])->withParameters(Parameters::fromAssociative($value[1])) : $value;
+                yield $key => is_array($value) ? InnerList::fromAssociativeParameters($value[1], ...$value[0]) : $value;
             }
         })(Parser::parseDictionary($httpValue)));
     }

src/InnerList.php

@@ -80,8 +80,7 @@ public static function fromHttpValue(Stringable|string $httpValue): self
     {
         [$members, $parameters] = [...Parser::parseInnerList($httpValue)];
 
-        return self::fromMembers(...$members)
-            ->withParameters(Parameters::fromAssociative($parameters));
+        return self::fromAssociativeParameters($parameters, ...$members);
     }
 
     public function parameters(): Parameters

src/InnerListTest.php

@@ -16,8 +16,7 @@ public function it_can_be_instantiated_with_an_collection_of_item(): void
         $stringItem = Item::from('helloWorld');
         $booleanItem = Item::from(true);
         $arrayParams = [$stringItem, $booleanItem];
-        $instance = InnerList::fromMembers(...$arrayParams)
-            ->withParameters(Parameters::fromAssociative(['test' => Item::from(42)]));
+        $instance = InnerList::fromAssociativeParameters(['test' => Item::from(42)], ...$arrayParams);
 
         self::assertSame($stringItem, $instance->get(0));
         self::assertTrue($instance->hasMembers());
@@ -202,7 +201,7 @@ public function it_can_create_via_with_parameters_method_a_new_object(): void
     #[Test]
     public function it_can_create_via_parameters_access_methods_a_new_object(): void
     {
-        $instance1 = InnerList::fromMembers(Token::fromString('babayaga'), 'a', true)->withParameters(Parameters::fromAssociative(['a' => true]));
+        $instance1 = InnerList::fromAssociativeParameters(['a' => true], Token::fromString('babayaga'), 'a', true);
         $instance2 = $instance1->appendParameter('a', true);
         $instance7 = $instance1->addParameter('a', true);
         $instance3 = $instance1->prependParameter('a', false);

src/OuterList.php

@@ -66,7 +66,7 @@ private static function filterMember(iterable|StructuredField|Token|ByteSequence
     public static function fromHttpValue(Stringable|string $httpValue): self
     {
         return self::fromMembers(...array_map(
-            fn (mixed $value) => is_array($value) ? InnerList::fromMembers(...$value[0])->withParameters(Parameters::fromAssociative($value[1])) : $value,
+            fn (mixed $value) => is_array($value) ? InnerList::fromAssociativeParameters($value[1], ...$value[0]) : $value,
             Parser::parseList($httpValue)
         ));
     }

src/Parameters.php

@@ -24,16 +24,19 @@
 final class Parameters implements MemberOrderedMap
 {
     /** @var array<string, Value> */
-    private array $members = [];
+    private readonly array $members;
 
     /**
      * @param iterable<string, Value|DataType> $members
      */
     private function __construct(iterable $members = [])
     {
+        $filteredMembers = [];
         foreach ($members as $key => $member) {
-            $this->members[MapKey::fromString($key)->value] = self::filterMember($member);
+            $filteredMembers[MapKey::fromString($key)->value] = self::filterMember($member);
         }
+
+        $this->members = $filteredMembers;
     }
 
     private static function filterMember(StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool $member): Value