Replace Closure type hint with callable

th3l0g4n · Oct 10, 2015 · 52dcaf0 · 52dcaf0
1 parent c624507
commit 52dcaf0
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 39 deletions.
diff --git a/src/AbstractArray.php b/src/AbstractArray.php
@@ -13,7 +13,6 @@
 use Arrayzy\Traits\TraversableTrait;
 use ArrayAccess;
 use ArrayIterator;
-use Closure;
 use Countable;
 use IteratorAggregate;
 use Traversable;
@@ -219,44 +218,44 @@ abstract public function sortKeys($order = SORT_ASC, $strategy = SORT_REGULAR);
     /**
      * Apply the given function to the array elements
      *
-     * @param Closure $func
+     * @param callable $func
      *
      * @return static The instance with modified elements
      */
-    abstract public function map(Closure $func);
+    abstract public function map(callable $func);
 
     /**
      * Filter array elements with given function
      *
-     * @param Closure $func
+     * @param callable $func
      *
      * @return static The instance with filtered elements
      */
-    abstract public function filter(Closure $func);
+    abstract public function filter(callable $func);
 
     /**
      * Apply the given function to every array element
      *
-     * @param Closure $func
+     * @param callable $func
      * @param bool $recursively Whether array will be walked recursively or no
      *
      * @return static The instance with modified elements
      */
-    abstract public function walk(Closure $func, $recursively = false);
+    abstract public function walk(callable $func, $recursively = false);
 
     /**
      * {@inheritdoc}
      *
      * @link http://php.net/manual/en/function.usort.php
      */
-    abstract public function customSort(Closure $func);
+    abstract public function customSort(callable $func);
 
     /**
      * {@inheritdoc}
      *
      * @link http://php.net/manual/en/function.uksort.php
      */
-    abstract public function customSortKeys(Closure $func);
+    abstract public function customSortKeys(callable $func);
 
     /**
      * Clear array
@@ -538,12 +537,12 @@ public function getValues()
     /**
      * Iteratively reduce array to a single value using a function
      *
-     * @param Closure $func
+     * @param callable $func
      * @param mixed|null $initial
      *
      * @return mixed The resulting value
      */
-    public function reduce(Closure $func, $initial = null)
+    public function reduce(callable $func, $initial = null)
     {
         return array_reduce($this->elements, $func, $initial);
     }
@@ -684,11 +683,11 @@ protected function sortingKeys(array &$elements, $order = SORT_ASC, $strategy =
     /**
      * Returns the first occurrence of value that matches $func conditions
      *
-     * @param Closure $func
+     * @param callable $func
      *
      * @return mixed The first found value occurrence
      */
-    public function find(Closure $func)
+    public function find(callable $func)
     {
         foreach ($this->elements as $key => $value) {
             if($func($value, $key)) {

diff --git a/src/ImmutableArray.php b/src/ImmutableArray.php
@@ -2,8 +2,6 @@
 
 namespace Arrayzy;
 
-use Closure;
-
 /**
  * Class ImmutableArray
  *
@@ -246,36 +244,36 @@ public function sortKeys($order = SORT_ASC, $strategy = SORT_REGULAR)
     /**
      * Apply the given function to the array elements
      *
-     * @param Closure $func
+     * @param callable $func
      *
      * @return static The new instance with modified elements
      */
-    public function map(Closure $func)
+    public function map(callable $func)
     {
         return new static(array_map($func, $this->elements));
     }
 
     /**
      * Filter array elements with given function
      *
-     * @param Closure $func
+     * @param callable $func
      *
      * @return static The new instance with filtered elements
      */
-    public function filter(Closure $func)
+    public function filter(callable $func)
     {
         return new static(array_filter($this->elements, $func));
     }
 
     /**
      * Apply the given function to every array element
      *
-     * @param Closure $func
+     * @param callable $func
      * @param bool $recursively Whether array will be walked recursively or no
      *
      * @return static The new instance with modified elements
      */
-    public function walk(Closure $func, $recursively = false)
+    public function walk(callable $func, $recursively = false)
     {
         $elements = $this->elements;
 
@@ -293,7 +291,7 @@ public function walk(Closure $func, $recursively = false)
      *
      * @link http://php.net/manual/en/function.usort.php
      */
-    public function customSort(Closure $func)
+    public function customSort(callable $func)
     {
         $elements = $this->elements;
 
@@ -307,7 +305,7 @@ public function customSort(Closure $func)
      *
      * @link http://php.net/manual/en/function.uksort.php
      */
-    public function customSortKeys(Closure $func)
+    public function customSortKeys(callable $func)
     {
         $elements = $this->elements;
 

diff --git a/src/Interfaces/SortableInterface.php b/src/Interfaces/SortableInterface.php
@@ -2,8 +2,6 @@
 
 namespace Arrayzy\Interfaces;
 
-use Closure;
-
 /**
  * An interface with helpful array sorting methods.
  *
@@ -59,18 +57,18 @@ public function sortKeys($order = SORT_ASC, $strategy = SORT_REGULAR);
     /**
      * Sorts the array elements with a user-defined comparison function and maintain index association.
      *
-     * @param Closure $func
+     * @param callable $func
      *
      * @return SortableInterface The instance with custom sorted elements
      */
-    public function customSort(Closure $func);
+    public function customSort(callable $func);
 
     /**
      * Sorts the array keys with a user-defined comparison function and maintain index association.
      *
-     * @param Closure $func
+     * @param callable $func
      *
      * @return SortableInterface The instance with custom sorted elements
      */
-    public function customSortKeys(Closure $func);
+    public function customSortKeys(callable $func);
 }
diff --git a/src/MutableArray.php b/src/MutableArray.php
@@ -2,8 +2,6 @@
 
 namespace Arrayzy;
 
-use Closure;
-
 /**
  * Class MutableArray
  *
@@ -270,11 +268,11 @@ public function sortKeys($order = SORT_ASC, $strategy = SORT_REGULAR)
     /**
      * Apply the given function to the array elements
      *
-     * @param Closure $func
+     * @param callable $func
      *
      * @return $this The same instance with modified elements
      */
-    public function map(Closure $func)
+    public function map(callable $func)
     {
         $this->elements = array_map($func, $this->elements);
 
@@ -284,11 +282,11 @@ public function map(Closure $func)
     /**
      * Filter array elements with given function
      *
-     * @param Closure $func
+     * @param callable $func
      *
      * @return $this The same instance with filtered elements
      */
-    public function filter(Closure $func)
+    public function filter(callable $func)
     {
         $this->elements = array_filter($this->elements, $func);
 
@@ -298,12 +296,12 @@ public function filter(Closure $func)
     /**
      * Apply the given function to every array element
      *
-     * @param Closure $func
+     * @param callable $func
      * @param bool $recursively Whether array will be walked recursively or no
      *
      * @return $this The same instance with modified elements
      */
-    public function walk(Closure $func, $recursively = false)
+    public function walk(callable $func, $recursively = false)
     {
         if (true === $recursively) {
             array_walk_recursive($this->elements, $func);
@@ -319,7 +317,7 @@ public function walk(Closure $func, $recursively = false)
      *
      * @link http://php.net/manual/en/function.usort.php
      */
-    public function customSort(Closure $func)
+    public function customSort(callable $func)
     {
         usort($this->elements, $func);
 
@@ -331,7 +329,7 @@ public function customSort(Closure $func)
      *
      * @link http://php.net/manual/en/function.uksort.php
      */
-    public function customSortKeys(Closure $func)
+    public function customSortKeys(callable $func)
     {
         uksort($this->elements, $func);