S Simplify Interfaces and add convenient methods

Author: nyamsprod

src/Dictionary.php

@@ -33,7 +33,7 @@ public function isObsolete(): bool
     {
         return match ($this) {
             self::Rfc9651 => false,
-            self::Rfc8941 => true,
+            default => true,
         };
     }
 

src/Ietf.php

@@ -6,9 +6,11 @@
 
 use ArrayAccess;
 use Closure;
+use Countable;
 use DateTimeImmutable;
 use DateTimeInterface;
 use Iterator;
+use IteratorAggregate;
 use Stringable;
 
 use function array_filter;
@@ -30,9 +32,10 @@
  * @phpstan-import-type SfItemInput from StructuredField
  * @phpstan-import-type SfInnerListPair from StructuredField
  *
- * @implements MemberList<int, Item>
+ * @implements  ArrayAccess<int, Item>
+ * @implements  IteratorAggregate<int, Item>
  */
-final class InnerList implements MemberList, ParameterAccess
+final class InnerList implements ArrayAccess, Countable, IteratorAggregate, ParameterAccess, StructuredField
 {
     /** @var list<Item> */
     private readonly array $members;
@@ -80,7 +83,7 @@ public static function fromHttpValue(Stringable|string $httpValue, ?Ietf $rfc =
      * Returns a new instance with an iter.
      *
      * @param iterable<SfItemInput> $value
-     * @param MemberOrderedMap<string, Item>|iterable<string, SfItemInput> $parameters
+     * @param Parameters|iterable<string, SfItemInput> $parameters
      */
     public static function fromAssociative(iterable $value, iterable $parameters): static
     {
@@ -94,7 +97,7 @@ public static function fromAssociative(iterable $value, iterable $parameters): s
     /**
      * @param array{
      *     0:iterable<SfItemInput>,
-     *     1:MemberOrderedMap<string, Item>|iterable<array{0:string, 1:SfItemInput}>
+     *     1:Parameters|iterable<array{0:string, 1:SfItemInput}>
      * } $pair
      */
     public static function fromPair(array $pair): static
@@ -149,7 +152,7 @@ public function __toString(): string
     }
 
     /**
-     * @return array{0:list<Item>, 1:MemberOrderedMap<string, Item>}
+     * @return array{0:list<Item>, 1:Parameters}
      */
     public function toPair(): array
     {
@@ -259,6 +262,11 @@ public function last(): ?StructuredField
         return $this->members[$this->filterIndex(-1)] ?? null;
     }
 
+    public function sortParameters(Closure $callback): static
+    {
+        return $this->withParameters($this->parameters()->sort($callback));
+    }
+
     /**
      * Inserts members at the beginning of the list.
      */
@@ -512,13 +520,8 @@ public function withoutAnyParameter(): static
         return $this->withParameters(Parameters::new());
     }
 
-    /**
-     * @deprecated since version 1.1
-     * @see ParameterAccess::withoutParameterByKeys()
-     * @codeCoverageIgnore
-     */
-    public function withoutParameter(string ...$keys): static
+    public function filterParameters(Closure $callback): static
     {
-        return $this->withoutParameterByKeys(...$keys);
+        return $this->withParameters($this->parameters()->filter($callback));
     }
 }

src/InnerList.php

@@ -4,6 +4,7 @@
 
 namespace Bakame\Http\StructuredFields;
 
+use Closure;
 use DateTimeImmutable;
 use DateTimeInterface;
 use DateTimeZone;
@@ -15,10 +16,9 @@
 /**
  * @see https://www.rfc-editor.org/rfc/rfc9651.html#section-3.3
  *
- * @phpstan-import-type SfType from StructuredField
  * @phpstan-import-type SfItemInput from StructuredField
- * @phpstan-import-type SfTypeInput from StructuredField
  * @phpstan-import-type SfItemPair from StructuredField
+ * @phpstan-import-type SfTypeInput from StructuredField
  */
 final class Item implements ParameterAccess, StructuredField
 {
@@ -68,10 +68,7 @@ public static function fromAssociative(ByteSequence|Token|DisplayString|DateTime
     }
 
     /**
-     * @param array{
-     *     0: SfType,
-     *     1: MemberOrderedMap<string, Item>|iterable<array{0:string, 1:SfItemInput}>
-     * } $pair
+     * @param array{0: SfTypeInput, 1: Parameters|iterable<array{0:string, 1:SfItemInput}>} $pair
      *
      * @throws SyntaxError If the pair or its content is not valid.
      */
@@ -87,7 +84,7 @@ public static function fromPair(array $pair): self
     /**
      * Returns a new bare instance from value.
      *
-     * @param SfTypeInput|array{0:SfType, 1:MemberOrderedMap<string, Item>|iterable<array{0:string, 1:SfItemInput}>} $value
+     * @param SfTypeInput|array{0:SfTypeInput, 1:Parameters|iterable<array{0:string, 1:SfItemInput}>} $value
      *
      * @throws SyntaxError If the value is not valid.
      */
@@ -314,7 +311,7 @@ public function __toString(): string
     }
 
     /**
-     * @return array{0:SfItemInput, 1:MemberOrderedMap<string, Item>}
+     * @return array{0:SfItemInput, 1:Parameters}
      */
     public function toPair(): array
     {
@@ -340,6 +337,11 @@ public function withValue(
         return new self($value, $this->parameters);
     }
 
+    public function sortParameters(Closure $callback): static
+    {
+        return $this->withParameters($this->parameters()->sort($callback));
+    }
+
     public function withParameters(Parameters $parameters): static
     {
         return $this->parameters->toHttpValue() === $parameters->toHttpValue() ? $this : new self($this->value, $parameters);
@@ -413,13 +415,8 @@ public function withoutAnyParameter(): static
         return $this->withParameters(Parameters::new());
     }
 
-    /**
-     * @deprecated since version 1.1
-     * @see ParameterAccess::withoutParameterByKeys()
-     * @codeCoverageIgnore
-     */
-    public function withoutParameter(string ...$keys): static
+    public function filterParameters(Closure $callback): static
     {
-        return $this->withoutParameterByKeys(...$keys);
+        return $this->withParameters($this->parameters()->filter($callback));
     }
 }