Move static methods out of the Collection interface.

src/Collection.php

@@ -354,7 +354,11 @@ public function walk(callable ...$callbacks): CollectionInterface
     }
 
     /**
-     * {@inheritdoc}
+     * Create a new collection instance.
+     *
+     * @param null|array|callable|Closure|Collection $data
+     *
+     * @return \drupol\collection\Contract\Collection
      */
     public static function with($data = []): CollectionInterface
     {
@@ -366,27 +370,33 @@ public static function with($data = []): CollectionInterface
     }
 
     /**
-     * {@inheritdoc}
+     * @param array $data
+     *
+     * @return \drupol\collection\Contract\Collection
      */
-    public static function withArray(array $array): CollectionInterface
+    public static function withArray(array $data): CollectionInterface
     {
         $instance = new static();
 
-        $instance->source = static function () use ($array) {
-            yield from $array;
+        $instance->source = static function () use ($data) {
+            yield from $data;
         };
 
         return $instance;
     }
 
     /**
-     * {@inheritdoc}
+     * Create a new collection instance.
+     *
+     * @param callable $callable
+     *
+     * @return \drupol\collection\Contract\Collection
      */
-    public static function withClosure(callable $callback): CollectionInterface
+    public static function withClosure(callable $callable): CollectionInterface
     {
         $instance = new static();
 
-        $instance->source = $callback;
+        $instance->source = $callable;
 
         return $instance;
     }

src/Contract/Collection.php

@@ -4,8 +4,6 @@
 
 namespace drupol\collection\Contract;
 
-use Closure;
-
 /**
  * Interface Collection.
  */
@@ -249,31 +247,6 @@ public function slice(int $offset, int $length = null): self;
      */
     public function walk(callable ...$callbacks): self;
 
-    /**
-     * Create a new collection instance.
-     *
-     * @param null|array|callable|Closure|Collection $data
-     *
-     * @return \drupol\collection\Contract\Collection
-     */
-    public static function with($data = []): self;
-
-    /**
-     * @param array $data
-     *
-     * @return \drupol\collection\Contract\Collection
-     */
-    public static function withArray(array $data): self;
-
-    /**
-     * Create a new collection instance.
-     *
-     * @param callable $callable
-     *
-     * @return \drupol\collection\Contract\Collection
-     */
-    public static function withClosure(callable $callable): self;
-
     /**
      * Zip the collection together with one or more arrays.
      *

src/Operation/Append.php

@@ -4,7 +4,8 @@
 
 namespace drupol\collection\Operation;
 
-use drupol\collection\Contract\Collection;
+use drupol\collection\Collection;
+use drupol\collection\Contract\Collection as CollectionInterface;
 
 /**
  * Class Append.
@@ -14,11 +15,11 @@ final class Append extends Operation
     /**
      * {@inheritdoc}
      */
-    public function run(Collection $collection): Collection
+    public function run(CollectionInterface $collection): CollectionInterface
     {
         $items = $this->parameters;
 
-        return $collection::withClosure(
+        return Collection::withClosure(
             static function () use ($items, $collection) {
                 foreach ($collection as $item) {
                     yield $item;

src/Operation/Chunk.php

@@ -4,7 +4,8 @@
 
 namespace drupol\collection\Operation;
 
-use drupol\collection\Contract\Collection;
+use drupol\collection\Collection;
+use drupol\collection\Contract\Collection as CollectionInterface;
 
 /**
  * Class Chunk.
@@ -14,15 +15,15 @@ final class Chunk extends Operation
     /**
      * {@inheritdoc}
      */
-    public function run(Collection $collection): Collection
+    public function run(CollectionInterface $collection): CollectionInterface
     {
         $size = $this->parameters[0];
 
         if (0 >= $size) {
-            return $collection::with();
+            return Collection::with();
         }
 
-        return $collection::withClosure(
+        return Collection::withClosure(
             static function () use ($size, $collection) {
                 $iterator = $collection->getIterator();
 
@@ -33,7 +34,7 @@ static function () use ($size, $collection) {
                         $values[$iterator->key()] = $iterator->current();
                     }
 
-                    yield $collection::withArray($values);
+                    yield Collection::withArray($values);
                 }
             }
         );

src/Operation/Collapse.php

@@ -4,7 +4,8 @@
 
 namespace drupol\collection\Operation;
 
-use drupol\collection\Contract\Collection;
+use drupol\collection\Collection;
+use drupol\collection\Contract\Collection as CollectionInterface;
 
 /**
  * Class Collapse.
@@ -14,12 +15,12 @@ final class Collapse extends Operation
     /**
      * {@inheritdoc}
      */
-    public function run(Collection $collection): Collection
+    public function run(CollectionInterface $collection): CollectionInterface
     {
-        return $collection::withClosure(
+        return Collection::withClosure(
             static function () use ($collection) {
                 foreach ($collection as $values) {
-                    if (\is_array($values) || $values instanceof Collection) {
+                    if (\is_array($values) || $values instanceof CollectionInterface) {
                         yield from $values;
                     }
                 }

src/Operation/Combine.php

@@ -4,7 +4,8 @@
 
 namespace drupol\collection\Operation;
 
-use drupol\collection\Contract\Collection;
+use drupol\collection\Collection;
+use drupol\collection\Contract\Collection as CollectionInterface;
 
 /**
  * Class Combine.
@@ -14,14 +15,14 @@ final class Combine extends Operation
     /**
      * {@inheritdoc}
      */
-    public function run(Collection $collection): Collection
+    public function run(CollectionInterface $collection): CollectionInterface
     {
         $keys = $this->parameters;
 
-        return $collection::withClosure(
+        return Collection::withClosure(
             static function () use ($keys, $collection) {
                 $original = $collection->getIterator();
-                $keysIterator = $collection::with($keys)->getIterator();
+                $keysIterator = Collection::with($keys)->getIterator();
 
                 for (; true === ($original->valid() && $keysIterator->valid()); $original->next(), $keysIterator->next()
                 ) {

src/Operation/Filter.php

@@ -4,7 +4,8 @@
 
 namespace drupol\collection\Operation;
 
-use drupol\collection\Contract\Collection;
+use drupol\collection\Collection;
+use drupol\collection\Contract\Collection as CollectionInterface;
 
 /**
  * Class Filter.
@@ -14,7 +15,7 @@ final class Filter extends Operation
     /**
      * {@inheritdoc}
      */
-    public function run(Collection $collection): Collection
+    public function run(CollectionInterface $collection): CollectionInterface
     {
         $callback = $this->parameters[0];
 
@@ -24,7 +25,7 @@ public function run(Collection $collection): Collection
             };
         }
 
-        return $collection::withClosure(
+        return Collection::withClosure(
             static function () use ($callback, $collection) {
                 foreach ($collection->getIterator() as $key => $value) {
                     if (true === (bool) $callback($value, $key)) {

src/Operation/Flatten.php

@@ -4,7 +4,8 @@
 
 namespace drupol\collection\Operation;
 
-use drupol\collection\Contract\Collection;
+use drupol\collection\Collection;
+use drupol\collection\Contract\Collection as CollectionInterface;
 
 /**
  * Class Flatten.
@@ -14,11 +15,11 @@ final class Flatten extends Operation
     /**
      * {@inheritdoc}
      */
-    public function run(Collection $collection): Collection
+    public function run(CollectionInterface $collection): CollectionInterface
     {
         $depth = $this->parameters[0];
 
-        return $collection::withClosure(
+        return Collection::withClosure(
             static function () use ($depth, $collection) {
                 $iterator = $collection->getIterator();
 
@@ -30,7 +31,7 @@ static function () use ($depth, $collection) {
                             yield $i;
                         }
                     } else {
-                        foreach ($collection::with($item)->flatten($depth - 1) as $flattenItem) {
+                        foreach (Collection::with($item)->flatten($depth - 1) as $flattenItem) {
                             yield $flattenItem;
                         }
                     }

src/Operation/Flip.php

@@ -4,7 +4,8 @@
 
 namespace drupol\collection\Operation;
 
-use drupol\collection\Contract\Collection;
+use drupol\collection\Collection;
+use drupol\collection\Contract\Collection as CollectionInterface;
 
 /**
  * Class Flip.
@@ -14,9 +15,9 @@ final class Flip extends Operation
     /**
      * {@inheritdoc}
      */
-    public function run(Collection $collection): Collection
+    public function run(CollectionInterface $collection): CollectionInterface
     {
-        return $collection::withClosure(
+        return Collection::withClosure(
             static function () use ($collection) {
                 foreach ($collection as $key => $value) {
                     yield $value => $key;

src/Operation/Forget.php

@@ -4,7 +4,8 @@
 
 namespace drupol\collection\Operation;
 
-use drupol\collection\Contract\Collection;
+use drupol\collection\Collection;
+use drupol\collection\Contract\Collection as CollectionInterface;
 
 /**
  * Class Forget.
@@ -14,11 +15,11 @@ final class Forget extends Operation
     /**
      * {@inheritdoc}
      */
-    public function run(Collection $collection): Collection
+    public function run(CollectionInterface $collection): CollectionInterface
     {
         $keys = $this->parameters;
 
-        return $collection::withClosure(
+        return Collection::withClosure(
             static function () use ($keys, $collection) {
                 $keys = array_flip($keys);
 

src/Operation/Keys.php

@@ -4,7 +4,8 @@
 
 namespace drupol\collection\Operation;
 
-use drupol\collection\Contract\Collection;
+use drupol\collection\Collection;
+use drupol\collection\Contract\Collection as CollectionInterface;
 
 /**
  * Class Keys.
@@ -14,9 +15,9 @@ final class Keys extends Operation
     /**
      * {@inheritdoc}
      */
-    public function run(Collection $collection): Collection
+    public function run(CollectionInterface $collection): CollectionInterface
     {
-        return $collection::withClosure(
+        return Collection::withClosure(
             static function () use ($collection) {
                 foreach ($collection as $key => $value) {
                     yield $key;

src/Operation/Limit.php

@@ -4,7 +4,8 @@
 
 namespace drupol\collection\Operation;
 
-use drupol\collection\Contract\Collection;
+use drupol\collection\Collection;
+use drupol\collection\Contract\Collection as CollectionInterface;
 
 /**
  * Class Limit.
@@ -14,11 +15,11 @@ final class Limit extends Operation
     /**
      * {@inheritdoc}
      */
-    public function run(Collection $collection): Collection
+    public function run(CollectionInterface $collection): CollectionInterface
     {
         $limit = $this->parameters[0];
 
-        return $collection::withClosure(
+        return Collection::withClosure(
             static function () use ($limit, $collection) {
                 $iterator = $collection->getIterator();
 

src/Operation/Merge.php

@@ -4,7 +4,8 @@
 
 namespace drupol\collection\Operation;
 
-use drupol\collection\Contract\Collection;
+use drupol\collection\Collection;
+use drupol\collection\Contract\Collection as CollectionInterface;
 
 /**
  * Class Merge.
@@ -14,11 +15,11 @@ final class Merge extends Operation
     /**
      * {@inheritdoc}
      */
-    public function run(Collection $collection): Collection
+    public function run(CollectionInterface $collection): CollectionInterface
     {
         $sources = $this->parameters;
 
-        return $collection::withClosure(
+        return Collection::withClosure(
             static function () use ($sources, $collection) {
                 foreach ($collection as $item) {
                     yield $item;