Update internal codebase for Ordered Map

Author: nyamsprod

src/Dictionary.php

@@ -140,6 +140,8 @@ public function has(string $key): bool
 
     public function get(string $key): Item|InnerList
     {
+        self::validateKey($key);
+
         if (!array_key_exists($key, $this->members)) {
             throw InvalidOffset::dueToKeyNotFound($key);
         }

src/OrderedList.php

@@ -47,6 +47,14 @@ public static function fromMembers(iterable $members = []): self
         return new self(...$newMembers);
     }
 
+    private static function filterMember(InnerList|Item|ByteSequence|Token|bool|int|float|string $member): InnerList|Item
+    {
+        return match (true) {
+            $member instanceof InnerList, $member instanceof Item => $member,
+            default => Item::from($member),
+        };
+    }
+
     /**
      * Returns an instance from an HTTP textual representation.
      *
@@ -116,14 +124,6 @@ public function unshift(InnerList|Item|ByteSequence|Token|bool|int|float|string
         $this->members = [...array_map(self::filterMember(...), $members), ...$this->members];
     }
 
-    private static function filterMember(InnerList|Item|ByteSequence|Token|bool|int|float|string $member): InnerList|Item
-    {
-        return match (true) {
-            $member instanceof InnerList, $member instanceof Item => $member,
-            default => Item::from($member),
-        };
-    }
-
     /**
      * Insert members at the end of the list.
      */
@@ -157,25 +157,30 @@ public function insert(
      */
     public function replace(int $index, InnerList|Item|ByteSequence|Token|bool|int|float|string $member): void
     {
-        if (!$this->has($index)) {
+        if (null === ($offset = $this->filterIndex($index))) {
             throw InvalidOffset::dueToIndexNotFound($index);
         }
 
-        $this->members[$this->filterIndex($index)] = self::filterMember($member);
+        $this->members[$offset] = self::filterMember($member);
     }
 
     /**
      * Delete members associated with the list of instance indexes.
      */
     public function remove(int ...$indexes): void
     {
-        foreach (array_map(fn (int $index): int|null => $this->filterIndex($index), $indexes) as $index) {
-            if (null !== $index) {
-                unset($this->members[$index]);
-            }
+        $offsets = array_filter(
+            array_map(fn (int $index): int|null => $this->filterIndex($index), $indexes),
+            fn (int|null $index): bool => null !== $index
+        );
+
+        foreach ($offsets as $offset) {
+            unset($this->members[$offset]);
         }
 
-        $this->members = array_values($this->members);
+        if ([] !== $offsets) {
+            $this->members = array_values($this->members);
+        }
     }
 
     /**

src/Parameters.php

@@ -167,6 +167,8 @@ public function has(string $key): bool
 
     public function get(string $key): Item
     {
+        self::validateKey($key);
+
         if (!array_key_exists($key, $this->members)) {
             throw InvalidOffset::dueToKeyNotFound($key);
         }
@@ -225,11 +227,16 @@ private static function filterMember(Item|ByteSequence|Token|bool|int|float|stri
         };
     }
 
-    private static function validate(string $key, Item $item): void
+    private static function validateKey(string $key): void
     {
         if (1 !== preg_match('/^[a-z*][a-z0-9.*_-]*$/', $key)) {
             throw new SyntaxError("The Parameters key `$key` contains invalid characters.");
         }
+    }
+
+    private static function validate(string $key, Item $item): void
+    {
+        self::validateKey($key);
 
         if (!$item->parameters()->isEmpty()) {
             throw new SyntaxError('Parameters instances can not contain parameterized Items.');