map and mapSelf : support $process with only one parameter

+ Simplify/Correct template declarations
+ Fix method signatures (self → static)

composer.json

@@ -2,10 +2,20 @@
     "name":              "jrosset/collections",
     "description":       "Classes for collections",
     "keywords":          [ ],
+    "type":              "library",
+
+    "config":            {
+        "sort-packages": true
+    },
+    "extra":             {
+        "branch-alias": {
+            "dev-master": "3.x-dev"
+        }
+    },
 
     "minimum-stability": "stable",
     "require":           {
-        "php": "^7.4 || ^8.0"
+        "php": "^8.1"
     },
     "autoload":          {
         "psr-4":                 {
@@ -30,4 +40,4 @@
         "docs":   "https://git.jrosset.ovh/jrosset/PhpCollections/wiki",
         "source": "https://git.jrosset.ovh/jrosset/PhpCollections"
     }
-}
+}

src/Collections/Collection.php

@@ -2,52 +2,55 @@
 
 namespace jrosset\Collections;
 
+use Closure;
+
 /**
  * A collection
  *
- * @psalm-template     TKey of array-key
- * @template-covariant TValue
- * @template-extends ImmutableCollection<TKey, TValue>
- * @template-implements ICollection<TKey, TValue>
+ * @template TKey of array-key
+ * @template TValue
+ *
+ * @implements ImmutableCollection<TKey, TValue>
+ * @implements ICollection<TKey, TValue>
  */
 class Collection extends ImmutableCollection implements ICollection {
     /**
      * @inheritDoc
      */
-    public function set ($key, $value): self {
+    public function set ($key, $value): static {
         return $this->_set($key, $value);
     }
     /**
      * @inheritDoc
      */
-    public function merge (IImmutableCollection ...$collections): ICollection {
+    public function merge (IImmutableCollection ...$collections): static {
         return $this->_merge(...$collections);
     }
 
     /**
      * @inheritDoc
      */
-    public function add (...$values): self {
+    public function add (...$values): static {
         return $this->_add(...$values);
     }
     /**
      * @inheritDoc
      */
-    public function addCollection (IImmutableCollection ...$collections): ICollection {
+    public function addCollection (IImmutableCollection ...$collections): static {
         return $this->_addCollection(...$collections);
     }
 
     /**
      * @inheritDoc
      */
-    public function prepend (...$values): ICollection {
+    public function prepend (...$values): static {
         array_unshift($this->elements, ...$values);
         return $this;
     }
     /**
      * @inheritDoc
      */
-    public function prependCollection (IImmutableCollection ...$collections): ICollection {
+    public function prependCollection (IImmutableCollection ...$collections): static {
         $prepend = array_merge(
             ...array_map(
                    function (IImmutableCollection $collection): array {
@@ -62,21 +65,21 @@ class Collection extends ImmutableCollection implements ICollection {
     /**
      * @inheritDoc
      */
-    public function clear (): self {
+    public function clear (): static {
         $this->_initialize();
         return $this;
     }
     /**
      * @inheritDoc
      */
-    public function remove ($key): self {
+    public function remove ($key): static {
         unset($this->elements[$this->_normalizeKey($key)]);
         return $this;
     }
     /**
      * @inheritDoc
      */
-    public function removeValue ($value, bool $strict = false): self {
+    public function removeValue ($value, bool $strict = false): static {
         foreach ($this->elements as $currentKey => $currentValue) {
             if (($strict && $value === $currentValue) || (!$strict && $value == $currentValue)) {
                 unset($this->elements[$currentKey]);
@@ -88,13 +91,86 @@ class Collection extends ImmutableCollection implements ICollection {
     /**
      * @inheritDoc
      */
-    public function offsetSet ($offset, $value): void {
+    public function removeFirst () {
+        $firstKey = $this->firstKey();
+        $firstValue = $this->get($firstKey);
+
+        $this->remove($firstKey);
+        return $firstValue;
+    }
+    /**
+     * @inheritDoc
+     */
+    public function removeLast () {
+        $lastKey = $this->lastKey();
+        $lastValue = $this->get($lastKey);
+
+        $this->remove($lastKey);
+        return $lastValue;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function offsetSet (mixed $offset, mixed $value): void {
         $this->set($offset, $value);
     }
     /**
      * @inheritDoc
      */
-    public function offsetUnset ($offset): void {
+    public function offsetUnset (mixed $offset): void {
         $this->remove($offset);
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function sliceSelf (int $offset, ?int $length = null): static {
+        if ($this->count() === 0) {
+            $this->elements = [];
+        }
+        else {
+            $this->_checkOffset($offset);
+            $this->elements = array_slice($this->elements, $offset, $length, true);
+        }
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function filterSelf (Closure $filter): static {
+        $this->elements = array_filter($this->elements, $filter);
+        return $this;
+    }
+    /**
+     * @inheritDoc
+     */
+    public function removeEmpties (): static {
+        return $this->filterSelf(function ($value) {
+            return empty($value);
+        });
+    }
+    /**
+     * @inheritDoc
+     */
+    public function mapSelf (Closure $process): static {
+        $this->elements = $this->map($process)->elements;
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function sortSelf (Closure|IComparator|null $sorter = null): static {
+        uasort($this->elements, self::_normalizeSorter($sorter));
+        return $this;
+    }
+    /**
+     * @inheritDoc
+     */
+    public function sortSelfByKey (Closure|IComparator $sorter): static {
+        uksort($this->elements, self::_normalizeSorter($sorter));
+        return $this;
+    }
 }

src/Collections/IArrayCast.php

@@ -5,15 +5,14 @@ namespace jrosset\Collections;
 /**
  * Interface for PHP-native array cast
  *
- * @psalm-template     TKey of array-key
- * @template-covariant TValue
+ * @template TKey of array-key
+ * @template TValue
  */
 interface IArrayCast {
     /**
      * Transform to a PHP-native array
      *
-     * @return array The native array
-     * @psalm-return array<TKey, TValue>
+     * @return array<TKey, TValue> The native array
      */
     public function toArray (): array;
 }

src/Collections/ICollection.php

@@ -2,98 +2,176 @@
 
 namespace jrosset\Collections;
 
+use Closure;
+use OutOfBoundsException;
+use Throwable;
+
 /**
  * Interface for a collection
  *
- * @psalm-template     TKey of array-key
- * @template-covariant TValue
- * @template-extends IImmutableCollection<TKey, TValue>
+ * @template TKey of array-key
+ * @template TValue
+ *
+ * @implements IImmutableCollection<TKey, TValue>
  */
 interface ICollection extends IImmutableCollection {
     /**
      * Set a value to a key
      *
-     * @param array-key    $key   The key
-     * @param mixed        $value The value
-     *
-     * @psalm-param TKey   $key
-     * @psalm-param TValue $value
+     * @param TKey   $key   The key
+     * @param TValue $value The value
      *
      * @return $this
      */
-    public function set ($key, $value): self;
+    public function set ($key, $value): static;
     /**
-     * Merge one or multiple collections in the current one
+     * Merge one or multiple collections into the current one
      *
-     * @param IImmutableCollection ...$collections The collections to merge
+     * @param IImmutableCollection<TKey, TValue> ...$collections The collections to merge
      *
      * @return $this
      */
-    public function merge (IImmutableCollection ...$collections): self;
+    public function merge (IImmutableCollection ...$collections): static;
 
     /**
      * Add one or multiple values
      *
-     * @param mixed        ...$values The values
-     *
-     * @psalm-param TValue ...$values
+     * @param TValue ...$values The values
      *
      * @return $this
      */
-    public function add (...$values): self;
+    public function add (...$values): static;
     /**
      * Add the <b>values</b> of one or multiple collections
      *
-     * @param IImmutableCollection ...$collections The collections to add
+     * @param IImmutableCollection<TKey, TValue> ...$collections The collections to add
      *
-     * @return mixed
+     * @return $this
      */
-    public function addCollection (IImmutableCollection ...$collections): self;
+    public function addCollection (IImmutableCollection ...$collections): static;
 
     /**
      * Add one or multiple values at the beginning of the current collection
      *
-     * @param mixed        ...$values The values
-     *
-     * @psalm-param TValue ...$values
+     * @param TValue ...$values The values
      *
      * @return $this
      */
-    public function prepend (...$values): self;
+    public function prepend (...$values): static;
     /**
      * Add the <b>values</b> of one or multiple collections at the beginning of the current collection
      *
-     * @param IImmutableCollection ...$collections The collections to add
+     * @param IImmutableCollection<TKey, TValue> ...$collections The collections to add
      *
-     * @return mixed
+     * @return $this
      */
-    public function prependCollection (IImmutableCollection ...$collections): self;
+    public function prependCollection (IImmutableCollection ...$collections): static;
 
     /**
-     * Empties the collection
+     * Empty the collection
      *
      * @return $this
      */
-    public function clear (): self;
+    public function clear (): static;
     /**
-     * Delete a key
+     * Remove a value from it's key
      *
-     * @param array-key  $key The key
-     *
-     * @psalm-param TKey $key
+     * @param TKey $key The key
      *
      * @return $this
      */
-    public function remove ($key): self;
+    public function remove ($key): static;
     /**
      * Delete all instances of a value
      *
-     * @param mixed        $value  The value
-     * @param bool         $strict Strict comparison ?
+     * @param TValue $value  The value
+     * @param bool   $strict Strict comparison ?
      *
-     * @psalm-param TValue $value
+     * @return $this
+     */
+    public function removeValue ($value, bool $strict = false): static;
+
+    /**
+     * Get and remove the first element
+     *
+     * @return TValue The value
+     *
+     * @throws OutOfBoundsException If the collection is empty
+     */
+    public function removeFirst ();
+    /**
+     * Get and remove the last element
+     *
+     * @return TValue The value
+     *
+     * @throws OutOfBoundsException If the collection is empty
+     */
+    public function removeLast ();
+
+    /**
+     * Keep only a slice of the collection
+     *
+     * Preserves the keys
+     *
+     * @param int      $offset The start offset
+     * @param int|null $length The maximum length. Null if until end of the collection
      *
      * @return $this
+     *
+     * @throws OutOfBoundsException If the offset is not valid
+     */
+    public function sliceSelf (int $offset, ?int $length = null): static;
+
+    /**
+     * Keep only elements that satisfy predicate $filter
+     *
+     * @param Closure(TKey, TValue):bool $filter The filtering predicate
+     *
+     * @return $this
+     */
+    public function filterSelf (Closure $filter): static;
+    /**
+     * Keep only non-empty elements
+     *
+     * Use {@see https://www.php.net/manual/function.empty.php empty} to check if element is empty or not
+     *
+     * @return $this
+     */
+    public function removeEmpties (): static;
+    /**
+     * Applied <b>$process</b> on all elements
+     *
+     * @param Closure(TKey, TValue): TValue $process The process function to apply on each element
+     *
+     * @return $this
+     */
+    public function mapSelf (Closure $process): static;
+
+    /**
+     * Sort the elements (by value)
+     *
+     * @param null|IComparator|Closure(TValue, TValue):int $sorter The sorting method ; Null if values are object implementing {@see IComparable}.
+     *                                                             <br>Return :
+     *                                                             <br>&lt; 0 if value1 is before value2
+     *                                                             <br>= 0 if value1 equals value2
+     *                                                             <br>&gt; 0 if value1 is after value2
+     *
+     * @return $this
+     *
+     * @throws Throwable If an error occurs
+     */
+    public function sortSelf (Closure|IComparator|null $sorter = null): static;
+    /**
+     * Sort the elements by key
+     *
+     * @param IComparator|Closure(TKey, TKey):int $sorter The sorting method. Return :
+     *                                                    <br>&lt; 0 if key1 is before key2
+     *                                                    <br>= 0 if key1 equals key2
+     *                                                    <br>&gt; 0 if key1 is after key2
+     *
+     * @return $this
+     *
+     * @throws Throwable If an error occurs
      */
-    public function removeValue ($value, bool $strict = false): self;
+    public function sortSelfByKey (Closure|IComparator $sorter): static;
 }

src/Collections/IComparable.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace jrosset\Collections;
+
+/**
+ * Interface for comparable objects
+ *
+ * @template TObject of object
+ */
+interface IComparable {
+    /**
+     * Compare to another instance
+     *
+     * @param TObject $other The other instance
+     *
+     * @return int <br>&lt; 0 if current instance is classed before the other instance
+     *             <br>= 0 if current instance is classed equals the other instance
+     *             <br>&gt; 0 if current instance is classed after the other instance
+     *
+     * @noinspection PhpMissingParamTypeInspection
+     */
+    public function compareTo ($other): int;
+}

src/Collections/IComparator.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace jrosset\Collections;
+
+/**
+ * Interface for classes comparing external objects
+ *
+ * @template TObject of object
+ */
+interface IComparator {
+    /**
+     * Compare two objects
+     *
+     * @param TObject $object1 The first object
+     * @param TObject $object2 The second object
+     *
+     * @return int <br>&lt; 0 if the first object is classed before the second object
+     *             <br>= 0 if the first object is classed equals the second object
+     *             <br>&gt; 0 if the first object is classed after the second object
+     *
+     * @noinspection PhpMissingParamTypeInspection
+     */
+    public function compare ($object1, $object2): int;
+}

src/Collections/IImmutableCollection.php

@@ -7,18 +7,20 @@ use Closure;
 use Countable;
 use IteratorAggregate;
 use JsonSerializable;
-use Serializable;
+use OutOfBoundsException;
+use Throwable;
 
 /**
  * Interface for an immutable (read-only) collection
  *
- * @psalm-template     TKey of array-key
- * @template-covariant TValue
- * @template-extends IteratorAggregate<TKey, TValue>
- * @template-extends ArrayAccess<TKey, TValue>
- * @template-extends IArrayCast<TKey, TValue>
+ * @template TKey of array-key
+ * @template TValue
+ *
+ * @implements IteratorAggregate<TKey, TValue>
+ * @implements ArrayAccess<TKey, TValue>
+ * @implements IArrayCast<TKey, TValue>
  */
-interface IImmutableCollection extends IteratorAggregate, JsonSerializable, Serializable, Countable, ArrayAccess, IArrayCast {
+interface IImmutableCollection extends IteratorAggregate, JsonSerializable, Countable, ArrayAccess, IArrayCast {
     /**
      * Checks if the collection is empty
      *
@@ -29,9 +31,7 @@ interface IImmutableCollection extends IteratorAggregate, JsonSerializable, Seri
     /**
      * Checks if a key exists
      *
-     * @param array-key  $key The key
-     *
-     * @psalm-param TKey $key
+     * @param TKey $key The key
      *
      * @return bool TRUE if the key exists, FALSE otherwise
      */
@@ -39,10 +39,8 @@ interface IImmutableCollection extends IteratorAggregate, JsonSerializable, Seri
     /**
      * Checks if contains a value
      *
-     * @param mixed        $value  The value
-     * @param bool         $strict Strict comparison ?
-     *
-     * @psalm-param TValue $value
+     * @param TValue $value  The value
+     * @param bool   $strict Strict comparison ?
      *
      * @return bool TRUE if the value exists, FALSE otherwise
      */
@@ -51,26 +49,75 @@ interface IImmutableCollection extends IteratorAggregate, JsonSerializable, Seri
     /**
      * Get the value of a key or null if not found
      *
-     * @param array-key  $key The key
-     *
-     * @psalm-param TKey $key
+     * @param TKey $key The key
      *
-     * @return mixed The value
-     * @psalm-return TValue|null
+     * @return TValue|null The value
      */
     public function get ($key);
     /**
-     * Get the first key of a value or null if not found
+     * Get the value at an offset
      *
-     * @param mixed        $value  The value
-     * @param bool         $strict Strict comparison ?
+     * @param int $offset The offset
      *
-     * @psalm-param TValue $value
+     * @return TValue The value
      *
-     * @return array-key
-     * @psalm-return TKey|null
+     * @throws OutOfBoundsException If the offset is not valid
+     */
+    public function getFromOffset (int $offset);
+
+    /**
+     * Get the first key of a value or null if not found
+     *
+     * @param TValue $value  The value
+     * @param bool   $strict Strict comparison ?
+     *
+     * @return TKey|null
      */
     public function key ($value, bool $strict = false);
+    /**
+     * Get the key at an offset
+     *
+     * @param int $offset The offset
+     *
+     * @return TKey The key
+     *
+     * @throws OutOfBoundsException If the offset is not valid
+     */
+    public function keyFromOffset (int $offset);
+
+    /**
+     * Get the value of the first element
+     *
+     * @return TValue The value
+     *
+     * @throws OutOfBoundsException If the collection is empty
+     */
+    public function first ();
+    /**
+     * Get the key of the first element
+     *
+     * @return TKey The key
+     *
+     * @throws OutOfBoundsException If the collection is empty
+     */
+    public function firstKey ();
+
+    /**
+     * Get the value of the last element
+     *
+     * @return TValue The value
+     *
+     * @throws OutOfBoundsException If the collection is empty
+     */
+    public function last ();
+    /**
+     * Get the key of the last element
+     *
+     * @return TKey The key
+     *
+     * @throws OutOfBoundsException If the collection is empty
+     */
+    public function lastKey ();
 
     /**
      * Extract a slice of the collection
@@ -80,66 +127,79 @@ interface IImmutableCollection extends IteratorAggregate, JsonSerializable, Seri
      * @param int      $offset The start offset
      * @param int|null $length The maximum length. Null if until end of the collection
      *
-     * @return static
-     * @psalm-return static<TKey, TValue>
+     * @return static<TKey, TValue> The result collection
+     *
+     * @throws OutOfBoundsException If the offset is not valid
      */
-    public function slice (int $offset, ?int $length = null): self;
+    public function slice (int $offset, ?int $length = null): static;
 
     /**
      * Get a collection of all elements that satisfy predicate $filter
      *
-     * @param Closure                          $filter The filtering predicate
-     *
-     * @psalm-param Closure(TKey, TValue):bool $filter
+     * @param Closure(TKey, TValue):bool $filter The filtering predicate
      *
-     * @return static The result collection
-     * @psalm-return static<TKey, TValue>
+     * @return static<TKey, TValue> The result collection
      */
-    public function filter (Closure $filter): self;
+    public function filter (Closure $filter): static;
     /**
      * Get a collection of all not empty elements
      *
      * Use {@see https://www.php.net/manual/function.empty.php empty} to check if element is empty or not
      *
-     * @return static The result collection
+     * @return static<TKey, TValue> The result collection
      */
-    public function withoutEmpties (): self;
+    public function withoutEmpties (): static;
     /**
-     * Remove all empty elements on current collection
+     * A new collection with <b>$process</b> applied on all elements
      *
-     * Use {@see https://www.php.net/manual/function.empty.php empty} to check if element is empty or not
+     * @template TResultValue
+     *
+     * @param Closure(TKey, TValue): TResultValue $process The process function to apply on each element
      *
-     * @return $this
+     * @return static<TKey, TResultValue> The result collection
      */
-    public function removeEmpties (): self;
+    public function map (Closure $process): static;
+
     /**
-     * A new collection with $process applied on all elements
+     * Get a collection with the elements sorted (by value)
      *
-     * @psalm-template TResultValue
+     * @param null|IComparator|Closure(TValue, TValue):int $sorter The sorting method ; Null if values are object implementing {@see IComparable}.
+     *                                                             <br>Return :
+     *                                                             <br>&lt; 0 if value1 is before value2
+     *                                                             <br>= 0 if value1 equals value2
+     *                                                             <br>&gt; 0 if value1 is after value2
      *
-     * @param Closure                                   $process The process function to apply on each element
+     * @return static<TKey, TValue> The result collection
      *
-     * @psalm-param Closure(TKey, TValue): TResultValue $process
+     * @throws Throwable If an error occurs
+     */
+    public function sort (Closure|IComparator|null $sorter = null): static;
+    /**
+     * Get a collection with the elements sorted by key
+     *
+     * @param IComparator|Closure(TKey, TKey):int $sorter The sorting method. Return :
+     *                                                    <br>&lt; 0 if key1 is before key2
+     *                                                    <br>= 0 if key1 equals key2
+     *                                                    <br>&gt; 0 if key1 is after key2
+     *
+     * @return static<TKey, TValue> The result collection
      *
-     * @return static
-     * @psalm-return static<TKey, TResultValue>
+     * @throws Throwable If an error occurs
      */
-    public function map (Closure $process): self;
+    public function sortByKey (Closure|IComparator $sorter): static;
 
     /**
      * The list of all keys
      *
-     * @return static The list of all keys
-     * @psalm-return static<int, TKey>
+     * @return IImmutableCollection<int, TKey> The list of all keys
      */
-    public function keys (): self;
+    public function keys (): IImmutableCollection;
     /**
      * The list of all values
      *
-     * @return static The list of all values
-     * @psalm-return static<int, TValue>
+     * @return static<int, TValue> The list of all values
      */
-    public function values (): self;
+    public function values (): static;
 
     /**
      * Join all values with a separator
@@ -155,16 +215,35 @@ interface IImmutableCollection extends IteratorAggregate, JsonSerializable, Seri
      * @param string $value     The value to split
      * @param string $separator The split separator
      *
-     * @return static
+     * @return static<int, string> The result collection
+     */
+    public static function split (string $value, string $separator): static;
+
+    /**
+     * Create a collection filled with the same element
+     *
+     * @param int    $size  The collection size
+     * @param TValue $value The value to fill the collection
+     *
+     * @return static<int, TValue> The result collection
+     */
+    public static function fill (int $size, $value): static;
+    /**
+     * Create a collection filled with the same element, using a list of keys
+     *
+     * @param IImmutableCollection<TKey> $keys  The list of keys
+     * @param TValue                     $value The value to fill the collection
+     *
+     * @return static<TKey, TValue> The result collection
      */
-    public static function split (string $value, string $separator): self;
+    public static function fillWithKeys (IImmutableCollection $keys, $value): static;
 
     /**
-     * Combine the current collection with one or multiple other collections
+     * Merge the current collection with one or multiple collections
      *
-     * @param IImmutableCollection ...$collections The other collections to combine
+     * @param IImmutableCollection<TKey, TValue> ...$collections The other collections to merge
      *
-     * @return static The combine collection
+     * @return static<TKey, TValue> The result collection
      */
-    public function combineWith (IImmutableCollection ...$collections): self;
+    public function mergeWith (IImmutableCollection ...$collections): static;
 }

src/Collections/ImmutableCollection.php

@@ -5,50 +5,45 @@ namespace jrosset\Collections;
 use ArrayIterator;
 use Closure;
 use InvalidArgumentException;
-use JsonException;
+use OutOfBoundsException;
+use ReflectionFunction;
 use Traversable;
 
 /**
  * An immutable collection
  *
- * @psalm-template     TKey of array-key
- * @template-covariant TValue
- * @template-implements IImmutableCollection<TKey, TValue>
+ * @template TKey of array-key
+ * @template TValue
+ *
+ * @implements IImmutableCollection<TKey, TValue>
  */
 class ImmutableCollection implements IImmutableCollection {
     /**
-     * @var array The internal array of elements
-     * @psalm-var array<TKey, TValue>
-     *
-     * @internal
+     * @var array<TKey, TValue> The internal array of elements
      */
     protected array $elements;
 
     /**
      * Initialise a new collection
      *
-     * @param array|Traversable|null $other The initial values
-     *
-     * @psalm-param array<TKey, TValue>|Traversable<TKey, TValue>|null
+     * @param iterable|null $other The initial values
      *
      * @throws InvalidArgumentException If the initial values aren't valid
      */
-    public function __construct ($other = null) {
+    public function __construct (?iterable $other = null) {
         $this->_initialize($other);
     }
 
     /**
      * Initialise the internals elements
      *
-     * @param array|Traversable|null $other The initial values
-     *
-     * @psalm-param array<TKey, TValue>|Traversable<TKey, TValue>|null
+     * @param iterable|null $other The initial values
      *
      * @throws InvalidArgumentException If the initial values aren't valid
-     * @internal
      *
+     * @internal
      */
-    protected function _initialize ($other = null) {
+    protected function _initialize (?iterable $other = null): void {
         $this->elements = [];
         if ($other !== null) {
             if (!is_array($other) && !$other instanceof Traversable) {
@@ -63,17 +58,14 @@ class ImmutableCollection implements IImmutableCollection {
     /**
      * Internally set a value to a key
      *
-     * @param array-key    $key   The key
-     * @param mixed        $value The value
-     *
-     * @psalm-param TKey   $key
-     * @psalm-param TValue $value
+     * @param TKey   $key   The key
+     * @param TValue $value The value
      *
      * @return $this
-     * @internal
      *
+     * @internal
      */
-    protected function _set ($key, $value): self {
+    protected function _set ($key, $value): static {
         $this->elements[$this->_normalizeKey($key)] = $value;
         return $this;
     }
@@ -83,8 +75,10 @@ class ImmutableCollection implements IImmutableCollection {
      * @param IImmutableCollection ...$collections The collections to merge
      *
      * @return $this
+     *
+     * @internal
      */
-    protected function _merge (IImmutableCollection ...$collections): self {
+    protected function _merge (IImmutableCollection ...$collections): static {
         foreach ($collections as $collection) {
             foreach ($collection as $key => $value) {
                 $this->_set($key, $value);
@@ -95,15 +89,13 @@ class ImmutableCollection implements IImmutableCollection {
     /**
      * Internally add a value
      *
-     * @param mixed        ...$values The value
-     *
-     * @psalm-param TValue ...$value
+     * @param TValue ...$values The value
      *
      * @return $this
-     * @internal
      *
+     * @internal
      */
-    protected function _add (...$values): self {
+    protected function _add (...$values): static {
         foreach ($values as $value) {
             $this->elements[] = $value;
         }
@@ -114,9 +106,9 @@ class ImmutableCollection implements IImmutableCollection {
      *
      * @param IImmutableCollection ...$collections The collections to add
      *
-     * @return mixed
+     * @return $this
      */
-    protected function _addCollection (IImmutableCollection ...$collections): self {
+    protected function _addCollection (IImmutableCollection ...$collections): static {
         foreach ($collections as $collection) {
             foreach ($collection as $value) {
                 $this->_add($value);
@@ -127,60 +119,79 @@ class ImmutableCollection implements IImmutableCollection {
     /**
      * Normalize a key
      *
-     * @param array-key  $key The key to normalize
+     * @param TKey $key The key to normalize
      *
-     * @psalm-param TKey $key
-     *
-     * @return array-key The normalized key
-     * @psalm-return TKey
+     * @return TKey The normalized key
      */
     protected function _normalizeKey ($key) {
         return $key;
     }
+    /**
+     * Vérifie un offset (&ge; 0, &lt; {@see static::count()})
+     *
+     * @param int $offset L'offset à vérifier
+     *
+     * @return void
+     *
+     * @throws OutOfBoundsException Si l'offset est invalide
+     */
+    protected function _checkOffset (int $offset): void {
+        if ($offset < 0 || $offset >= $this->count()) {
+            throw new OutOfBoundsException('The offset must be between 0 and ' . ($this->count() - 1));
+        }
+    }
 
     /**
      * @inheritDoc
      */
-    public function getIterator () {
+    public function getIterator (): ArrayIterator {
         return new ArrayIterator($this->elements);
     }
 
     /**
      * @inheritDoc
      */
-    public function offsetExists ($offset): bool {
+    public function offsetExists (mixed $offset): bool {
         return $this->exists($offset);
     }
     /**
      * @inheritDoc
      */
-    public function offsetGet ($offset) {
+    public function offsetGet (mixed $offset): mixed {
         return $this->get($offset);
     }
     /**
      * @inheritDoc
      */
-    public function offsetSet ($offset, $value): void {
+    public function offsetSet (mixed $offset, mixed $value): void {
         throw new ImmutableException();
     }
     /**
      * @inheritDoc
      */
-    public function offsetUnset ($offset): void {
+    public function offsetUnset (mixed $offset): void {
         throw new ImmutableException();
     }
 
     /**
-     * @inheritDoc
+     * List of properties to {@see https://www.php.net/manual/function.serialize.php serialize}
+     *
+     * @return array[] List of properties to {@see https://www.php.net/manual/function.serialize.php serialize}
      */
-    public function serialize (): ?string {
-        return serialize($this->elements);
+    public function __serialize (): array {
+        return [
+            'elements' => $this->elements,
+        ];
     }
     /**
-     * @inheritDoc
+     * {@see https://www.php.net/manual/function.unserialize.php Unserialize} from the list of serialized properties
+     *
+     * @param array $data The list of serialized properties
+     *
+     * @return void
      */
-    public function unserialize ($data) {
-        $this->_initialize(unserialize($data));
+    public function __unserialize (array $data): void {
+        $this->_initialize($data['elements']);
     }
 
     /**
@@ -219,9 +230,17 @@ class ImmutableCollection implements IImmutableCollection {
     /**
      * @inheritDoc
      */
-    public function get ($key) {
+    public function get ($key): mixed {
         return $this->elements[$this->_normalizeKey($key)] ?? null;
     }
+    /**
+     * @inheritDoc
+     */
+    public function getFromOffset (int $offset) {
+        $this->_checkOffset($offset);
+        return array_values($this->elements)[$offset];
+    }
+
     /**
      * @inheritDoc
      */
@@ -233,12 +252,50 @@ class ImmutableCollection implements IImmutableCollection {
         }
         return null;
     }
+    /**
+     * @inheritDoc
+     */
+    public function keyFromOffset (int $offset) {
+        $this->_checkOffset($offset);
+        return array_keys($this->elements)[$offset];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function first () {
+        return $this->getFromOffset(0);
+    }
+    /**
+     * @inheritDoc
+     */
+    public function firstKey () {
+        return $this->keyFromOffset(0);
+    }
 
     /**
      * @inheritDoc
      */
-    public function slice (int $offset, ?int $length = null): self {
+    public function last () {
+        return $this->getFromOffset($this->count() - 1);
+    }
+    /**
+     * @inheritDoc
+     */
+    public function lastKey () {
+        return $this->keyFromOffset($this->count() - 1);
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function slice (int $offset, ?int $length = null): static {
         $output = new static();
+        if ($this->count() === 0) {
+            return $output;
+        }
+
+        $this->_checkOffset($offset);
 
         $currentIndex = 0;
         foreach ($this->elements as $key => $value) {
@@ -258,7 +315,7 @@ class ImmutableCollection implements IImmutableCollection {
     /**
      * @inheritDoc
      */
-    public function filter (Closure $filter): self {
+    public function filter (Closure $filter): static {
         $output = new static();
         foreach ($this->elements as $key => $value) {
             if (!$filter($key, $value)) {
@@ -271,7 +328,7 @@ class ImmutableCollection implements IImmutableCollection {
     /**
      * @inheritDoc
      */
-    public function withoutEmpties (): self {
+    public function withoutEmpties (): static {
         return $this->filter(function ($value) {
             return empty($value);
         });
@@ -279,41 +336,93 @@ class ImmutableCollection implements IImmutableCollection {
     /**
      * @inheritDoc
      */
-    public function removeEmpties (): self {
-        $this->_initialize($this->withoutEmpties());
-        return $this;
+    public function map (Closure $process): static {
+        //region Regarde si $process doit être appelée avec la clé en plus de la valeur
+        $callProcessWithKey = false;
+        /** @noinspection PhpUnhandledExceptionInspection */
+        $processReflection = new ReflectionFunction($process);
+        if (count($processReflection->getParameters()) >= 2) {
+            if (!$processReflection->getParameters()[1]->isDefaultValueAvailable()) {
+                $callProcessWithKey = true;
+            }
+        }
+        //endregion
+
+        $output = new static();
+        foreach ($this->elements as $key => $value) {
+            $output->_set($key, $callProcessWithKey ? $process($key, $value) : $process($value));
+        }
+        return $output;
     }
+
     /**
      * @inheritDoc
      */
-    public function map (Closure $process): self {
-        $output = new static();
-        foreach ($this->elements as $key => $value) {
-            $output->_set($key, $process($key, $value));
+    public function sort (Closure|IComparator|null $sorter = null): static {
+        $elements = $this->toArray();
+        uasort($elements, self::_normalizeSorter($sorter));
+
+        return new static($elements);
+    }
+    /**
+     * @inheritDoc
+     */
+    public function sortByKey (Closure|IComparator $sorter): static {
+        $elements = $this->toArray();
+        uksort($elements, self::_normalizeSorter($sorter));
+
+        return new static($elements);
+    }
+
+    /**
+     * Normalize a sorter method
+     *
+     * @param null|IComparator|Closure(TValue, TValue):int $sorter The sorting method ; Null if values are object implementing {@see IComparable}.
+     *                                                             <br>Return :
+     *                                                             <br>&lt; 0 if value1 is before value2
+     *                                                             <br>= 0 if value1 equals value2
+     *                                                             <br>&gt; 0 if value1 is after value2
+     *
+     * @return Closure(TValue, TValue):int The normalized sorter method
+     *                                     <br>Return :
+     *                                     <br>&lt; 0 if value1 is before value2
+     *                                     <br>= 0 if value1 equals value2
+     *                                     <br>&gt; 0 if value1 is after value2
+     */
+    public static function _normalizeSorter (Closure|IComparator|null $sorter): Closure {
+        if ($sorter === null) {
+            return function (IComparable $value1, IComparable $value2): int {
+                return $value1->compareTo($value2);
+            };
+        }
+        elseif ($sorter instanceof IComparator) {
+            return function ($value1, $value2) use ($sorter): int {
+                return $sorter->compare($value1, $value2);
+            };
+        }
+        else {
+            return $sorter;
         }
-        return $output;
     }
 
     /**
      * @inheritDoc
      */
-    public function keys (): self {
+    public function keys (): IImmutableCollection {
         return new static(array_keys($this->elements));
     }
     /**
      * @inheritDoc
      */
-    public function values (): self {
+    public function values (): static {
         return new static(array_values($this->elements));
     }
 
     /**
      * @inheritDoc
-     *
-     * @throws JsonException
      */
-    public function jsonSerialize () {
-        return json_encode($this->elements, JSON_THROW_ON_ERROR);
+    public function jsonSerialize (): mixed {
+        return $this->elements;
     }
 
     /**
@@ -325,14 +434,36 @@ class ImmutableCollection implements IImmutableCollection {
     /**
      * @inheritDoc
      */
-    public static function split (string $value, string $separator): self {
+    public static function split (string $value, string $separator): static {
         return new static (explode($separator, $value));
     }
 
     /**
      * @inheritDoc
      */
-    public function combineWith (IImmutableCollection ...$collections): IImmutableCollection {
+    public static function fill (int $size, $value): static {
+        $keys = new ImmutableCollection();
+        for ($curr = 0; $curr < $size; $curr++) {
+            $keys->_add($curr);
+        }
+
+        return static::fillWithKeys($keys, $value);
+    }
+    /**
+     * @inheritDoc
+     */
+    public static function fillWithKeys (IImmutableCollection $keys, $value): static {
+        $collection = new static();
+        foreach ($keys as $key) {
+            $collection->_set($key, $value);
+        }
+        return $collection;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function mergeWith (IImmutableCollection ...$collections): static {
         return (clone $this)->_merge(...$collections);
     }
 }

src/Collections/InsensitiveCaseKeyCollection.php

@@ -5,9 +5,10 @@ namespace jrosset\Collections;
 /**
  * A collection with insensitive case keys
  *
- * @psalm-template     TKey of array-key
- * @template-covariant TValue
- * @template-extends Collection<TKey, TValue>
+ * @template TKey of array-key
+ * @template TValue
+ *
+ * @implements Collection<TKey, TValue>
  */
 class InsensitiveCaseKeyCollection extends Collection {
     use TInsensitiveCaseKey;

src/Collections/InsensitiveCaseKeyImmutableCollection.php

@@ -5,9 +5,10 @@ namespace jrosset\Collections;
 /**
  * An immutable collection with insensitive case keys
  *
- * @psalm-template     TKey of array-key
- * @template-covariant TValue
- * @template-extends ImmutableCollection<TKey, TValue>
+ * @template TKey of array-key
+ * @template TValue
+ *
+ * @implements ImmutableCollection<TKey, TValue>
  */
 class InsensitiveCaseKeyImmutableCollection extends ImmutableCollection implements IImmutableCollection {
     use TInsensitiveCaseKey;

src/Collections/TInsensitiveCaseKey.php

@@ -7,11 +7,9 @@ namespace jrosset\Collections;
  */
 trait TInsensitiveCaseKey {
     /**
-     * Normalize a key
+     * @inheritDoc
      *
-     * @param array-key $key The key to normalize
-     *
-     * @return array-key The normalized key
+     * @noinspection PhpMissingReturnTypeInspection
      */
     protected function _normalizeKey ($key) {
         return mb_strtolower($key);

src/Collections/TUniqueValues.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace jrosset\Collections;
+
+/**
+ * Implementation for unique collection
+ *
+ * @template TKey of array-key
+ * @template TValue
+ */
+trait TUniqueValues {
+    /**
+     * @inheritDoc
+     */
+    protected function _set ($key, $value): static {
+        if ($this->contains($value)) {
+            return $this;
+        }
+
+        $this->elements[$this->_normalizeKey($key)] = $value;
+        return $this;
+    }
+    /**
+     * @inheritDoc
+     */
+    protected function _add (...$values): static {
+        foreach ($values as $value) {
+            if ($this->contains($value)) {
+                continue;
+            }
+            $this->elements[] = $value;
+        }
+        return $this;
+    }
+}

src/Collections/UniqueCollection.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace jrosset\Collections;
+
+/**
+ * A collection with unique values
+ *
+ * @template TKey of array-key
+ * @template TValue
+ *
+ * @implements Collection<TKey, TValue>
+ * @implements TUniqueValues<TKey, TValue>
+ */
+class UniqueCollection extends Collection {
+    use TUniqueValues;
+}

src/Collections/UniqueImmutableCollection.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace jrosset\Collections;
+
+/**
+ * An immutable collection with unique values
+ *
+ * @template TKey of array-key
+ * @template TValue
+ *
+ * @implements ImmutableCollection<TKey, TValue>
+ * @implements TUniqueValues<TKey, TValue>
+ */
+class UniqueImmutableCollection extends ImmutableCollection {
+    use TUniqueValues;
+}

tests/test.php

@@ -1,5 +1,6 @@
 <?php
 
+use jrosset\Collections\ImmutableCollection;
 use jrosset\Collections\InsensitiveCaseKeyCollection;
 use jrosset\Collections\InsensitiveCaseKeyImmutableCollection;
 
@@ -18,4 +19,9 @@ echo '-----' . PHP_EOL;
 
 $collection = new InsensitiveCaseKeyCollection($readOnlyCollection);
 $collection->add(28);
-echo 'Size : ' . $collection->count() . PHP_EOL;
+echo 'Size : ' . $collection->count() . PHP_EOL;
+
+echo 'Fill :' . PHP_EOL;
+foreach (ImmutableCollection::fill(5, -1) as $key => $value) {
+    echo "\t#" . $key . ' = ' . $value . PHP_EOL;
+}

tests/test_class.php

@@ -1,11 +1,19 @@
 <?php
+/** @noinspection PhpUnhandledExceptionInspection */
 /** @noinspection PhpIllegalPsrClassPathInspection */
 
 use jrosset\Collections\Collection;
+use jrosset\Collections\IComparable;
+use jrosset\Collections\IComparator;
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
-class Measure {
+/**
+ * Class Measure
+ *
+ * @implements IComparable<static>
+ */
+class Measure implements IComparable {
     private int    $value;
     private string $unit;
 
@@ -14,9 +22,33 @@ class Measure {
         $this->unit = $unit;
     }
 
+    public function getValue (): int {
+        return $this->value;
+    }
+
     public function asString (): string {
         return $this->value . $this->unit;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function compareTo ($other): int {
+        return $this->value <=> $other->value;
+    }
+}
+/**
+ * Class MeasureReverseComparator
+ *
+ * @implements IComparator<Measure>
+ */
+class MeasureReverseComparator implements IComparator {
+    /**
+     * @inheritDoc
+     */
+    public function compare ($object1, $object2): int {
+        return -($object1->getValue() <=> $object2->getValue());
+    }
 }
 
 /**
@@ -33,7 +65,15 @@ function getMeasures (): Collection {
     return $measures;
 }
 
+$measures = getMeasures();
+$measures->sortSelf();
+
 echo 'Measures :' . PHP_EOL;
-foreach (getMeasures() as $no => $measure) {
+foreach ($measures as $no => $measure) {
+    echo "\t#" . $no . ' = ' . $measure->asString() . PHP_EOL;
+}
+
+echo 'Measures (reversed) :' . PHP_EOL;
+foreach ($measures->sort(new MeasureReverseComparator()) as $no => $measure) {
     echo "\t#" . $no . ' = ' . $measure->asString() . PHP_EOL;
 }