refactor: Use new keyword everywhere.

Follow up of previous commit.
loophp · Feb 3, 2022 · 8a3a05a · 8a3a05a
1 parent a69acec
commit 8a3a05a
Show file tree

Hide file tree

Showing 119 changed files with 84 additions and 324 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -75,6 +75,11 @@ parameters:
 			count: 1
 			path: src/Operation/Head.php
 
+		-
+			message: "#^Parameter \\#1 \\.\\.\\.\\$ of closure expects callable\\(mixed, mixed, iterable\\)\\: bool, Closure\\(mixed, mixed, CachingIterator\\)\\: bool given\\.$#"
+			count: 1
+			path: src/Operation/Init.php
+
 		-
 			message: "#^Foreach overwrites \\$current with its value variable\\.$#"
 			count: 1

diff --git a/src/Contract/Operation.php b/src/Contract/Operation.php
@@ -11,16 +11,12 @@
 
 use Closure;
 
-/** @immutable */
+/**
+ * @immutable
+ */
 interface Operation
 {
-    /**
-     * @pure
-     */
     public function __invoke(): Closure;
 
-    /**
-     * @pure
-     */
     public static function of(): Closure;
 }
diff --git a/src/Operation/AbstractOperation.php b/src/Operation/AbstractOperation.php
@@ -17,16 +17,10 @@
  */
 abstract class AbstractOperation implements Operation
 {
-    /**
-     * @pure
-     */
     final public function __construct()
     {
     }
 
-    /**
-     * @pure
-     */
     public static function of(): Closure
     {
         return (new static())->__invoke();

diff --git a/src/Operation/All.php b/src/Operation/All.php
@@ -20,8 +20,6 @@
 final class All extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @return Closure(bool): Closure(iterable<TKey, T>): iterable<int, T>|iterable<TKey, T>
      */
     public function __invoke(): Closure

diff --git a/src/Operation/Append.php b/src/Operation/Append.php
@@ -24,8 +24,6 @@
 final class Append extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @return Closure(T...): Closure(iterable<TKey, T>): Generator<int|TKey, T>
      */
     public function __invoke(): Closure

diff --git a/src/Operation/Apply.php b/src/Operation/Apply.php
@@ -23,8 +23,6 @@
 final class Apply extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @return Closure(callable(T=, TKey=, iterable<TKey, T>=):bool ...): Closure(iterable<TKey, T>): Generator<TKey, T>
      */
     public function __invoke(): Closure

diff --git a/src/Operation/Associate.php b/src/Operation/Associate.php
@@ -23,8 +23,6 @@
 final class Associate extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @template NewTKey
      * @template NewT
      *

diff --git a/src/Operation/AsyncMap.php b/src/Operation/AsyncMap.php
@@ -36,8 +36,6 @@
 final class AsyncMap extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @template V
      *
      * @return Closure(callable(T, TKey): V): Closure(iterable<TKey, T>): Generator<TKey, V>

diff --git a/src/Operation/AsyncMapN.php b/src/Operation/AsyncMapN.php
@@ -36,8 +36,6 @@
 final class AsyncMapN extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @return Closure(callable(mixed, mixed): mixed ...): Closure(iterable<TKey, T>): Generator<mixed, mixed>
      */
     public function __invoke(): Closure

diff --git a/src/Operation/Cache.php b/src/Operation/Cache.php
@@ -26,8 +26,6 @@
 final class Cache extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @return Closure(CacheItemPoolInterface): Closure(iterable<TKey, T>): Generator<TKey, T>
      */
     public function __invoke(): Closure

diff --git a/src/Operation/Chunk.php b/src/Operation/Chunk.php
@@ -24,8 +24,6 @@
 final class Chunk extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @return Closure(int...): Closure(iterable<TKey, T>): Generator<int, list<T>>
      */
     public function __invoke(): Closure

diff --git a/src/Operation/Coalesce.php b/src/Operation/Coalesce.php
@@ -21,16 +21,14 @@
 final class Coalesce extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @return Closure(iterable<TKey, T>): Generator<TKey, T>
      */
     public function __invoke(): Closure
     {
         /** @var Closure(iterable<TKey, T>): Generator<TKey, T> $pipe */
-        $pipe = Pipe::of()(
-            Compact::of()(),
-            Head::of(),
+        $pipe = (new Pipe())()(
+            (new Compact())()(),
+            (new Head())(),
         );
 
         // Point free style.

diff --git a/src/Operation/Collapse.php b/src/Operation/Collapse.php
@@ -21,8 +21,6 @@
 final class Collapse extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @psalm-suppress ImpureFunctionCall - using Filter and Flatten as an internal tools, not returned.
      *
      * @return Closure(iterable<TKey, (T|iterable<TKey, T>)>): Generator<TKey, T>

diff --git a/src/Operation/Column.php b/src/Operation/Column.php
@@ -21,8 +21,6 @@
 final class Column extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @return Closure(mixed): Closure(iterable<TKey, T>): Generator<int, mixed>
      */
     public function __invoke(): Closure

diff --git a/src/Operation/Combinate.php b/src/Operation/Combinate.php
@@ -23,9 +23,6 @@
  */
 final class Combinate extends AbstractOperation
 {
-    /**
-     * @pure
-     */
     public function __invoke(): Closure
     {
         return static function (?int $length = null): Closure {

diff --git a/src/Operation/Combine.php b/src/Operation/Combine.php
@@ -25,8 +25,6 @@
 final class Combine extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @template U
      *
      * @return Closure(U...): Closure(iterable<TKey, T>): Generator<null|U, null|T>

diff --git a/src/Operation/Compact.php b/src/Operation/Compact.php
@@ -25,8 +25,6 @@
 final class Compact extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @return Closure(T...): Closure(iterable<TKey, T>): Generator<TKey, T>
      */
     public function __invoke(): Closure

diff --git a/src/Operation/Contains.php b/src/Operation/Contains.php
@@ -21,8 +21,6 @@
 final class Contains extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @return Closure(T ...$values): Closure(iterable<TKey, T>): Generator<TKey, bool>
      */
     public function __invoke(): Closure

diff --git a/src/Operation/Current.php b/src/Operation/Current.php
@@ -21,8 +21,6 @@
 final class Current extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @template V
      *
      * @return Closure(TKey): Closure(V): Closure(iterable<TKey, T>): Generator<int, T|V>

diff --git a/src/Operation/Cycle.php b/src/Operation/Cycle.php
@@ -22,8 +22,6 @@
 final class Cycle extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @return Closure(iterable<TKey, T>): iterable<TKey, T>
      */
     public function __invoke(): Closure

diff --git a/src/Operation/Diff.php b/src/Operation/Diff.php
@@ -23,8 +23,6 @@
 final class Diff extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @return Closure(T...): Closure(iterable<TKey, T>): Generator<TKey, T>
      */
     public function __invoke(): Closure

diff --git a/src/Operation/DiffKeys.php b/src/Operation/DiffKeys.php
@@ -23,8 +23,6 @@
 final class DiffKeys extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @return Closure(TKey...): Closure(iterable<TKey, T>): Generator<TKey, T>
      */
     public function __invoke(): Closure

diff --git a/src/Operation/Distinct.php b/src/Operation/Distinct.php
@@ -23,8 +23,6 @@
 final class Distinct extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @template U
      *
      * @return Closure(callable(U): Closure(U): bool): Closure(callable(T, TKey): U): Closure(iterable<TKey, T>): Generator<TKey, T>

diff --git a/src/Operation/Drop.php b/src/Operation/Drop.php
@@ -23,12 +23,10 @@
 final class Drop extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @return Closure(int): Closure(iterable<TKey, T>): Generator<TKey, T>
      */
     public function __invoke(): Closure
     {
-        return Limit::of()(-1);
+        return (new Limit())()(-1);
     }
 }
diff --git a/src/Operation/DropWhile.php b/src/Operation/DropWhile.php
@@ -24,8 +24,6 @@
 final class DropWhile extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @return Closure(callable(T=, TKey=, iterable<TKey, T>=): bool ...): Closure(iterable<TKey, T>): Generator<TKey, T>
      */
     public function __invoke(): Closure

diff --git a/src/Operation/Dump.php b/src/Operation/Dump.php
@@ -24,8 +24,6 @@
 final class Dump extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @return Closure(string): Closure(int): Closure(?Closure): Closure(iterable<TKey, T>): Generator<TKey, T>
      */
     public function __invoke(): Closure

diff --git a/src/Operation/Duplicate.php b/src/Operation/Duplicate.php
@@ -23,8 +23,6 @@
 final class Duplicate extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @template U
      *
      * @return Closure(callable(U): Closure(U): bool): Closure(callable(T, TKey): U): Closure(iterable<TKey, T>): Generator<TKey, T>

diff --git a/src/Operation/Equals.php b/src/Operation/Equals.php
@@ -24,8 +24,6 @@
 final class Equals extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @return Closure(iterable<TKey, T>): Closure(iterable<TKey, T>): Generator<int|TKey, bool>
      */
     public function __invoke(): Closure

diff --git a/src/Operation/Every.php b/src/Operation/Every.php
@@ -24,8 +24,6 @@
 final class Every extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @return Closure(callable(T, TKey, iterable<TKey, T>...): bool): Closure(callable(T, TKey, iterable<TKey, T>...): bool): Closure(iterable<TKey, T>): Generator<TKey, bool>
      */
     public function __invoke(): Closure

diff --git a/src/Operation/Explode.php b/src/Operation/Explode.php
@@ -22,8 +22,6 @@
 final class Explode extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @return Closure(T...): Closure(iterable<TKey, T>): Generator<int, list<T>>
      */
     public function __invoke(): Closure

diff --git a/src/Operation/Falsy.php b/src/Operation/Falsy.php
@@ -21,8 +21,6 @@
 final class Falsy extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @return Closure(iterable<TKey, T>): Generator<int, bool>
      */
     public function __invoke(): Closure
@@ -35,15 +33,15 @@ public function __invoke(): Closure
             static fn (bool $value): bool => $value;
 
         /** @var Closure(iterable<TKey, T>): Generator<int, bool> $pipe */
-        $pipe = Pipe::of()(
-            Map::of()(
+        $pipe = (new Pipe())()(
+            (new Map())()(
                 /**
                  * @param T $value
                  */
                 static fn ($value): bool => (bool) $value
             ),
-            MatchOne::of()($matchWhenNot)($matcher),
-            Map::of()(
+            (new MatchOne())()($matchWhenNot)($matcher),
+            (new Map())()(
                 /**
                  * @param bool $value
                  */

diff --git a/src/Operation/Filter.php b/src/Operation/Filter.php
@@ -24,8 +24,6 @@
 final class Filter extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @return Closure(callable(T=, TKey=, iterable<TKey, T>=): bool ...): Closure(iterable<TKey, T>): Generator<TKey, T>
      */
     public function __invoke(): Closure

diff --git a/src/Operation/Find.php b/src/Operation/Find.php
@@ -23,8 +23,6 @@
 final class Find extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @template V
      *
      * @return Closure(V): Closure(callable(T=, TKey=, iterable<TKey, T>=): bool ...): Closure(iterable<TKey, T>): Generator<TKey, T|V>

diff --git a/src/Operation/First.php b/src/Operation/First.php
@@ -21,14 +21,12 @@
 final class First extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @return Closure(iterable<TKey, T>): Generator<TKey, T>
      */
     public function __invoke(): Closure
     {
         /** @var Closure(iterable<TKey, T>): Generator<TKey, T> $head */
-        $head = Head::of();
+        $head = (new Head())();
 
         // Point free style.
         return $head;

diff --git a/src/Operation/FlatMap.php b/src/Operation/FlatMap.php
@@ -23,8 +23,6 @@
 final class FlatMap extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @template IKey
      * @template IValue
      *

diff --git a/src/Operation/Flatten.php b/src/Operation/Flatten.php
@@ -21,8 +21,6 @@
 final class Flatten extends AbstractOperation
 {
     /**
-     * @pure
-     *
      * @return Closure(int): Closure(iterable<TKey, T>): Generator<mixed, mixed>
      */
     public function __invoke(): Closure
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,8 +20,6 @@ @@
     final class All extends AbstractOperation
     {
         /**
-         * @pure
-         *
          * @return Closure(bool): Closure(iterable<TKey, T>): iterable<int, T>|iterable<TKey, T>
          */
         public function __invoke(): Closure
@@ Expand Down @@