Fixed vimeo/psalm#7196 and updated pure annotations

src/ArrayList.php

@@ -127,6 +127,7 @@ public function set(int $index, mixed $value): void
 			throw new OffsetNotFoundException($index);
 		}
 
+		/** @psalm-suppress ImpureMethodCall */
 		return $this->list[$index];
 	}
 
@@ -148,7 +149,7 @@ public function addAll(iterable $values): void
 		}
 	}
 
-	#[Pure] public function first(?callable $filter = null): mixed
+	public function first(?callable $filter = null): mixed
 	{
 		foreach ($this->list as $item) {
 			if ($filter === null || $filter($item)) {
@@ -163,7 +164,7 @@ public function addAll(iterable $values): void
 	 * @param callable(T): bool $filter
 	 * @return ArrayList<T>
 	 */
-	#[Pure] public function where(callable $filter): ArrayList
+	public function where(callable $filter): ArrayList
 	{
 		$result = new ArrayList();
 
@@ -196,13 +197,12 @@ public function addAll(iterable $values): void
 	 * @param callable(T): TOut $callback
 	 * @return ArrayList<TOut>
 	 */
-	#[Pure] public function map(callable $callback): ArrayList
+	public function map(callable $callback): ArrayList
 	{
 		$arr = new ArrayList();
 
 		foreach ($this->list as $value) {
 			/**
-			 * @psalm-suppress ImpureMethodCall
 			 * @psalm-suppress InvalidArgument Until vimeo/psalm#6821 is fixed
 			 */
 			$arr->add($callback($value));
@@ -211,7 +211,7 @@ public function addAll(iterable $values): void
 		return $arr;
 	}
 
-	#[Pure] public function any(?callable $filter = null): bool
+	public function any(?callable $filter = null): bool
 	{
 		return !$this->isEmpty() && $this->first($filter) !== null;
 	}
@@ -275,7 +275,7 @@ public function unshift(mixed $value): void
 		array_unshift($this->list, $value);
 	}
 
-	#[Pure] public function contains(mixed $value): bool
+	public function contains(mixed $value): bool
 	{
 		return $this->any(static fn($item) => $item === $value);
 	}
@@ -292,7 +292,7 @@ public function orderBy(callable $callback): ArrayList
 		return $this;
 	}
 
-	#[Pure] public function join(Stringable|string $separator): string
+	public function join(Stringable|string $separator): string
 	{
 		return implode((string)$separator, $this->map(fn($item) => (string)$item)->asArray());
 	}

src/ArrayMap.php

@@ -90,7 +90,7 @@ public function put(mixed $key, mixed $value): void
 		return $this->values[$key];
 	}
 
-	#[Pure] public function first(?callable $filter = null): mixed
+	public function first(?callable $filter = null): mixed
 	{
 		foreach ($this->values as $key => $value) {
 			if ($filter === null || $filter($value, $key)) {
@@ -101,7 +101,7 @@ public function put(mixed $key, mixed $value): void
 		return null;
 	}
 
-	#[Pure] public function firstKey(?callable $filter = null): mixed
+	public function firstKey(?callable $filter = null): mixed
 	{
 		foreach ($this->values as $key => $value) {
 			if ($filter === null || $filter($key, $value)) {
@@ -117,7 +117,7 @@ public function put(mixed $key, mixed $value): void
 	 * @param callable(TValue, TKey): bool $filter
 	 * @return ArrayMap<TKey, TValue>
 	 */
-	#[Pure] public function where(callable $filter): ArrayMap
+	public function where(callable $filter): ArrayMap
 	{
 		$result = new ArrayMap();
 
@@ -135,7 +135,7 @@ public function put(mixed $key, mixed $value): void
 	 * @param callable(TKey, TValue): bool $filter
 	 * @return ArrayMap<TKey, TValue>
 	 */
-	#[Pure] public function whereKey(callable $filter): ArrayMap
+	public function whereKey(callable $filter): ArrayMap
 	{
 		$result = new ArrayMap();
 
@@ -160,7 +160,7 @@ public function put(mixed $key, mixed $value): void
 	 * @param callable(TValue, TKey): TOut $callback
 	 * @return ArrayMap<TKey, TOut>
 	 */
-	#[Pure] public function map(callable $callback): ArrayMap
+	public function map(callable $callback): ArrayMap
 	{
 		$map = new ArrayMap();
 
@@ -175,12 +175,12 @@ public function put(mixed $key, mixed $value): void
 		return $map;
 	}
 
-	#[Pure] public function any(?callable $filter = null): bool
+	public function any(?callable $filter = null): bool
 	{
 		return $this->first($filter) !== null;
 	}
 
-	#[Pure] public function anyKey(?callable $filter = null): bool
+	public function anyKey(?callable $filter = null): bool
 	{
 		return $this->firstKey($filter) !== null;
 	}
@@ -201,7 +201,7 @@ public function put(mixed $key, mixed $value): void
 	 * @param callable(TValue, TKey): TOut $callback
 	 * @return ArrayList<TOut>
 	 */
-	#[Pure] public function reduce(callable $callback): ArrayList
+	public function reduce(callable $callback): ArrayList
 	{
 		/** @var ArrayList<TOut> $list */
 		$list = new ArrayList();
@@ -219,7 +219,7 @@ public function asArray(): array
 		return $this->values;
 	}
 
-	#[Pure] public function contains(mixed $value): bool
+	public function contains(mixed $value): bool
 	{
 		return $this->any(static fn($item) => $item === $value);
 	}
@@ -243,14 +243,13 @@ public function toJson(int $flags = 0): string
 	 * @param callable(TKey, TValue): TKeyOut $callback
 	 * @return ArrayMap<TKeyOut, TValue>
 	 */
-	#[Pure] public function mapKeys(callable $callback): ArrayMap
+	public function mapKeys(callable $callback): ArrayMap
 	{
 		/** @var ArrayMap<TKeyOut, TValue> $map */
 		$map = new ArrayMap();
 
 		foreach ($this->values as $key => $value) {
 			/**
-			 * @psalm-suppress ImpureMethodCall
 			 * @psalm-suppress InvalidArgument Until vimeo/psalm#6821 is fixed
 			 */
 			$map->put($callback($key, $value), $value);

src/Contract/Filterable.php

@@ -3,8 +3,6 @@
 
 namespace Elephox\Collection\Contract;
 
-use JetBrains\PhpStorm\Pure;
-
 /**
  * @template T
  */
@@ -14,23 +12,23 @@ interface Filterable
 	 * @param null|callable(T): bool $filter
 	 * @return T|null
 	 */
-	#[Pure] public function first(?callable $filter = null): mixed;
+	public function first(?callable $filter = null): mixed;
 
 	/**
 	 * @param null|callable(T): bool $filter
 	 * @return bool
 	 */
-	#[Pure] public function any(?callable $filter = null): bool;
+	public function any(?callable $filter = null): bool;
 
 	/**
 	 * @param callable(T): bool $filter
 	 * @return GenericCollection<T>
 	 */
-	#[Pure] public function where(callable $filter): GenericCollection;
+	public function where(callable $filter): GenericCollection;
 
 	/**
 	 * @param T $value
 	 * @return bool
 	 */
-	#[Pure] public function contains(mixed $value): bool;
+	public function contains(mixed $value): bool;
 }

src/Contract/GenericCollection.php

@@ -11,6 +11,6 @@
  * @extends Filterable<T>
  * @extends Mappable<T>
  */
-interface GenericCollection extends Filterable, Mappable, DeepCloneable
+interface GenericCollection extends DeepCloneable
 {
 }

src/Contract/ReadonlyList.php

@@ -18,7 +18,7 @@
  * @extends iterable<T>
  * @extends list<T>
  */
-interface ReadonlyList extends GenericCollection, Countable, IteratorAggregate, ArrayConvertible
+interface ReadonlyList extends GenericCollection, Filterable, Mappable, Countable, IteratorAggregate, ArrayConvertible
 {
 	/**
 	 * @return T
@@ -29,19 +29,19 @@ interface ReadonlyList extends GenericCollection, Countable, IteratorAggregate,
 	 * @param callable(T): bool $filter
 	 * @return GenericList<T>
 	 */
-	#[Pure] public function where(callable $filter): GenericList;
+	public function where(callable $filter): GenericList;
 
 	/**
 	 * @template TOut
 	 *
 	 * @param callable(T): TOut $callback
 	 * @return GenericList<TOut>
 	 */
-	#[Pure] public function map(callable $callback): GenericList;
+	public function map(callable $callback): GenericList;
 
 	#[Pure] public function isEmpty(): bool;
 
-	#[Pure] public function join(string|Stringable $separator): string;
+	public function join(string|Stringable $separator): string;
 
 	/**
 	 * @return list<T> Returns this object in its array representation.

src/Contract/ReadonlyMap.php

@@ -13,85 +13,85 @@
  * @extends GenericCollection<TValue>
  * @extends IteratorAggregate<TKey, TValue>
  */
-interface ReadonlyMap extends GenericCollection, IteratorAggregate
+interface ReadonlyMap extends GenericCollection, Filterable, Mappable, IteratorAggregate
 {
 	/**
 	 * @param TKey $key
 	 * @return TValue
 	 */
-	#[Pure] public function get(mixed $key): mixed;
+	public function get(mixed $key): mixed;
 
 	/**
 	 * @param TKey $key
 	 */
-	#[Pure] public function has(mixed $key): bool;
+	public function has(mixed $key): bool;
 
 	/**
 	 * @param callable(TValue, TKey): bool $filter
 	 * @return GenericMap<TKey, TValue>
 	 */
-	#[Pure] public function where(callable $filter): GenericMap;
+	public function where(callable $filter): GenericMap;
 
 
 	/**
 	 * @param callable(TKey, TValue): bool $filter
 	 * @return GenericMap<TKey, TValue>
 	 */
-	#[Pure] public function whereKey(callable $filter): GenericMap;
+	public function whereKey(callable $filter): GenericMap;
 
 	/**
 	 * @template TOut
 	 *
 	 * @param callable(TValue, TKey): TOut $callback
 	 * @return GenericMap<TKey, TOut>
 	 */
-	#[Pure] public function map(callable $callback): GenericMap;
+	public function map(callable $callback): GenericMap;
 
 	/**
 	 * @template TKeyOut
 	 *
 	 * @param callable(TKey, TValue): TKeyOut $callback
 	 * @return GenericMap<TKeyOut, TValue>
 	 */
-	#[Pure] public function mapKeys(callable $callback): GenericMap;
+	public function mapKeys(callable $callback): GenericMap;
 
 	/**
 	 * @template TOut
 	 *
 	 * @param callable(TValue, TKey): TOut $callback
 	 * @return GenericList<TOut>
 	 */
-	#[Pure] public function reduce(callable $callback): GenericList;
+	public function reduce(callable $callback): GenericList;
 
 	/**
 	 * @param null|callable(TValue, TKey): bool $filter
 	 * @return TValue|null
 	 */
-	#[Pure] public function first(?callable $filter = null): mixed;
+	public function first(?callable $filter = null): mixed;
 
 	/**
 	 * @param null|callable(TKey, TValue): bool $filter
 	 * @return TKey|null
 	 */
-	#[Pure] public function firstKey(?callable $filter = null): mixed;
+	public function firstKey(?callable $filter = null): mixed;
 
 	/**
 	 * @param null|callable(TValue, TKey): bool $filter
 	 * @return bool
 	 */
-	#[Pure] public function any(?callable $filter = null): bool;
+	public function any(?callable $filter = null): bool;
 
 	/**
 	 * @param null|callable(TKey, TValue): bool $filter
 	 * @return bool
 	 */
-	#[Pure] public function anyKey(?callable $filter = null): bool;
+	 public function anyKey(?callable $filter = null): bool;
 
 	/**
 	 * @param TValue $value
 	 * @return bool
 	 */
-	#[Pure] public function contains(mixed $value): bool;
+	public function contains(mixed $value): bool;
 
 	/**
 	 * @return GenericList<TValue>

src/Contract/ReadonlySet.php

@@ -13,4 +13,9 @@
  */
 interface ReadonlySet extends GenericCollection, IteratorAggregate
 {
+	/**
+	 * @param T $value
+	 * @return bool
+	 */
+	public function contains(mixed $value): bool;
 }