Reworked function internals

Author: ace411

src/Functional/Internal/_Partial.php

@@ -10,8 +10,7 @@
 
 namespace Chemem\Bingo\Functional\Internal;
 
-require_once __DIR__ . '/_Merge.php';
-require_once __DIR__ . '/_Size.php';
+require_once __DIR__ . '/_Fold.php';
 
 const _partial = __NAMESPACE__ . '\\_partial';
 
@@ -34,20 +33,54 @@ function _partial(
 ): callable {
   $argCount = (new \ReflectionFunction($func))
     ->getNumberOfRequiredParameters();
+  $merge    = function (...$item): array {
+    return _fold(
+      function (array $acc, $value) {
+        if (\is_array($value)) {
+          foreach ($value as $entry) {
+            $acc['size'] += 1;
+            $acc['acc'][] = $entry;
+          }
+        }
 
-  $acc      = function (...$inner) use (&$acc, $func, $argCount, $left) {
+        return $acc;
+      },
+      $item,
+      [
+        'size'  => 0,
+        'acc'   => [],
+      ]
+    );
+  };
+  $acc      = function (...$inner) use (
+    &$acc,
+    $func,
+    $argCount,
+    $left,
+    $merge
+  ): callable {
     return function (...$innermost) use (
       $inner,
       $acc,
       $func,
       $left,
-      $argCount
+      $argCount,
+      $merge
     ) {
-      $final = $left ?
-        _merge(false, $inner, $innermost) :
-        _merge(false, \array_reverse($innermost), \array_reverse($inner));
+      [
+        'size'  => $size,
+        'acc'   => $final
+      ] = $merge(
+        false,
+        $left ?
+          $inner :
+          \array_reverse($innermost),
+        $left ?
+          $innermost :
+          \array_reverse($inner)
+      );
 
-      if ($argCount <= _size($final)) {
+      if ($argCount <= $size) {
         return $func(...$final);
       }
 

src/Functional/Intersects.php

@@ -28,36 +28,14 @@
  */
 function intersects($first, $second): bool
 {
-  if (\is_object($first) && \is_object($second)) {
-    $first  = \get_object_vars($first);
-    $second = \get_object_vars($second);
-  }
-
-  $fsize     = size($first);
-  $ssize     = size($second);
-  $intersect = false;
-
-  if ($fsize > $ssize) {
-    foreach ($second as $val) {
-      if (has($first, $val)) {
-        $intersect = true;
-
-        if ($intersect == true) {
-          break;
-        }
-      }
-    }
-  } else {
-    foreach ($first as $val) {
-      if (has($second, $val)) {
-        $intersect = true;
+  $intersects = false;
 
-        if ($intersect == true) {
-          break;
-        }
-      }
+  foreach ($first as $value) {
+    if (has($second, $value)) {
+      $intersects = true;
+      break;
     }
   }
 
-  return $intersect;
+  return $intersects;
 }

src/Functional/IsArrayOf.php

@@ -18,24 +18,34 @@
  *
  * isArrayOf :: [a] -> String
  *
- * @param array $list
- * @return string
+ * @param array|object $list
+ * @return string|null
  * @example
  *
  * isArrayOf(['foo', 'bar', 'baz'])
  * => 'string'
  */
-function isArrayOf($list): string
+function isArrayOf($list): ?string
 {
-  $types = fold(
-    function ($types, $entry) {
-      $types[] = \gettype($entry);
+  $cache  = [];
+  $type   = null;
+  $idx    = 0;
 
-      return unique($types);
-    },
-    $list,
-    []
-  );
+  foreach ($list as $value) {
+    $tmp = \gettype($value);
 
-  return size($types) > 1 ? 'mixed' : head($types);
+    if ($idx++ > 0) {
+      if (\in_array($tmp, $cache)) {
+        $type = $tmp;
+      } else {
+        $type = 'mixed';
+        break;
+      }
+    } else {
+      $cache[]  = $tmp;
+      $type     = $tmp;
+    }
+  }
+
+  return $type;
 }

src/Functional/Tail.php

@@ -27,22 +27,5 @@
  */
 function tail($list)
 {
-  [, $final] = fold(function ($acc, $val) {
-    [$count, $lst] = $acc;
-    $count         = $count + 1;
-
-    if ($count < 2) {
-      if (\is_object($lst)) {
-        unset($lst->{indexOf($lst, $val)});
-      } else {
-        if (\is_array($lst)) {
-          unset($lst[indexOf($lst, $val)]);
-        }
-      }
-    }
-
-    return [$count, $lst];
-  }, $list, [0, $list]);
-
-  return $final;
+  return dropLeft($list, 1);
 }

tests/Functional/IsArrayOfTest.php

@@ -14,6 +14,9 @@ public static function contextProvider()
       [[[2], ['foo']], 'array'],
       [[1.2, 3.2], 'double'],
       [[3, 'foo', new \stdClass(2)], 'mixed'],
+      [(object) [], null],
+      [[], null],
+      [(object) ['foo' => 'qux', 'bar' => 'quux'], 'string'],
     ];
   }
 

tests/Functional/TailTest.php

@@ -9,8 +9,14 @@ class TailTest extends \PHPUnit\Framework\TestCase
   public static function contextProvider()
   {
     return [
-      [(object) \range(1, 3), (object) [1 => 2, 2 => 3]],
-      [['foo', 'bar'], [1 => 'bar']],
+      [
+        (object) \range(1, 3),
+        (object) [1 => 2, 2 => 3],
+      ],
+      [
+        ['foo', 'bar'],
+        [1 => 'bar'],
+      ],
     ];
   }