Merge pull request #1 from adhocore/develop

Develop

Author: adhocore

.travis.yml

@@ -1,10 +1,10 @@
 language: php
 
 php:
-  - 5.5
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
 
 install:
   - composer install --prefer-dist

readme.md

@@ -11,7 +11,7 @@ Heavily work in progress and not yet ready!
 
 ## Installation
 
-Requires PHP5.5 or later.
+Requires PHP5.6 or later.
 
 ```bash
 composer require adhocore/underscore

src/Helper.php

@@ -25,9 +25,11 @@ public static function asArray($data)
             return $data->get();
         }
 
+        // @codeCoverageIgnoreStart
         if ($data instanceof \Traversable) {
             return \iterator_to_array($data);
         }
+        // @codeCoverageIgnoreEnd
 
         if ($data instanceof \JsonSerializable) {
             return $data->jsonSerialize();

src/Underscore.php

@@ -44,11 +44,6 @@ public function each(callable $fn)
         return $this;
     }
 
-    public function forEach(callable $fn)
-    {
-        return $this->each($fn);
-    }
-
     public function map(callable $fn)
     {
         $data = [];
@@ -82,38 +77,31 @@ public function inject(callable $fn, $memo)
 
     public function reduceRight(callable $fn, $memo)
     {
-        // fix!
-        return array_reduce($this->data, $fn, $memo);
+        return array_reduce(array_reverse($this->data), $fn, $memo);
     }
 
     public function foldr(callable $fn, $memo)
     {
         return $this->reduceRight($fn, $memo);
     }
 
-    public function find(callabe $fn)
+    public function find(callable $fn)
     {
         foreach ($this->data as $index => $value) {
-            if ($fn($value, $key)) {
+            if ($fn($value, $index)) {
                 return $value;
             }
         }
     }
 
-    public function detect(callabe $fn)
+    public function detect(callable $fn)
     {
         return $this->find($fn);
     }
 
     public function filter(callable $fn)
     {
-        $data = [];
-
-        foreach ($this->data as $index => $value) {
-            if ($fn($value, $index)) {
-                $data[$index] = $value;
-            }
-        }
+        $data = array_filter($this->data, $fn, \ARRAY_FILTER_USE_BOTH);
 
         return new static($data);
     }
@@ -125,26 +113,21 @@ public function select(callable $fn)
 
     public function reject(callable $fn)
     {
-        $data = [];
-
-        foreach ($this->data as $index => $value) {
-            if (!$fn($value, $index)) {
-                $data[$index] = $value;
-            }
-        }
+        $data = array_filter($this->data, $this->negate($fn), \ARRAY_FILTER_USE_BOTH);
 
         return new static($data);
     }
 
-    public function every(callable $fn)
+    protected function negate(callable $fn)
     {
-        foreach ($this->data as $index => $value) {
-            if (!$fn($value, $index)) {
-                return false;
-            }
-        }
+        return function () use ($fn) {
+            return !call_user_func_array($fn, func_get_args());
+        };
+    }
 
-        return true;
+    public function every(callable $fn)
+    {
+        return $this->match($fn, true);
     }
 
     public function all(callable $fn)
@@ -154,31 +137,35 @@ public function all(callable $fn)
 
     public function some(callable $fn)
     {
-        foreach ($this->data as $index => $value) {
-            if ($fn($value, $index)) {
-                return true;
-            }
-        }
-
-        return false;
+        return $this->match($fn, false);
     }
 
     public function any(callable $fn)
     {
         return $this->some($fn);
     }
 
-    public function contains($item)
+    protected function match(callable $fn, $all = true)
     {
-        return \in_array($item, $this->data);
+        foreach ($this->data as $index => $value) {
+            if ($all && !$fn($value, $index)) {
+                return false;
+            }
+
+            if (!$all && $fn($value, $index)) {
+                return true;
+            }
+        }
+
+        return $all;
     }
 
-    public function includes($item)
+    public function contains($item)
     {
-        return $this->contains($item);
+        return \in_array($item, $this->data);
     }
 
-    public function include($item)
+    public function includes($item)
     {
         return $this->contains($item);
     }
@@ -190,15 +177,34 @@ public function invoke(callable $fn)
 
     public function pluck($columnKey, $indexKey = null)
     {
-        if (\function_exists('array_column')) {
-            $data = \array_column($this->data, $columnKey, $indexKey);
-        } else {
-            $data = Helper::arrayColumn($this->data, $columnKey, $indexKey);
-        }
+        $data = \array_column($this->data, $columnKey, $indexKey);
 
         return new static($data);
     }
 
+    public function where(array $props)
+    {
+        return $this->filter($this->matcher($props));
+    }
+
+    public function findWhere(array $props)
+    {
+        return $this->find($this->matcher($props));
+    }
+
+    protected function matcher(array $props)
+    {
+        return function ($value, $index) use ($props) {
+            foreach ($props as $prop => $criteria) {
+                if (\array_column([$value], $prop) != [$criteria]) {
+                    return false;
+                }
+            }
+
+            return true;
+        };
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -262,6 +268,11 @@ public function __toString()
     {
         return \json_encode($this->data);
     }
+
+    public static function _($data)
+    {
+        return new static($data);
+    }
 }
 
 \class_alias('Ahc\Underscore\Underscore', 'Ahc\Underscore');