Fix code-style

composer.json

@@ -54,7 +54,6 @@
         ],
         "analyze": [
             "@cs",
-            "vendor/bin/ecs check-markdown README.md --ansi",
             "@phpstan"
         ],
         "cs": "vendor/bin/ecs check --ansi",

src/Exception/BadMethodCallException.php

@@ -2,6 +2,4 @@
 
 namespace MF\Collection\Exception;
 
-class BadMethodCallException extends \BadMethodCallException implements CollectionExceptionInterface
-{
-}
+class BadMethodCallException extends \BadMethodCallException implements CollectionExceptionInterface {}

src/Exception/CollectionExceptionInterface.php

@@ -2,6 +2,4 @@
 
 namespace MF\Collection\Exception;
 
-interface CollectionExceptionInterface extends \Throwable
-{
-}
+interface CollectionExceptionInterface extends \Throwable {}

src/Exception/InvalidArgumentException.php

@@ -6,6 +6,18 @@
 
 class InvalidArgumentException extends \InvalidArgumentException implements CollectionExceptionInterface, AssertionFailedException
 {
+    /** @phpstan-param mixed[] $constraints */
+    public function __construct(
+        string $message,
+        ?int $code = null,
+        private ?string $propertyPath = null,
+        private mixed $value = null,
+        private array $constraints = [],
+        ?\Throwable $previous = null,
+    ) {
+        parent::__construct($message, (int) $code, $previous);
+    }
+
     public static function forFailedAssertion(AssertionFailedException $e): self
     {
         return new static(
@@ -18,18 +30,6 @@ public static function forFailedAssertion(AssertionFailedException $e): self
         );
     }
 
-    /** @phpstan-param mixed[] $constraints */
-    public function __construct(
-        string $message,
-        int $code = null,
-        private ?string $propertyPath = null,
-        private mixed $value = null,
-        private array $constraints = [],
-        \Throwable $previous = null,
-    ) {
-        parent::__construct($message, (int) $code, $previous);
-    }
-
     public function getPropertyPath(): ?string
     {
         return $this->propertyPath;

src/Exception/LogicException.php

@@ -2,6 +2,4 @@
 
 namespace MF\Collection\Exception;
 
-class LogicException extends \LogicException implements CollectionExceptionInterface
-{
-}
+class LogicException extends \LogicException implements CollectionExceptionInterface {}

src/Exception/OutOfBoundsException.php

@@ -2,6 +2,4 @@
 
 namespace MF\Collection\Exception;
 
-class OutOfBoundsException extends \OutOfBoundsException implements CollectionExceptionInterface
-{
-}
+class OutOfBoundsException extends \OutOfBoundsException implements CollectionExceptionInterface {}

src/Exception/OutOfRangeException.php

@@ -2,6 +2,4 @@
 
 namespace MF\Collection\Exception;
 
-class OutOfRangeException extends \OutOfRangeException implements CollectionExceptionInterface
-{
-}
+class OutOfRangeException extends \OutOfRangeException implements CollectionExceptionInterface {}

src/Exception/TupleException.php

@@ -2,6 +2,4 @@
 
 namespace MF\Collection\Exception;
 
-class TupleException extends InvalidArgumentException implements TupleExceptionInterface
-{
-}
+class TupleException extends InvalidArgumentException implements TupleExceptionInterface {}

src/Exception/TupleExceptionInterface.php

@@ -2,6 +2,4 @@
 
 namespace MF\Collection\Exception;
 
-interface TupleExceptionInterface extends CollectionExceptionInterface
-{
-}
+interface TupleExceptionInterface extends CollectionExceptionInterface {}

src/Exception/TupleParseException.php

@@ -2,6 +2,4 @@
 
 namespace MF\Collection\Exception;
 
-class TupleParseException extends TupleException
-{
-}
+class TupleParseException extends TupleException {}

src/Helper/Callback.php

@@ -23,7 +23,7 @@ public static function curry(callable $callback): callable
         $all = $ref->getNumberOfParameters();
         $required = $ref->getNumberOfRequiredParameters();
 
-        return fn (...$args) => $callback(...self::prepareArgs($all, $required, $args));
+        return fn(...$args) => $callback(...self::prepareArgs($all, $required, $args));
     }
 
     /** @see https://stackoverflow.com/questions/13071186/how-to-get-the-number-of-parameters-of-a-run-time-determined-callable */

src/Immutable/Generic/KVPair.php

@@ -11,6 +11,12 @@
  */
 readonly class KVPair
 {
+    /**
+     * @phpstan-param TKey $key
+     * @phpstan-param TValue $value
+     */
+    public function __construct(private int|string $key, private mixed $value) {}
+
     /**
      * @phpstan-param self<TKey, TValue> $pair
      * @phpstan-return TKey
@@ -34,14 +40,6 @@ public static function fromTuple(ITuple $tuple): static
         return new static($tuple->first(), $tuple->second());
     }
 
-    /**
-     * @phpstan-param TKey $key
-     * @phpstan-param TValue $value
-     */
-    public function __construct(private int|string $key, private mixed $value)
-    {
-    }
-
     /** @phpstan-return TKey */
     public function getKey(): int|string
     {
@@ -54,7 +52,7 @@ public function getValue(): mixed
         return $this->value;
     }
 
-    public function asTuple(): ITUple
+    public function asTuple(): ITuple
     {
         return Tuple::of($this->key, $this->value);
     }

src/Immutable/Generic/ListCollection.php

@@ -15,6 +15,9 @@
  */
 readonly class ListCollection implements IList
 {
+    /** @phpstan-param array<TIndex, TValue> $listArray */
+    public function __construct(private array $listArray = []) {}
+
     /**
      * @phpstan-template T
      * @phpstan-param IList<T|iterable<T>> $list
@@ -79,11 +82,6 @@ public static function create(iterable $source, callable $creator): IList
         return new static($listArray);
     }
 
-    /** @phpstan-param array<TIndex, TValue> $listArray */
-    public function __construct(private array $listArray = [])
-    {
-    }
-
     public function count(): int
     {
         return count($this->listArray);
@@ -249,7 +247,7 @@ private function removeIndex(int $index): IList
      */
     public function removeAll(mixed $value): IList
     {
-        return $this->filter(fn (mixed $val): bool => $value !== $val);
+        return $this->filter(fn(mixed $val): bool => $value !== $val);
     }
 
     /**
@@ -374,7 +372,7 @@ public function sortBy(callable $callback): IList
 
         usort(
             $sorted,
-            fn (mixed $a, mixed $b): int => $callback($a) <=> $callback($b)
+            fn(mixed $a, mixed $b): int => $callback($a) <=> $callback($b),
         );
 
         return static::from($sorted);
@@ -391,7 +389,7 @@ public function sortByDescending(callable $callback): IList
 
         usort(
             $sorted,
-            fn (mixed $a, mixed $b): int => $callback($b) <=> $callback($a)
+            fn(mixed $a, mixed $b): int => $callback($b) <=> $callback($a),
         );
 
         return static::from($sorted);
@@ -455,7 +453,7 @@ public function sumBy(callable $callback): int|float
         $callback = Callback::curry($callback);
 
         return $this->reduce(
-            fn (int|float $sum, mixed $value, int $i): int|float => $sum + $callback($value, $i),
+            fn(int|float $sum, mixed $value, int $i): int|float => $sum + $callback($value, $i),
             0,
         );
     }
@@ -574,7 +572,7 @@ public function collect(callable $callback): IList
         $callback = Callback::curry($callback);
 
         /** @phsptan-var IList<iterable<T>> $collected */
-        $collected = $this->map(fn (mixed $v): iterable => $callback($v));
+        $collected = $this->map(fn(mixed $v): iterable => $callback($v));
         /** @phpstan-var IList<T> $concatenated */
         $concatenated = $collected->concat();
 

src/Immutable/Generic/Map.php

@@ -19,6 +19,9 @@
  */
 readonly class Map implements IMap
 {
+    /** @phpstan-param array<TKey, TValue> $mapArray */
+    public function __construct(private array $mapArray = []) {}
+
     /**
      * @phpstan-param iterable<TKey, TValue> $source
      * @phpstan-return IMap<TKey, TValue>
@@ -55,7 +58,7 @@ public static function fromPairs(iterable $pairs): IMap
                 throw new InvalidArgumentException('Value is not a pair');
             }
 
-            /**
+            /*
              * @phpstan-var TKey $key
              * @phpstan-var TValue $value
              */
@@ -84,11 +87,6 @@ public static function create(iterable $source, callable $creator): IMap
         return new static($mapArray);
     }
 
-    /** @phpstan-param array<TKey, TValue> $mapArray */
-    public function __construct(private array $mapArray = [])
-    {
-    }
-
     public function count(): int
     {
         return count($this->mapArray);
@@ -257,7 +255,7 @@ public function values(): IList
     public function pairs(): IList
     {
         /** @phpstan-var IList<KVPair<TKey, TValue>> $pairs */
-        $pairs = ListCollection::create($this, fn ($value, $key) => new KVPair($key, $value));
+        $pairs = ListCollection::create($this, fn($value, $key) => new KVPair($key, $value));
 
         return $pairs;
     }
@@ -330,7 +328,7 @@ public function asMutable(): \MF\Collection\Mutable\Generic\IMap
     public function toList(): IList
     {
         /** @phpstan-var IList<ITuple> $list */
-        $list = ListCollection::create($this, fn ($value, $key) => Tuple::of($key, $value));
+        $list = ListCollection::create($this, fn($value, $key) => Tuple::of($key, $value));
 
         return $list;
     }

src/Immutable/Generic/Seq.php

@@ -29,6 +29,12 @@ class Seq implements ISeq
 
     private bool $isInfinite = false;
 
+    /** @phpstan-param DataSource $iterable */
+    public function __construct(private readonly iterable|\Closure $iterable)
+    {
+        $this->modifiers = [];
+    }
+
     /**
      * @phpstan-template T
      * @phpstan-param ISeq<T|iterable<T>> $seq
@@ -259,12 +265,6 @@ function () use ($callable, $initialValue) {
         );
     }
 
-    /** @phpstan-param DataSource $iterable */
-    public function __construct(private readonly iterable|\Closure $iterable)
-    {
-        $this->modifiers = [];
-    }
-
     /** @phpstan-return ISeq<TValue> */
     private function setIsInfinite(bool $isInfinite = true): ISeq
     {
@@ -479,7 +479,7 @@ public function take(int $limit): ISeq
 
     private function clone(): static
     {
-        return clone ($this);
+        return clone $this;
     }
 
     private function addModifier(SeqModifier $type, mixed $modifier): static
@@ -687,7 +687,7 @@ public function sortBy(callable $callback): ISeq
 
             usort(
                 $items,
-                fn (mixed $a, mixed $b): int => $callback($a) <=> $callback($b)
+                fn(mixed $a, mixed $b): int => $callback($a) <=> $callback($b),
             );
 
             yield from $items;
@@ -712,7 +712,7 @@ public function sortByDescending(callable $callback): ISeq
 
             usort(
                 $items,
-                fn (mixed $a, mixed $b): int => $callback($b) <=> $callback($a)
+                fn(mixed $a, mixed $b): int => $callback($b) <=> $callback($a),
             );
 
             yield from $items;
@@ -795,7 +795,7 @@ public function reverse(): ISeq
     public function sum(): int|float
     {
         return $this->reduce(
-            fn (int|float $sum, mixed $value) => $sum + $value,
+            fn(int|float $sum, mixed $value) => $sum + $value,
             0,
         );
     }
@@ -806,7 +806,7 @@ public function sumBy(callable $callback): int|float
         $callback = Callback::curry($callback);
 
         return $this->reduce(
-            fn (int|float $sum, mixed $value) => $sum + $callback($value),
+            fn(int|float $sum, mixed $value) => $sum + $callback($value),
             0,
         );
     }

src/Immutable/ITuple.php

@@ -15,6 +15,11 @@
  */
 interface ITuple extends IEnumerable, \ArrayAccess, \Stringable
 {
+    /**
+     * @see Tuple::toString()
+     */
+    public function __toString(): string;
+
     public static function fst(ITuple $tuple): mixed;
 
     public static function snd(ITuple $tuple): mixed;
@@ -34,7 +39,7 @@ public static function snd(ITuple $tuple): mixed;
      *
      * @throws TupleParseException
      */
-    public static function parse(string $tuple, int $expectedItemsCount = null): self;
+    public static function parse(string $tuple, ?int $expectedItemsCount = null): self;
 
     /**
      * Parse "(x, y, ... z)" string into Tuple(x, y, z) and validates items types
@@ -153,11 +158,6 @@ public static function merge(ITuple $base, mixed ...$additional): ITuple;
      */
     public static function mergeMatch(array $types, ITuple $base, mixed ...$additional): ITuple;
 
-    /**
-     * @see Tuple::toString()
-     */
-    public function __toString(): string;
-
     /**
      * Transform tuple values into string (which is compatible with Tuple::parse() method)
      * @see Tuple::parse()