Develop (#30)

fixes #31
narrowspark · Sep 17, 2016 · 51f4c8b · 51f4c8b
1 parent ced204a
commit 51f4c8b
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 22 deletions.
diff --git a/src/Arr/Arr.php b/src/Arr/Arr.php
@@ -237,7 +237,7 @@ public static function update(array $array, string $key, callable $callback)
             $current = &$current[$key];
         }
 
-        $current = call_user_func($callback, $current);
+        $current = $callback($current);
 
         return $array;
     }
@@ -491,7 +491,7 @@ public static function combine(array $array, callable $callback, bool $overwrite
         $combined = [];
 
         foreach ($array as $key => $value) {
-            $combinator = call_user_func($callback, $value, $key);
+            $combinator = $callback($value, $key);
 
             // fix for hhvm #1871 bug
             if (defined('HHVM_VERSION') && version_compare(HHVM_VERSION, '3.10.0', '<=')) {
@@ -738,7 +738,7 @@ public static function groupBy(array $array, callable $callback = null): array
         return array_reduce(
             $array,
             function ($buckets, $value) use ($callback) {
-                $key = call_user_func($callback, $value);
+                $key = $callback($value);
 
                 if (! array_key_exists($key, $buckets)) {
                     $buckets[$key] = [];
@@ -1026,7 +1026,7 @@ public static function map(array $array, callable $callback)
         $newArray = [];
 
         foreach ($array as $key => $item) {
-            $result = call_user_func($callback, $item, $key);
+            $result = $callback($item, $key);
 
             $newArray = is_array($result) ?
                 array_replace_recursive($array, $result) :
@@ -1046,15 +1046,7 @@ public static function map(array $array, callable $callback)
      */
     public static function filter(array $array, callable $callback)
     {
-        $newArray = [];
-
-        foreach ($array as $key => $item) {
-            if (call_user_func($callback, $item, $key)) {
-                $newArray[$key] = $item;
-            }
-        }
-
-        return $newArray;
+        return array_filter($array, $callback, ARRAY_FILTER_USE_BOTH);
     }
 
     /**
@@ -1069,7 +1061,7 @@ public static function filter(array $array, callable $callback)
     public static function all(array $array, callable $predicate)
     {
         foreach ($array as $key => $value) {
-            if (! call_user_func($predicate, $value, $key, $array)) {
+            if (! $predicate($value, $key, $array)) {
                 return false;
             }
         }
@@ -1088,7 +1080,7 @@ public static function all(array $array, callable $predicate)
     public static function reject(array $array, callable $callback): array
     {
         return static::filter($array, function ($value, $key) use ($callback) {
-            return ! call_user_func($callback, $value, $key);
+            return ! $callback($value, $key);
         });
     }
 
@@ -1105,7 +1097,7 @@ public static function where(array $array, callable $callback): array
         $filtered = [];
 
         foreach ($array as $key => $value) {
-            if (call_user_func($callback, $key, $value)) {
+            if ($callback($key, $value)) {
                 $filtered[$key] = $value;
             }
         }
@@ -1135,7 +1127,7 @@ public static function first(array $array, callable $callback = null, $default =
         }
 
         foreach ($array as $key => $value) {
-            if (call_user_func($callback, $key, $value)) {
+            if ($callback($key, $value)) {
                 return $value;
             }
         }
@@ -1154,11 +1146,26 @@ public static function first(array $array, callable $callback = null, $default =
      */
     public static function last(array $array, callable $callback = null, $default = null)
     {
-        if (is_null($callback)) {
+        if ($callback === null) {
             return empty($array) ? static::value($default) : end($array);
         }
 
-        return static::first(array_reverse($array), $callback, $default);
+        return static::first(array_reverse($array, true), $callback, $default);
+    }
+
+    /**
+     * Get all of the given array except for a specified array of items.
+     *
+     * @param array        $array
+     * @param array|string $keys
+     *
+     * @return array
+     */
+    public static function except(array $array, $keys): array
+    {
+        static::forget($array, $keys);
+
+        return $array;
     }
 
     /**

diff --git a/tests/TraverseTest.php b/tests/TraverseTest.php
@@ -25,6 +25,7 @@ public function testFirst()
         });
 
         $this->assertEquals(200, $value);
+        $this->assertEquals(100, Arr::first($array));
 
         $value = Arr::first($array, function ($key, $value) {
             if ($key === $value) {
@@ -62,11 +63,19 @@ public function testReject()
     public function testLast()
     {
         $array = [100, 200, 300];
-        $last = Arr::last($array, function () {
-            return true;
+
+        $last = Arr::last($array, function ($key, $value) {
+            return $value < 250;
+        });
+
+        $this->assertEquals(200, $last);
+
+        $last = Arr::last($array, function ($key) {
+            return $key < 2;
         });
 
-        $this->assertEquals(300, $last);
+        $this->assertEquals(200, $last);
+        $this->assertEquals(300, Arr::last($array));
     }
 
     public function testWhere()