Improve interface return type

nyamsprod · nyamsprod · commit e3e50dc6e6b5 · 2023-01-27T20:35:29.000+01:00
diff --git a/src/Dictionary.php b/src/Dictionary.php
@@ -209,7 +209,7 @@ public function pair(int $index): array
     /**
      * @throws SyntaxError If the string key is not a valid
      */
-    public function set(string $key, StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool $member): self
+    public function set(string $key, StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool $member): static
     {
         $this->members[MapKey::fromString($key)->value] = self::filterMember($member);
 
@@ -225,7 +225,7 @@ private static function filterMember(StructuredField|Token|ByteSequence|DateTime
         };
     }
 
-    public function delete(string ...$keys): self
+    public function delete(string ...$keys): static
     {
         foreach ($keys as $key) {
             unset($this->members[$key]);
@@ -234,21 +234,21 @@ public function delete(string ...$keys): self
         return $this;
     }
 
-    public function clear(): self
+    public function clear(): static
     {
         $this->members = [];
 
         return $this;
     }
 
-    public function append(string $key, StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool $member): self
+    public function append(string $key, StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool $member): static
     {
         unset($this->members[$key]);
 
         return $this->set($key, $member);
     }
 
-    public function prepend(string $key, StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool $member): self
+    public function prepend(string $key, StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool $member): static
     {
         unset($this->members[$key]);
 
@@ -260,7 +260,7 @@ public function prepend(string $key, StructuredField|Token|ByteSequence|DateTime
     /**
      * @param iterable<string, InnerList<int, Value>|Value|DataType> ...$others
      */
-    public function mergeAssociative(iterable ...$others): self
+    public function mergeAssociative(iterable ...$others): static
     {
         foreach ($others as $other) {
             $this->members = [...$this->members, ...self::fromAssociative($other)->members];
@@ -272,7 +272,7 @@ public function mergeAssociative(iterable ...$others): self
     /**
      * @param MemberOrderedMap<string, Value|InnerList<int, Value>>|iterable<array{0:string, 1:InnerList<int, Value>|Value|DataType}> ...$others
      */
-    public function mergePairs(MemberOrderedMap|iterable ...$others): self
+    public function mergePairs(MemberOrderedMap|iterable ...$others): static
     {
         foreach ($others as $other) {
             $this->members = [...$this->members, ...self::fromPairs($other)->members];
diff --git a/src/InnerList.php b/src/InnerList.php
@@ -33,7 +33,7 @@ private function __construct(private readonly Parameters $parameters, iterable $
     /**
      * Returns a new instance.
      */
-    public static function from(Value|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool ...$members): self
+    public static function from(Value|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool ...$members): static
     {
         return new self(Parameters::create(), $members);
     }
@@ -147,7 +147,7 @@ public function get(string|int $offset): Value
     /**
      * Insert members at the beginning of the list.
      */
-    public function unshift(StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool ...$members): self
+    public function unshift(StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool ...$members): static
     {
         $this->members = [...array_map(self::filterMember(...), array_values($members)), ...$this->members];
 
@@ -157,7 +157,7 @@ public function unshift(StructuredField|Token|ByteSequence|DateTimeInterface|Str
     /**
      * Insert members at the end of the list.
      */
-    public function push(StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool ...$members): self
+    public function push(StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool ...$members): static
     {
         $this->members = [...$this->members, ...array_map(self::filterMember(...), array_values($members))];
 
@@ -178,7 +178,7 @@ private static function filterMember(StructuredField|Token|ByteSequence|DateTime
      *
      * @throws InvalidOffset If the index does not exist
      */
-    public function insert(int $index, StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool ...$members): self
+    public function insert(int $index, StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool ...$members): static
     {
         $offset = $this->filterIndex($index);
         match (true) {
@@ -191,7 +191,7 @@ public function insert(int $index, StructuredField|Token|ByteSequence|DateTimeIn
         return $this;
     }
 
-    public function replace(int $index, StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool $member): self
+    public function replace(int $index, StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool $member): static
     {
         if (null === ($offset = $this->filterIndex($index))) {
             throw InvalidOffset::dueToIndexNotFound($index);
@@ -205,7 +205,7 @@ public function replace(int $index, StructuredField|Token|ByteSequence|DateTimeI
     /**
      * Delete members associated with the list of instance indexes.
      */
-    public function remove(int ...$indexes): self
+    public function remove(int ...$indexes): static
     {
         $offsets = array_filter(
             array_map(fn (int $index): int|null => $this->filterIndex($index), $indexes),
@@ -219,7 +219,7 @@ public function remove(int ...$indexes): self
         return $this;
     }
 
-    public function clear(): self
+    public function clear(): static
     {
         $this->members = [];
 
diff --git a/src/MemberContainer.php b/src/MemberContainer.php
@@ -29,10 +29,8 @@ public function hasMembers(): bool;
 
     /**
      * Removes all members from the instance.
-     *
-     * @return self<TKey, TValue>
      */
-    public function clear(): self;
+    public function clear(): static;
 
     /**
      * @return Iterator<TKey, TValue>
diff --git a/src/MemberList.php b/src/MemberList.php
@@ -13,38 +13,28 @@ interface MemberList extends MemberContainer
 {
     /**
      * Inserts members at the beginning of the list.
-     *
-     * @return MemberList<TKey, TValue>
      */
-    public function unshift(StructuredField ...$members): self;
+    public function unshift(StructuredField ...$members): static;
 
     /**
      * Inserts members at the end of the list.
-     *
-     * @return MemberList<TKey, TValue>
      */
-    public function push(StructuredField ...$members): self;
+    public function push(StructuredField ...$members): static;
 
     /**
      * Inserts members at the index.
      *
      * @throws InvalidOffset If the index does not exist
-     *
-     * @return MemberList<TKey, TValue>
      */
-    public function insert(int $index, StructuredField ...$members): self;
+    public function insert(int $index, StructuredField ...$members): static;
 
     /**
      * Replaces the member associated with the index.
-     *
-     * @return MemberList<TKey, TValue>
      */
-    public function replace(int $index, StructuredField $member): self;
+    public function replace(int $index, StructuredField $member): static;
 
     /**
      * Deletes members associated with the given indexes.
-     *
-     * @return MemberList<TKey, TValue>
      */
-    public function remove(int ...$indexes): self;
+    public function remove(int ...$indexes): static;
 }
diff --git a/src/MemberOrderedMap.php b/src/MemberOrderedMap.php
@@ -46,51 +46,39 @@ public function keys(): array;
      * Adds a member at the end of the instance otherwise updates the value associated with the key if already present.
      *
      * @throws SyntaxError If the string key is not a valid
-     *
-     * @return MemberOrderedMap<TKey, TValue>
      */
-    public function set(string $key, StructuredField $member): self;
+    public function set(string $key, StructuredField $member): static;
 
     /**
      * Deletes members associated with the list of submitted keys.
-     *
-     * @return MemberOrderedMap<TKey, TValue>
      */
-    public function delete(string ...$keys): self;
+    public function delete(string ...$keys): static;
 
     /**
      * Adds a member at the end of the instance and deletes any previous reference to the key if present.
      *
      * @throws SyntaxError If the string key is not a valid
-     *
-     * @return MemberOrderedMap<TKey, TValue>
      */
-    public function append(string $key, StructuredField $member): self;
+    public function append(string $key, StructuredField $member): static;
 
     /**
      * Adds a member at the beginning of the instance and deletes any previous reference to the key if present.
      *
      * @throws SyntaxError If the string key is not a valid
-     *
-     * @return MemberOrderedMap<TKey, TValue>
      */
-    public function prepend(string $key, StructuredField $member): self;
+    public function prepend(string $key, StructuredField $member): static;
 
     /**
      * Merges multiple instances using iterable associative structures.
      *
      * @param iterable<TKey, TValue> ...$others
-     *
-     * @return MemberOrderedMap<TKey, TValue>
      */
-    public function mergeAssociative(iterable ...$others): self;
+    public function mergeAssociative(iterable ...$others): static;
 
     /**
      * Merges multiple instances using iterable pairs.
      *
      * @param MemberOrderedMap<TKey, TValue>|iterable<array{0:TKey, 1:TValue}> ...$others
-     *
-     * @return MemberOrderedMap<TKey, TValue>
      */
-    public function mergePairs(MemberOrderedMap|iterable ...$others): self;
+    public function mergePairs(MemberOrderedMap|iterable ...$others): static;
 }
diff --git a/src/OrderedList.php b/src/OrderedList.php
@@ -130,7 +130,7 @@ public function get(string|int $offset): Value|InnerList
     /**
      * Inserts members at the beginning of the list.
      */
-    public function unshift(StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool ...$members): self
+    public function unshift(StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool ...$members): static
     {
         $this->members = [...array_map(self::filterMember(...), array_values($members)), ...$this->members];
 
@@ -140,7 +140,7 @@ public function unshift(StructuredField|Token|ByteSequence|DateTimeInterface|Str
     /**
      * Inserts members at the end of the list.
      */
-    public function push(StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool ...$members): self
+    public function push(StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool ...$members): static
     {
         $this->members = [...$this->members, ...array_map(self::filterMember(...), array_values($members))];
 
@@ -152,7 +152,7 @@ public function push(StructuredField|Token|ByteSequence|DateTimeInterface|String
      *
      * @throws InvalidOffset If the index does not exist
      */
-    public function insert(int $index, StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool ...$members): self
+    public function insert(int $index, StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool ...$members): static
     {
         $offset = $this->filterIndex($index);
         match (true) {
@@ -170,7 +170,7 @@ public function insert(int $index, StructuredField|Token|ByteSequence|DateTimeIn
      *
      * @throws InvalidOffset If the index does not exist
      */
-    public function replace(int $index, StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool $member): self
+    public function replace(int $index, StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool $member): static
     {
         if (null === ($offset = $this->filterIndex($index))) {
             throw InvalidOffset::dueToIndexNotFound($index);
@@ -184,7 +184,7 @@ public function replace(int $index, StructuredField|Token|ByteSequence|DateTimeI
     /**
      * Deletes members associated with the list of instance indexes.
      */
-    public function remove(int ...$indexes): self
+    public function remove(int ...$indexes): static
     {
         $offsets = array_filter(
             array_map(fn (int $index): int|null => $this->filterIndex($index), $indexes),
@@ -198,7 +198,7 @@ public function remove(int ...$indexes): self
         return $this;
     }
 
-    public function clear(): self
+    public function clear(): static
     {
         $this->members = [];
 
diff --git a/src/Parameters.php b/src/Parameters.php
@@ -227,7 +227,7 @@ public function pair(int $index): array
     /**
      * Adds a member at the end of the instance otherwise updates the value associated with the key if already present.
      */
-    public function set(string $key, StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool $member): self
+    public function set(string $key, StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool $member): static
     {
         $this->members[MapKey::fromString($key)->value] = self::filterMember($member);
 
@@ -246,7 +246,7 @@ private static function filterMember(StructuredField|Token|ByteSequence|DateTime
     /**
      * Deletes members associated with the list of submitted keys.
      */
-    public function delete(string ...$keys): self
+    public function delete(string ...$keys): static
     {
         foreach ($keys as $key) {
             unset($this->members[$key]);
@@ -255,7 +255,7 @@ public function delete(string ...$keys): self
         return $this;
     }
 
-    public function clear(): self
+    public function clear(): static
     {
         $this->members = [];
 
@@ -265,7 +265,7 @@ public function clear(): self
     /**
      * Adds a member at the end of the instance and deletes any previous reference to the key if present.
      */
-    public function append(string $key, StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool $member): self
+    public function append(string $key, StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool $member): static
     {
         unset($this->members[$key]);
 
@@ -275,7 +275,7 @@ public function append(string $key, StructuredField|Token|ByteSequence|DateTimeI
     /**
      * Adds a member at the beginning of the instance and deletes any previous reference to the key if present.
      */
-    public function prepend(string $key, StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool $member): self
+    public function prepend(string $key, StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool $member): static
     {
         unset($this->members[$key]);
 
@@ -289,7 +289,7 @@ public function prepend(string $key, StructuredField|Token|ByteSequence|DateTime
      *
      * @param iterable<string, Value|DataType> ...$others
      */
-    public function mergeAssociative(iterable ...$others): self
+    public function mergeAssociative(iterable ...$others): static
     {
         foreach ($others as $other) {
             $this->members = [...$this->members, ...self::fromAssociative($other)->members];
@@ -303,7 +303,7 @@ public function mergeAssociative(iterable ...$others): self
      *
      * @param MemberOrderedMap<string, Value>|iterable<array{0:string, 1:Value|DataType}> ...$others
      */
-    public function mergePairs(MemberOrderedMap|iterable ...$others): self
+    public function mergePairs(MemberOrderedMap|iterable ...$others): static
     {
         foreach ($others as $other) {
             $this->members = [...$this->members, ...self::fromPairs($other)->members];

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ public function pair(int $index): array`
`209`	`209`	`/**`
`210`	`210`	`* @throws SyntaxError If the string key is not a valid`
`211`	`211`	`*/`
`212`		`- public function set(string $key, StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool $member): self`
	`212`	`+ public function set(string $key, StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool $member): static`
`213`	`213`	`{`
`214`	`214`	`$this->members[MapKey::fromString($key)->value] = self::filterMember($member);`
`215`	`215`
`@@ -225,7 +225,7 @@ private static function filterMember(StructuredField\|Token\|ByteSequence\|DateTime`
`225`	`225`	`};`
`226`	`226`	`}`
`227`	`227`
`228`		`- public function delete(string ...$keys): self`
	`228`	`+ public function delete(string ...$keys): static`
`229`	`229`	`{`
`230`	`230`	`foreach ($keys as $key) {`
`231`	`231`	`unset($this->members[$key]);`
`@@ -234,21 +234,21 @@ public function delete(string ...$keys): self`
`234`	`234`	`return $this;`
`235`	`235`	`}`
`236`	`236`
`237`		`- public function clear(): self`
	`237`	`+ public function clear(): static`
`238`	`238`	`{`
`239`	`239`	`$this->members = [];`
`240`	`240`
`241`	`241`	`return $this;`
`242`	`242`	`}`
`243`	`243`
`244`		`- public function append(string $key, StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool $member): self`
	`244`	`+ public function append(string $key, StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool $member): static`
`245`	`245`	`{`
`246`	`246`	`unset($this->members[$key]);`
`247`	`247`
`248`	`248`	`return $this->set($key, $member);`
`249`	`249`	`}`
`250`	`250`
`251`		`- public function prepend(string $key, StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool $member): self`
	`251`	`+ public function prepend(string $key, StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool $member): static`
`252`	`252`	`{`
`253`	`253`	`unset($this->members[$key]);`
`254`	`254`
`@@ -260,7 +260,7 @@ public function prepend(string $key, StructuredField\|Token\|ByteSequence\|DateTime`
`260`	`260`	`/**`
`261`	`261`	`* @param iterable<string, InnerList<int, Value>\|Value\|DataType> ...$others`
`262`	`262`	`*/`
`263`		`- public function mergeAssociative(iterable ...$others): self`
	`263`	`+ public function mergeAssociative(iterable ...$others): static`
`264`	`264`	`{`
`265`	`265`	`foreach ($others as $other) {`
`266`	`266`	`$this->members = [...$this->members, ...self::fromAssociative($other)->members];`
`@@ -272,7 +272,7 @@ public function mergeAssociative(iterable ...$others): self`
`272`	`272`	`/**`
`273`	`273`	`* @param MemberOrderedMap<string, Value\|InnerList<int, Value>>\|iterable<array{0:string, 1:InnerList<int, Value>\|Value\|DataType}> ...$others`
`274`	`274`	`*/`
`275`		`- public function mergePairs(MemberOrderedMap\|iterable ...$others): self`
	`275`	`+ public function mergePairs(MemberOrderedMap\|iterable ...$others): static`
`276`	`276`	`{`
`277`	`277`	`foreach ($others as $other) {`
`278`	`278`	`$this->members = [...$this->members, ...self::fromPairs($other)->members];`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ private function __construct(private readonly Parameters $parameters, iterable $`
`33`	`33`	`/**`
`34`	`34`	`* Returns a new instance.`
`35`	`35`	`*/`
`36`		`- public static function from(Value\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool ...$members): self`
	`36`	`+ public static function from(Value\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool ...$members): static`
`37`	`37`	`{`
`38`	`38`	`return new self(Parameters::create(), $members);`
`39`	`39`	`}`
`@@ -147,7 +147,7 @@ public function get(string\|int $offset): Value`
`147`	`147`	`/**`
`148`	`148`	`* Insert members at the beginning of the list.`
`149`	`149`	`*/`
`150`		`- public function unshift(StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool ...$members): self`
	`150`	`+ public function unshift(StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool ...$members): static`
`151`	`151`	`{`
`152`	`152`	`$this->members = [...array_map(self::filterMember(...), array_values($members)), ...$this->members];`
`153`	`153`
`@@ -157,7 +157,7 @@ public function unshift(StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Str`
`157`	`157`	`/**`
`158`	`158`	`* Insert members at the end of the list.`
`159`	`159`	`*/`
`160`		`- public function push(StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool ...$members): self`
	`160`	`+ public function push(StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool ...$members): static`
`161`	`161`	`{`
`162`	`162`	`$this->members = [...$this->members, ...array_map(self::filterMember(...), array_values($members))];`
`163`	`163`
`@@ -178,7 +178,7 @@ private static function filterMember(StructuredField\|Token\|ByteSequence\|DateTime`
`178`	`178`	`*`
`179`	`179`	`* @throws InvalidOffset If the index does not exist`
`180`	`180`	`*/`
`181`		`- public function insert(int $index, StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool ...$members): self`
	`181`	`+ public function insert(int $index, StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool ...$members): static`
`182`	`182`	`{`
`183`	`183`	`$offset = $this->filterIndex($index);`
`184`	`184`	`match (true) {`
`@@ -191,7 +191,7 @@ public function insert(int $index, StructuredField\|Token\|ByteSequence\|DateTimeIn`
`191`	`191`	`return $this;`
`192`	`192`	`}`
`193`	`193`
`194`		`- public function replace(int $index, StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool $member): self`
	`194`	`+ public function replace(int $index, StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool $member): static`
`195`	`195`	`{`
`196`	`196`	`if (null === ($offset = $this->filterIndex($index))) {`
`197`	`197`	`throw InvalidOffset::dueToIndexNotFound($index);`
`@@ -205,7 +205,7 @@ public function replace(int $index, StructuredField\|Token\|ByteSequence\|DateTimeI`
`205`	`205`	`/**`
`206`	`206`	`* Delete members associated with the list of instance indexes.`
`207`	`207`	`*/`
`208`		`- public function remove(int ...$indexes): self`
	`208`	`+ public function remove(int ...$indexes): static`
`209`	`209`	`{`
`210`	`210`	`$offsets = array_filter(`
`211`	`211`	`array_map(fn (int $index): int\|null => $this->filterIndex($index), $indexes),`
`@@ -219,7 +219,7 @@ public function remove(int ...$indexes): self`
`219`	`219`	`return $this;`
`220`	`220`	`}`
`221`	`221`
`222`		`- public function clear(): self`
	`222`	`+ public function clear(): static`
`223`	`223`	`{`
`224`	`224`	`$this->members = [];`
`225`	`225`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ public function get(string\|int $offset): Value\|InnerList`
`130`	`130`	`/**`
`131`	`131`	`* Inserts members at the beginning of the list.`
`132`	`132`	`*/`
`133`		`- public function unshift(StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool ...$members): self`
	`133`	`+ public function unshift(StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool ...$members): static`
`134`	`134`	`{`
`135`	`135`	`$this->members = [...array_map(self::filterMember(...), array_values($members)), ...$this->members];`
`136`	`136`
`@@ -140,7 +140,7 @@ public function unshift(StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Str`
`140`	`140`	`/**`
`141`	`141`	`* Inserts members at the end of the list.`
`142`	`142`	`*/`
`143`		`- public function push(StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool ...$members): self`
	`143`	`+ public function push(StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool ...$members): static`
`144`	`144`	`{`
`145`	`145`	`$this->members = [...$this->members, ...array_map(self::filterMember(...), array_values($members))];`
`146`	`146`
`@@ -152,7 +152,7 @@ public function push(StructuredField\|Token\|ByteSequence\|DateTimeInterface\|String`
`152`	`152`	`*`
`153`	`153`	`* @throws InvalidOffset If the index does not exist`
`154`	`154`	`*/`
`155`		`- public function insert(int $index, StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool ...$members): self`
	`155`	`+ public function insert(int $index, StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool ...$members): static`
`156`	`156`	`{`
`157`	`157`	`$offset = $this->filterIndex($index);`
`158`	`158`	`match (true) {`
`@@ -170,7 +170,7 @@ public function insert(int $index, StructuredField\|Token\|ByteSequence\|DateTimeIn`
`170`	`170`	`*`
`171`	`171`	`* @throws InvalidOffset If the index does not exist`
`172`	`172`	`*/`
`173`		`- public function replace(int $index, StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool $member): self`
	`173`	`+ public function replace(int $index, StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool $member): static`
`174`	`174`	`{`
`175`	`175`	`if (null === ($offset = $this->filterIndex($index))) {`
`176`	`176`	`throw InvalidOffset::dueToIndexNotFound($index);`
`@@ -184,7 +184,7 @@ public function replace(int $index, StructuredField\|Token\|ByteSequence\|DateTimeI`
`184`	`184`	`/**`
`185`	`185`	`* Deletes members associated with the list of instance indexes.`
`186`	`186`	`*/`
`187`		`- public function remove(int ...$indexes): self`
	`187`	`+ public function remove(int ...$indexes): static`
`188`	`188`	`{`
`189`	`189`	`$offsets = array_filter(`
`190`	`190`	`array_map(fn (int $index): int\|null => $this->filterIndex($index), $indexes),`
`@@ -198,7 +198,7 @@ public function remove(int ...$indexes): self`
`198`	`198`	`return $this;`
`199`	`199`	`}`
`200`	`200`
`201`		`- public function clear(): self`
	`201`	`+ public function clear(): static`
`202`	`202`	`{`
`203`	`203`	`$this->members = [];`
`204`	`204`
Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ public function pair(int $index): array`
`227`	`227`	`/**`
`228`	`228`	`* Adds a member at the end of the instance otherwise updates the value associated with the key if already present.`
`229`	`229`	`*/`
`230`		`- public function set(string $key, StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool $member): self`
	`230`	`+ public function set(string $key, StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool $member): static`
`231`	`231`	`{`
`232`	`232`	`$this->members[MapKey::fromString($key)->value] = self::filterMember($member);`
`233`	`233`
`@@ -246,7 +246,7 @@ private static function filterMember(StructuredField\|Token\|ByteSequence\|DateTime`
`246`	`246`	`/**`
`247`	`247`	`* Deletes members associated with the list of submitted keys.`
`248`	`248`	`*/`
`249`		`- public function delete(string ...$keys): self`
	`249`	`+ public function delete(string ...$keys): static`
`250`	`250`	`{`
`251`	`251`	`foreach ($keys as $key) {`
`252`	`252`	`unset($this->members[$key]);`
`@@ -255,7 +255,7 @@ public function delete(string ...$keys): self`
`255`	`255`	`return $this;`
`256`	`256`	`}`
`257`	`257`
`258`		`- public function clear(): self`
	`258`	`+ public function clear(): static`
`259`	`259`	`{`
`260`	`260`	`$this->members = [];`
`261`	`261`
`@@ -265,7 +265,7 @@ public function clear(): self`
`265`	`265`	`/**`
`266`	`266`	`* Adds a member at the end of the instance and deletes any previous reference to the key if present.`
`267`	`267`	`*/`
`268`		`- public function append(string $key, StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool $member): self`
	`268`	`+ public function append(string $key, StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool $member): static`
`269`	`269`	`{`
`270`	`270`	`unset($this->members[$key]);`
`271`	`271`
`@@ -275,7 +275,7 @@ public function append(string $key, StructuredField\|Token\|ByteSequence\|DateTimeI`
`275`	`275`	`/**`
`276`	`276`	`* Adds a member at the beginning of the instance and deletes any previous reference to the key if present.`
`277`	`277`	`*/`
`278`		`- public function prepend(string $key, StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool $member): self`
	`278`	`+ public function prepend(string $key, StructuredField\|Token\|ByteSequence\|DateTimeInterface\|Stringable\|string\|int\|float\|bool $member): static`
`279`	`279`	`{`
`280`	`280`	`unset($this->members[$key]);`
`281`	`281`
`@@ -289,7 +289,7 @@ public function prepend(string $key, StructuredField\|Token\|ByteSequence\|DateTime`
`289`	`289`	`*`
`290`	`290`	`* @param iterable<string, Value\|DataType> ...$others`
`291`	`291`	`*/`
`292`		`- public function mergeAssociative(iterable ...$others): self`
	`292`	`+ public function mergeAssociative(iterable ...$others): static`
`293`	`293`	`{`
`294`	`294`	`foreach ($others as $other) {`
`295`	`295`	`$this->members = [...$this->members, ...self::fromAssociative($other)->members];`
`@@ -303,7 +303,7 @@ public function mergeAssociative(iterable ...$others): self`
`303`	`303`	`*`
`304`	`304`	`* @param MemberOrderedMap<string, Value>\|iterable<array{0:string, 1:Value\|DataType}> ...$others`
`305`	`305`	`*/`
`306`		`- public function mergePairs(MemberOrderedMap\|iterable ...$others): self`
	`306`	`+ public function mergePairs(MemberOrderedMap\|iterable ...$others): static`
`307`	`307`	`{`
`308`	`308`	`foreach ($others as $other) {`
`309`	`309`	`$this->members = [...$this->members, ...self::fromPairs($other)->members];`