Improve list class constructors

Author: nyamsprod

src/Dictionary.php

@@ -20,14 +20,8 @@ final class Dictionary implements MemberOrderedMap
     /** @var array<string, Item|InnerList<int, Item>> */
     private array $members = [];
 
-    /**
-     * @param iterable<string, InnerList<int, Item>|Item|DataType> $members
-     */
-    private function __construct(iterable $members = [])
+    private function __construct()
     {
-        foreach ($members as $key => $member) {
-            $this->set($key, $member);
-        }
     }
 
     /**
@@ -40,7 +34,12 @@ private function __construct(iterable $members = [])
      */
     public static function fromAssociative(iterable $members = []): self
     {
-        return new self($members);
+        $instance = new self();
+        foreach ($members as $key => $member) {
+            $instance->set($key, $member);
+        }
+
+        return $instance;
     }
 
     /**

src/InnerList.php

@@ -17,13 +17,10 @@
 final class InnerList implements MemberList, ParameterAccess
 {
     /** @var array<int, Item> */
-    private array $members;
+    private array $members = [];
 
-    private function __construct(
-        public readonly Parameters $parameters,
-        Item ...$members
-    ) {
-        $this->members = array_values($members);
+    private function __construct(public readonly Parameters $parameters)
+    {
     }
 
     public static function from(Item|ByteSequence|Token|bool|int|float|string ...$members): self
@@ -37,12 +34,12 @@ public static function from(Item|ByteSequence|Token|bool|int|float|string ...$me
      */
     public static function fromList(iterable $members = [], iterable $parameters = []): self
     {
-        $newMembers = [];
+        $instance = new self(Parameters::fromAssociative($parameters));
         foreach ($members as $member) {
-            $newMembers[] = self::filterMember($member);
+            $instance->push(self::filterMember($member));
         }
 
-        return new self(Parameters::fromAssociative($parameters), ...$newMembers);
+        return $instance;
     }
 
     private static function filterMember(StructuredField|ByteSequence|Token|bool|int|float|string $member): Item

src/OrderedList.php

@@ -19,11 +19,10 @@
 final class OrderedList implements MemberList
 {
     /** @var array<int, Item|InnerList<int, Item>>  */
-    private array $members;
+    private array $members = [];
 
-    private function __construct(Item|InnerList ...$members)
+    private function __construct()
     {
-        $this->members = array_values($members);
     }
 
     /**
@@ -41,12 +40,12 @@ public static function from(InnerList|Item|ByteSequence|Token|bool|int|float|str
      */
     public static function fromList(iterable $members = []): self
     {
-        $newMembers = [];
+        $instance = new self();
         foreach ($members as $member) {
-            $newMembers[] = self::filterMember($member);
+            $instance->push(self::filterMember($member));
         }
 
-        return new self(...$newMembers);
+        return $instance;
     }
 
     private static function filterMember(StructuredField|ByteSequence|Token|bool|int|float|string $member): InnerList|Item

src/Parameters.php

@@ -23,14 +23,8 @@ final class Parameters implements MemberOrderedMap
     /** @var array<string, Item> */
     private array $members = [];
 
-    /**
-     * @param iterable<string, Item|DataType> $members
-     */
-    private function __construct(iterable $members = [])
+    private function __construct()
     {
-        foreach ($members as $key => $value) {
-            $this->set($key, $value);
-        }
     }
 
     /**
@@ -73,7 +67,12 @@ private static function formatMember(StructuredField|ByteSequence|Token|bool|int
      */
     public static function fromAssociative(iterable $members = []): self
     {
-        return new self($members);
+        $instance = new self();
+        foreach ($members as $key => $member) {
+            $instance->set($key, $member);
+        }
+
+        return $instance;
     }
 
     /**