Skip to content

Commit a23b0b9

Browse files
committed
Simplify internal codebase
1 parent d395cd4 commit a23b0b9

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

src/InnerList.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ private function __construct(private readonly Parameters $parameters)
3030
*/
3131
public static function from(Item|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool ...$members): self
3232
{
33-
return (new self(Parameters::create()))->push(...array_map(self::filterMember(...), $members));
33+
return (new self(Parameters::create()))->push(...$members);
3434
}
3535

3636
/**
@@ -41,7 +41,7 @@ public static function fromList(iterable $members, iterable $parameters = []): s
4141
{
4242
$instance = new self(Parameters::fromAssociative($parameters));
4343
foreach ($members as $member) {
44-
$instance->push(self::filterMember($member));
44+
$instance->push($member);
4545
}
4646

4747
return $instance;

src/OrderedList.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,17 @@ public static function fromList(iterable $members): self
4040
{
4141
$instance = new self();
4242
foreach ($members as $member) {
43-
$instance->push(self::filterMember($member));
43+
$instance->push($member);
4444
}
4545

4646
return $instance;
4747
}
4848

49-
private static function filterMember(InnerList|Item|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool $member): InnerList|Item
49+
private static function filterMember(StructuredField|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool $member): InnerList|Item
5050
{
5151
return match (true) {
5252
$member instanceof InnerList, $member instanceof Item => $member,
53+
$member instanceof StructuredField => throw new InvalidArgument('Expecting a "'.Item::class.'" or a "'.InnerList::class.'" instance; received a "'.$member::class.'" instead.'),
5354
default => Item::from($member),
5455
};
5556
}

src/Parameters.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,6 @@ public static function fromPairs(MemberOrderedMap|iterable $pairs): self
7575
return $instance;
7676
}
7777

78-
private static function filterMember(Item|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool $member): Item
79-
{
80-
return match (true) {
81-
$member instanceof Item && $member->parameters()->hasNoMembers() => $member,
82-
!$member instanceof Item => Item::from($member),
83-
default => throw new InvalidArgument('Parameters instances can only contain bare items.'),
84-
};
85-
}
86-
8778
/**
8879
* Returns an instance from an HTTP textual representation.
8980
*
@@ -241,6 +232,15 @@ public function set(string $key, StructuredField|Token|ByteSequence|DateTimeInte
241232
return $this;
242233
}
243234

235+
private static function filterMember(Item|Token|ByteSequence|DateTimeInterface|Stringable|string|int|float|bool $member): Item
236+
{
237+
return match (true) {
238+
$member instanceof Item && $member->parameters()->hasNoMembers() => $member,
239+
!$member instanceof Item => Item::from($member),
240+
default => throw new InvalidArgument('Parameters instances can only contain bare items.'),
241+
};
242+
}
243+
244244
/**
245245
* Deletes members associated with the list of submitted keys.
246246
*/

0 commit comments

Comments
 (0)