Refactoring. Pass the $collection object by default to the static fun…

…ction returned by the Operation object. Rename Operation::on() in Operation::__invoke().
loophp · May 30, 2020 · c1b3f91 · c1b3f91
1 parent 17af0b2
commit c1b3f91
Show file tree

Hide file tree

Showing 114 changed files with 343 additions and 198 deletions.
diff --git a/spec/loophp/collection/CollectionSpec.php b/spec/loophp/collection/CollectionSpec.php
@@ -7,6 +7,7 @@
 use ArrayObject;
 use Closure;
 use Exception;
+use Generator;
 use Iterator;
 use loophp\collection\Collection;
 use loophp\collection\Contract\Operation;
@@ -1061,9 +1062,9 @@ public function it_can_rsample(): void
     public function it_can_run_an_operation(Operation $operation): void
     {
         $square = new class() implements Operation {
-            public function on(iterable $collection): Closure
+            public function __invoke(): Closure
             {
-                return static function () use ($collection) {
+                return static function ($collection): Generator {
                     foreach ($collection as $item) {
                         yield $item ** 2;
                     }
@@ -1072,9 +1073,9 @@ public function on(iterable $collection): Closure
         };
 
         $sqrt = new class() implements Operation {
-            public function on(iterable $collection): Closure
+            public function __invoke(): Closure
             {
-                return static function () use ($collection) {
+                return static function ($collection) {
                     foreach ($collection as $item) {
                         yield $item ** .5;
                     }
@@ -1083,9 +1084,9 @@ public function on(iterable $collection): Closure
         };
 
         $map = new class() implements Operation {
-            public function on(iterable $collection): Closure
+            public function __invoke(): Closure
             {
-                return static function () use ($collection) {
+                return static function ($collection) {
                     foreach ($collection as $item) {
                         yield (int) $item;
                     }

diff --git a/src/Base.php b/src/Base.php
@@ -108,14 +108,14 @@ public function getIterator(): ClosureIterator
      */
     public function run(Operation ...$operations)
     {
-        return new static((new Run(...$operations))->on($this));
+        return new static((new Run(...$operations))($this));
     }
 
     /**
      * {@inheritdoc}
      */
     public function transform(Transformation ...$transformers)
     {
-        return (new Transform(...$transformers))->on($this);
+        return (new Transform(...$transformers))($this);
     }
 }
diff --git a/src/Contract/Base.php b/src/Contract/Base.php
@@ -5,6 +5,8 @@
 namespace loophp\collection\Contract;
 
 use IteratorAggregate;
+use loophp\collection\Contract\Transformation\Runable;
+use loophp\collection\Contract\Transformation\Transformable;
 
 /**
  * Interface Base.

diff --git a/src/Contract/Collection.php b/src/Contract/Collection.php
@@ -4,6 +4,57 @@
 
 namespace loophp\collection\Contract;
 
+use loophp\collection\Contract\Operation\Appendable;
+use loophp\collection\Contract\Operation\Applyable;
+use loophp\collection\Contract\Operation\Chunkable;
+use loophp\collection\Contract\Operation\Collapseable;
+use loophp\collection\Contract\Operation\Combinateable;
+use loophp\collection\Contract\Operation\Combineable;
+use loophp\collection\Contract\Operation\Cycleable;
+use loophp\collection\Contract\Operation\Distinctable;
+use loophp\collection\Contract\Operation\Explodeable;
+use loophp\collection\Contract\Operation\Filterable;
+use loophp\collection\Contract\Operation\Flattenable;
+use loophp\collection\Contract\Operation\Flipable;
+use loophp\collection\Contract\Operation\Forgetable;
+use loophp\collection\Contract\Operation\Intersperseable;
+use loophp\collection\Contract\Operation\Keysable;
+use loophp\collection\Contract\Operation\Limitable;
+use loophp\collection\Contract\Operation\Loopable;
+use loophp\collection\Contract\Operation\Mapable;
+use loophp\collection\Contract\Operation\Mergeable;
+use loophp\collection\Contract\Operation\Normalizeable;
+use loophp\collection\Contract\Operation\Nthable;
+use loophp\collection\Contract\Operation\Onlyable;
+use loophp\collection\Contract\Operation\Padable;
+use loophp\collection\Contract\Operation\Permutateable;
+use loophp\collection\Contract\Operation\Pluckable;
+use loophp\collection\Contract\Operation\Prependable;
+use loophp\collection\Contract\Operation\Productable;
+use loophp\collection\Contract\Operation\Reductionable;
+use loophp\collection\Contract\Operation\Reverseable;
+use loophp\collection\Contract\Operation\RSampleable;
+use loophp\collection\Contract\Operation\Scaleable;
+use loophp\collection\Contract\Operation\Shuffleable;
+use loophp\collection\Contract\Operation\Skipable;
+use loophp\collection\Contract\Operation\Sliceable;
+use loophp\collection\Contract\Operation\Sortable;
+use loophp\collection\Contract\Operation\Splitable;
+use loophp\collection\Contract\Operation\Tailable;
+use loophp\collection\Contract\Operation\Untilable;
+use loophp\collection\Contract\Operation\Walkable;
+use loophp\collection\Contract\Operation\Windowable;
+use loophp\collection\Contract\Operation\Zipable;
+use loophp\collection\Contract\Transformation\Allable;
+use loophp\collection\Contract\Transformation\Containsable;
+use loophp\collection\Contract\Transformation\Firstable;
+use loophp\collection\Contract\Transformation\FoldLeftable;
+use loophp\collection\Contract\Transformation\FoldRightable;
+use loophp\collection\Contract\Transformation\Getable;
+use loophp\collection\Contract\Transformation\Implodeable;
+use loophp\collection\Contract\Transformation\Lastable;
+use loophp\collection\Contract\Transformation\Reduceable;
+
 use const INF;
 
 /**

diff --git a/src/Contract/Operation.php b/src/Contract/Operation.php
@@ -9,12 +9,10 @@
 /**
  * Interface Operation.
  */
-interface Operation extends Transformation
+interface Operation
 {
     /**
-     * @param iterable<mixed> $collection
-     *
      * @return Closure
      */
-    public function on(iterable $collection): Closure;
+    public function __invoke(): Closure;
 }
diff --git a/src/Contract/Appendable.php → src/Contract/Operation/Appendable.php b/src/Contract/Appendable.php → src/Contract/Operation/Appendable.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace loophp\collection\Contract;
+namespace loophp\collection\Contract\Operation;
+
+use loophp\collection\Contract\Base;
 
 /**
  * Interface Appendable.

diff --git a/src/Contract/Applyable.php → src/Contract/Operation/Applyable.php b/src/Contract/Applyable.php → src/Contract/Operation/Applyable.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace loophp\collection\Contract;
+namespace loophp\collection\Contract\Operation;
+
+use loophp\collection\Contract\Base;
 
 /**
  * Interface Applyable.

diff --git a/src/Contract/Chunkable.php → src/Contract/Operation/Chunkable.php b/src/Contract/Chunkable.php → src/Contract/Operation/Chunkable.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace loophp\collection\Contract;
+namespace loophp\collection\Contract\Operation;
+
+use loophp\collection\Contract\Base;
 
 /**
  * Interface Chunkable.

diff --git a/src/Contract/Collapseable.php → src/Contract/Operation/Collapseable.php b/src/Contract/Collapseable.php → src/Contract/Operation/Collapseable.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace loophp\collection\Contract;
+namespace loophp\collection\Contract\Operation;
+
+use loophp\collection\Contract\Base;
 
 /**
  * Interface Collapseable.

diff --git a/src/Contract/Combinateable.php → src/Contract/Operation/Combinateable.php b/src/Contract/Combinateable.php → src/Contract/Operation/Combinateable.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace loophp\collection\Contract;
+namespace loophp\collection\Contract\Operation;
+
+use loophp\collection\Contract\Base;
 
 /**
  * Interface Combinateable.

diff --git a/src/Contract/Combineable.php → src/Contract/Operation/Combineable.php b/src/Contract/Combineable.php → src/Contract/Operation/Combineable.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace loophp\collection\Contract;
+namespace loophp\collection\Contract\Operation;
+
+use loophp\collection\Contract\Base;
 
 /**
  * Interface Combineable.

diff --git a/src/Contract/Cycleable.php → src/Contract/Operation/Cycleable.php b/src/Contract/Cycleable.php → src/Contract/Operation/Cycleable.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace loophp\collection\Contract;
+namespace loophp\collection\Contract\Operation;
+
+use loophp\collection\Contract\Base;
 
 /**
  * Interface Cycleable.

diff --git a/src/Contract/Distinctable.php → src/Contract/Operation/Distinctable.php b/src/Contract/Distinctable.php → src/Contract/Operation/Distinctable.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace loophp\collection\Contract;
+namespace loophp\collection\Contract\Operation;
+
+use loophp\collection\Contract\Base;
 
 /**
  * Interface Distinctable.

diff --git a/src/Contract/Explodeable.php → src/Contract/Operation/Explodeable.php b/src/Contract/Explodeable.php → src/Contract/Operation/Explodeable.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace loophp\collection\Contract;
+namespace loophp\collection\Contract\Operation;
+
+use loophp\collection\Contract\Base;
 
 /**
  * Interface Explodeable.

diff --git a/src/Contract/Filterable.php → src/Contract/Operation/Filterable.php b/src/Contract/Filterable.php → src/Contract/Operation/Filterable.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace loophp\collection\Contract;
+namespace loophp\collection\Contract\Operation;
+
+use loophp\collection\Contract\Base;
 
 /**
  * Interface Filterable.

diff --git a/src/Contract/Flattenable.php → src/Contract/Operation/Flattenable.php b/src/Contract/Flattenable.php → src/Contract/Operation/Flattenable.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace loophp\collection\Contract;
+namespace loophp\collection\Contract\Operation;
+
+use loophp\collection\Contract\Base;
 
 use const PHP_INT_MAX;
 

diff --git a/src/Contract/Flipable.php → src/Contract/Operation/Flipable.php b/src/Contract/Flipable.php → src/Contract/Operation/Flipable.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace loophp\collection\Contract;
+namespace loophp\collection\Contract\Operation;
+
+use loophp\collection\Contract\Base;
 
 /**
  * Interface Flipable.

diff --git a/src/Contract/Forgetable.php → src/Contract/Operation/Forgetable.php b/src/Contract/Forgetable.php → src/Contract/Operation/Forgetable.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace loophp\collection\Contract;
+namespace loophp\collection\Contract\Operation;
+
+use loophp\collection\Contract\Base;
 
 /**
  * Interface Forgetable.

diff --git a/src/Contract/Intersperseable.php → src/Contract/Operation/Intersperseable.php b/src/Contract/Intersperseable.php → src/Contract/Operation/Intersperseable.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace loophp\collection\Contract;
+namespace loophp\collection\Contract\Operation;
+
+use loophp\collection\Contract\Base;
 
 /**
  * Interface Intersperseable.

diff --git a/src/Contract/Keysable.php → src/Contract/Operation/Keysable.php b/src/Contract/Keysable.php → src/Contract/Operation/Keysable.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace loophp\collection\Contract;
+namespace loophp\collection\Contract\Operation;
+
+use loophp\collection\Contract\Base;
 
 /**
  * Interface Keysable.

diff --git a/src/Contract/Limitable.php → src/Contract/Operation/Limitable.php b/src/Contract/Limitable.php → src/Contract/Operation/Limitable.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace loophp\collection\Contract;
+namespace loophp\collection\Contract\Operation;
+
+use loophp\collection\Contract\Base;
 
 /**
  * Interface Limitable.

diff --git a/src/Contract/Loopable.php → src/Contract/Operation/Loopable.php b/src/Contract/Loopable.php → src/Contract/Operation/Loopable.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace loophp\collection\Contract;
+namespace loophp\collection\Contract\Operation;
+
+use loophp\collection\Contract\Base;
 
 /**
  * Interface Loopable.

diff --git a/src/Contract/Mapable.php → src/Contract/Operation/Mapable.php b/src/Contract/Mapable.php → src/Contract/Operation/Mapable.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace loophp\collection\Contract;
+namespace loophp\collection\Contract\Operation;
+
+use loophp\collection\Contract\Base;
 
 /**
  * Interface Mapable.

diff --git a/src/Contract/Mergeable.php → src/Contract/Operation/Mergeable.php b/src/Contract/Mergeable.php → src/Contract/Operation/Mergeable.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace loophp\collection\Contract;
+namespace loophp\collection\Contract\Operation;
+
+use loophp\collection\Contract\Base;
 
 /**
  * Interface Mergeable.

diff --git a/src/Contract/Normalizeable.php → src/Contract/Operation/Normalizeable.php b/src/Contract/Normalizeable.php → src/Contract/Operation/Normalizeable.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace loophp\collection\Contract;
+namespace loophp\collection\Contract\Operation;
+
+use loophp\collection\Contract\Base;
 
 /**
  * Interface Normalizeable.

diff --git a/src/Contract/Nthable.php → src/Contract/Operation/Nthable.php b/src/Contract/Nthable.php → src/Contract/Operation/Nthable.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace loophp\collection\Contract;
+namespace loophp\collection\Contract\Operation;
+
+use loophp\collection\Contract\Base;
 
 /**
  * Interface Nthable.

diff --git a/src/Contract/Onlyable.php → src/Contract/Operation/Onlyable.php b/src/Contract/Onlyable.php → src/Contract/Operation/Onlyable.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace loophp\collection\Contract;
+namespace loophp\collection\Contract\Operation;
+
+use loophp\collection\Contract\Base;
 
 /**
  * Interface Onlyable.

diff --git a/src/Contract/Padable.php → src/Contract/Operation/Padable.php b/src/Contract/Padable.php → src/Contract/Operation/Padable.php
@@ -2,7 +2,9 @@
 
 declare(strict_types=1);
 
-namespace loophp\collection\Contract;
+namespace loophp\collection\Contract\Operation;
+
+use loophp\collection\Contract\Base;
 
 /**
  * Interface Padable.