refactor: optimize/cleanup

Author: adhocore

src/UnderscoreCollection.php

@@ -2,7 +2,7 @@
 
 namespace Ahc\Underscore;
 
-class UnderscoreCollection extends UnderscoreArray
+class UnderscoreCollection extends UnderscoreBase
 {
     public function each(callable $fn)
     {
@@ -46,19 +46,19 @@ public function inject(callable $fn, $memo)
 
     public function reduceRight(callable $fn, $memo)
     {
-        return \array_reduce(\array_reverse($this->data), $fn, $memo);
+        return \array_reduce(\array_reverse($this->data, true), $fn, $memo);
     }
 
     public function foldr(callable $fn, $memo)
     {
         return $this->reduceRight($fn, $memo);
     }
 
-    public function find(callable $fn)
+    public function find(callable $fn, $useValue = true)
     {
         foreach ($this->data as $index => $value) {
             if ($fn($value, $index)) {
-                return $value;
+                return $useValue ? $value : $index;
             }
         }
     }
@@ -68,8 +68,12 @@ public function detect(callable $fn)
         return $this->find($fn);
     }
 
-    public function filter(callable $fn)
+    public function filter($fn = null)
     {
+        if (null === $fn) {
+            return new static(\array_filter($this->data));
+        }
+
         $data = \array_filter($this->data, $fn, \ARRAY_FILTER_USE_BOTH);
 
         return new static($data);
@@ -247,23 +251,12 @@ protected function group($fn, $isGroup = true)
         $fn   = $this->valueFn($fn);
 
         foreach ($this->data as $index => $value) {
-            $isGroup ? $data[$fn($value)][$index] = $value : $data[$fn($value)] = $value;
+            $isGroup ? $data[$fn($value, $index)][$index] = $value : $data[$fn($value, $index)] = $value;
         }
 
         return new static($data);
     }
 
-    public function toArray()
-    {
-        return $this->map(function ($value) {
-            if (\is_scalar($value)) {
-                return $value;
-            }
-
-            return $this->asArray($value);
-        })->get();
-    }
-
     public function size()
     {
         return $this->count();
@@ -274,8 +267,8 @@ public function partition($fn)
         $data = [[/* pass */], [/* fail */]];
         $fn   = $this->valueFn($fn);
 
-        $this->each(function ($value, $key) use ($fn, &$data) {
-            $data[$fn($value, $key) ? 0 : 1][] = $value;
+        $this->each(function ($value, $index) use ($fn, &$data) {
+            $data[$fn($value, $index) ? 0 : 1][] = $value;
         });
 
         return new static($data);