tarsana / functional

src/list.php

Spacing +23 added lines, -23 removed lines

@@ -112,8 +112,8 @@ 
  * @param callable $predicate the filter function
  * @return \Closure
  */
-function _make_filterer (callable $append, callable $predicate) {
-	return function ($acc, ...$entry) use ($append, $predicate) {
+function _make_filterer(callable $append, callable $predicate) {
+	return function($acc, ...$entry) use ($append, $predicate) {
 		if ($predicate($entry[0])) {
 			$append($acc, ...$entry);
 		}
@@ -202,7 +202,7 @@ 
  */
 function reduce() {
     static $reduce = false;
-    $reduce = $reduce ?: curry(function($fn, $initial, $list){
+    $reduce = $reduce ?: curry(function($fn, $initial, $list) {
         return array_reduce($list, $fn, $initial);
     });
     return _apply($reduce, func_get_args());
@@ -229,7 +229,7 @@ 
  */
 function each() {
     static $each = false;
-    $each = $each ?: curry(function($fn, $list){
+    $each = $each ?: curry(function($fn, $list) {
         foreach ($list as $item) {
             $fn($item);
         }
@@ -279,10 +279,10 @@ 
  * @param  array|string $list
  * @return mixed
  */
-function last () {
+function last() {
     static $last = false;
     $last = $last ?: curry(function($list) {
-        if(is_string($list))
+        if (is_string($list))
             return substr($list, -1);
         $size = count($list);
         return ($size > 0)
@@ -309,10 +309,10 @@ 
  * @param  array|string $list
  * @return array
  */
-function init () {
+function init() {
     static $init = false;
     $init = $init ?: curry(function($list) {
-        if(is_string($list)) {
+        if (is_string($list)) {
             $size = strlen($list);
             return ($size > 1)
                 ? substr($list, 0, $size - 1)
@@ -343,10 +343,10 @@ 
  * @param  array|string $list
  * @return array
  */
-function tail () {
+function tail() {
     static $tail = false;
     $tail = $tail ?: curry(function($list) {
-        if(is_string($list))
+        if (is_string($list))
             return (strlen($list) > 1)
                 ? substr($list, 1)
                 : '';
@@ -371,7 +371,7 @@ 
  * @param  array|string $list
  * @return array
  */
-function reverse () {
+function reverse() {
     static $reverse = false;
     $reverse = $reverse ?: curry(function($list) {
         return is_string($list)
@@ -424,7 +424,7 @@ 
     static $allSatisfies = false;
     $allSatisfies = $allSatisfies ?: curry(function($predicate, $list) {
         foreach ($list as $item) {
-            if (! $predicate($item))
+            if (!$predicate($item))
                 return false;
         }
         return true;
@@ -600,7 +600,7 @@ 
  */
 function append() {
     static $append = false;
-    $append = $append ?: curry(function ($item, $list) {
+    $append = $append ?: curry(function($item, $list) {
         return is_string($list)
             ? $list . $item
             : array_merge($list, [$item]);
@@ -626,7 +626,7 @@ 
  */
 function prepend() {
     static $prepend = false;
-    $prepend = $prepend ?: curry(function ($item, $list) {
+    $prepend = $prepend ?: curry(function($item, $list) {
         return is_string($list)
             ? $item . $list
             : array_merge([$item], $list);
@@ -661,7 +661,7 @@ 
         $length = length($list);
         if ($count > $length || $count < -$length)
             return $list;
-        if(is_string($list)) {
+        if (is_string($list)) {
             return ($count >= 0)
                 ? substr($list, 0, $count)
                 : substr($list, $count);
@@ -812,7 +812,7 @@ 
         $count = ($count > 0)
             ? $count - $length
             : $count + $length;
-        if(is_string($list)) {
+        if (is_string($list)) {
             return ($count >= 0)
                 ? substr($list, 0, $count)
                 : substr($list, $count);
@@ -1169,7 +1169,7 @@ 
     $indexOf = $indexOf ?: curry(function($item, $list) {
         if (is_string($list)) {
             $index = strpos($list, $item);
-            return $index === false ? -1 : $index;
+            return $index === false ? - 1 : $index;
         }
         $list = (array) $list;
         $index = 0;
@@ -1180,7 +1180,7 @@ 
                 return $keys[$index];
             $index ++;
         }
-        return -1;
+        return - 1;
     });
     return _apply($indexOf, func_get_args());
 }
@@ -1209,7 +1209,7 @@ 
     $lastIndexOf = $lastIndexOf ?: curry(function($item, $list) {
         if (is_string($list)) {
             $index = strrpos($list, $item);
-            return $index === false ? -1 : $index;
+            return $index === false ? - 1 : $index;
         }
         $list = (array) $list;
         $keys = array_keys($list);
@@ -1219,7 +1219,7 @@ 
                 return $keys[$index];
             $index --;
         }
-        return -1;
+        return - 1;
     });
     return _apply($lastIndexOf, func_get_args());
 }
@@ -1254,7 +1254,7 @@ 
                 }
                 $index ++;
             }
-            if (! $found) {
+            if (!$found) {
                 $result[$size] = $item;
                 $size ++;
             }
@@ -1314,9 +1314,9 @@ 
     static $groupBy = false;
     $groupBy = $groupBy ?: curry(function($fn, $list) {
         $result = [];
-        foreach($list as $item) {
+        foreach ($list as $item) {
             $index = $fn($item);
-            if (! isset($result[$index]))
+            if (!isset($result[$index]))
                 $result[$index] = [];
             $result[$index][] = $item;
         }

Braces +93 added lines, -61 removed lines

@@ -83,8 +83,9 @@ 
     	if ($isArray)
 	    {
 	    	foreach ($list as $item) {
-	            if ($fn($item))
-	                $result[] = $item;
+	            if ($fn($item)) {
+	            	                $result[] = $item;
+	            }
 	        }
 	        return $result;
 	    }
@@ -257,7 +258,9 @@ 
 function head() {
     static $head = false;
     $head = $head ?: curry(function($list) {
-        if (isset($list[0])) return $list[0];
+        if (isset($list[0])) {
+            return $list[0];
+        }
         return is_string($list) ? '' : null;
     });
     return _apply($head, func_get_args());
@@ -282,8 +285,9 @@ 
 function last () {
     static $last = false;
     $last = $last ?: curry(function($list) {
-        if(is_string($list))
-            return substr($list, -1);
+        if(is_string($list)) {
+                    return substr($list, -1);
+        }
         $size = count($list);
         return ($size > 0)
             ? $list[$size - 1]
@@ -346,10 +350,11 @@ 
 function tail () {
     static $tail = false;
     $tail = $tail ?: curry(function($list) {
-        if(is_string($list))
-            return (strlen($list) > 1)
+        if(is_string($list)) {
+                    return (strlen($list) > 1)
                 ? substr($list, 1)
                 : '';
+        }
         return (count($list) > 1)
             ? array_slice($list, 1)
             : [];
@@ -424,8 +429,9 @@ 
     static $allSatisfies = false;
     $allSatisfies = $allSatisfies ?: curry(function($predicate, $list) {
         foreach ($list as $item) {
-            if (! $predicate($item))
-                return false;
+            if (! $predicate($item)) {
+                            return false;
+            }
         }
         return true;
     });
@@ -451,8 +457,9 @@ 
     static $anySatisfies = false;
     $anySatisfies = $anySatisfies ?: curry(function($predicate, $list) {
         foreach ($list as $item) {
-            if ($predicate($item))
-                return true;
+            if ($predicate($item)) {
+                            return true;
+            }
         }
         return false;
     });
@@ -477,8 +484,9 @@ 
 function concat() {
     static $concat = false;
     $concat = $concat ?: curry(function($list1, $list2) {
-        if (is_string($list1) && is_string($list2))
-            return $list1 . $list2;
+        if (is_string($list1) && is_string($list2)) {
+                    return $list1 . $list2;
+        }
         return array_merge($list1, $list2);
     });
     return _apply($concat, func_get_args());
@@ -500,10 +508,12 @@ 
 function concatAll() {
     static $concatAll = false;
     $concatAll = $concatAll ?: curry(function($lists) {
-        if (count($lists) == 0)
-            return [];
-        if (is_string($lists[0]))
-            return implode('', $lists);
+        if (count($lists) == 0) {
+                    return [];
+        }
+        if (is_string($lists[0])) {
+                    return implode('', $lists);
+        }
         return _apply('array_merge', $lists);
     });
     return _apply($concatAll, func_get_args());
@@ -568,14 +578,17 @@ 
     static $insertAll = false;
     $insertAll = $insertAll ?: curry(function($position, $items, $list) {
         $size = length($list);
-        if ($position < 0)
-            $position = $size + $position;
-        if ($position < 0)
-            $position = 0;
-        if (is_string($list))
-            return ($position >= $size)
+        if ($position < 0) {
+                    $position = $size + $position;
+        }
+        if ($position < 0) {
+                    $position = 0;
+        }
+        if (is_string($list)) {
+                    return ($position >= $size)
                 ? $list . $items
                 : substr($list, 0, $position) . $items . substr($list, $position);
+        }
         return ($position >= $size)
             ? array_merge($list, $items)
             : array_merge(array_slice($list, 0, $position), $items, array_slice($list, $position));
@@ -659,8 +672,9 @@ 
     static $take = false;
     $take = $take ?: curry(function($count, $list) {
         $length = length($list);
-        if ($count > $length || $count < -$length)
-            return $list;
+        if ($count > $length || $count < -$length) {
+                    return $list;
+        }
         if(is_string($list)) {
             return ($count >= 0)
                 ? substr($list, 0, $count)
@@ -694,8 +708,9 @@ 
     $takeWhile = $takeWhile ?: curry(function($predicate, $list) {
         $index = 0;
         $size = length($list);
-        while ($index < $size && $predicate($list[$index]))
-            $index ++;
+        while ($index < $size && $predicate($list[$index])) {
+                    $index ++;
+        }
         return array_slice($list, 0, $index);
     });
     return _apply($takeWhile, func_get_args());
@@ -720,8 +735,9 @@ 
     static $takeLastWhile = false;
     $takeLastWhile = $takeLastWhile ?: curry(function($predicate, $list) {
         $index = length($list) - 1;
-        while ($index >= 0 && $predicate($list[$index]))
-            $index --;
+        while ($index >= 0 && $predicate($list[$index])) {
+                    $index --;
+        }
         return array_slice($list, $index + 1);
     });
     return _apply($takeLastWhile, func_get_args());
@@ -748,8 +764,9 @@ 
     $takeUntil = $takeUntil ?: curry(function($predicate, $list) {
         $index = 0;
         $size = length($list);
-        while ($index < $size && !$predicate($list[$index]))
-            $index ++;
+        while ($index < $size && !$predicate($list[$index])) {
+                    $index ++;
+        }
         return array_slice($list, 0, $index);
     });
     return _apply($takeUntil, func_get_args());
@@ -774,8 +791,9 @@ 
     static $takeLastUntil = false;
     $takeLastUntil = $takeLastUntil ?: curry(function($predicate, $list) {
         $index = length($list) - 1;
-        while ($index >= 0 && !$predicate($list[$index]))
-            $index --;
+        while ($index >= 0 && !$predicate($list[$index])) {
+                    $index --;
+        }
         return array_slice($list, $index + 1);
     });
     return _apply($takeLastUntil, func_get_args());
@@ -807,8 +825,9 @@ 
     $remove = $remove ?: curry(function($count, $list) {
         // ...
         $length = length($list);
-        if ($count > $length || $count < -$length)
-            return [];
+        if ($count > $length || $count < -$length) {
+                    return [];
+        }
         $count = ($count > 0)
             ? $count - $length
             : $count + $length;
@@ -845,8 +864,9 @@ 
     $removeWhile = $removeWhile ?: curry(function($predicate, $list) {
         $index = 0;
         $size = length($list);
-        while ($index < $size && $predicate($list[$index]))
-            $index ++;
+        while ($index < $size && $predicate($list[$index])) {
+                    $index ++;
+        }
         return array_slice($list, $index);
     });
     return _apply($removeWhile, func_get_args());
@@ -871,8 +891,9 @@ 
     static $removeLastWhile = false;
     $removeLastWhile = $removeLastWhile ?: curry(function($predicate, $list) {
         $index = length($list) - 1;
-        while ($index >= 0 && $predicate($list[$index]))
-            $index --;
+        while ($index >= 0 && $predicate($list[$index])) {
+                    $index --;
+        }
         return array_slice($list, 0, $index + 1);
     });
     return _apply($removeLastWhile, func_get_args());
@@ -900,8 +921,9 @@ 
     $removeUntil = $removeUntil ?: curry(function($predicate, $list) {
         $index = 0;
         $size = length($list);
-        while ($index < $size && !$predicate($list[$index]))
-            $index ++;
+        while ($index < $size && !$predicate($list[$index])) {
+                    $index ++;
+        }
         return array_slice($list, $index);
     });
     return _apply($removeUntil, func_get_args());
@@ -927,8 +949,9 @@ 
     static $removeLastUntil = false;
     $removeLastUntil = $removeLastUntil ?: curry(function($predicate, $list) {
         $index = length($list) - 1;
-        while ($index >= 0 && !$predicate($list[$index]))
-            $index --;
+        while ($index >= 0 && !$predicate($list[$index])) {
+                    $index --;
+        }
         return array_slice($list, 0, $index + 1);
     });
     return _apply($removeLastUntil, func_get_args());
@@ -981,8 +1004,9 @@ 
     static $slices = false;
     $slices = $slices ?: curry(function($size, &$list) {
         $length = length($list);
-        if ($length == 0)
-            return is_string($list) ? [''] : [];
+        if ($length == 0) {
+                    return is_string($list) ? [''] : [];
+        }
         $start = 0;
         $result = [];
         $slicer = is_string($list) ? 'substr' : 'array_slice';
@@ -1043,8 +1067,9 @@ 
     static $findIndex = false;
     $findIndex = $findIndex ?: curry(function($predicate, $list) {
         foreach ($list as $key => &$value) {
-            if ($predicate($value))
-                return $key;
+            if ($predicate($value)) {
+                            return $key;
+            }
         }
         return null;
     });
@@ -1074,8 +1099,9 @@ 
         $keys = array_keys($list);
         $index = count($keys) - 1;
         while ($index >= 0) {
-            if ($predicate($list[$keys[$index]]))
-                return $keys[$index];
+            if ($predicate($list[$keys[$index]])) {
+                            return $keys[$index];
+            }
             $index --;
         }
         return null;
@@ -1102,8 +1128,9 @@ 
     static $find = false;
     $find = $find ?: curry(function($predicate, $list) {
         foreach ($list as $key => &$value) {
-            if ($predicate($value))
-                return $value;
+            if ($predicate($value)) {
+                            return $value;
+            }
         }
         return null;
     });
@@ -1131,8 +1158,9 @@ 
         $keys = array_keys($list);
         $index = count($keys) - 1;
         while ($index >= 0) {
-            if ($predicate($list[$keys[$index]]))
-                return $list[$keys[$index]];
+            if ($predicate($list[$keys[$index]])) {
+                            return $list[$keys[$index]];
+            }
             $index --;
         }
         return null;
@@ -1176,8 +1204,9 @@ 
         $keys = array_keys($list);
         $length = count($keys);
         while ($index < $length) {
-            if (_equals($item, $list[$keys[$index]]))
-                return $keys[$index];
+            if (_equals($item, $list[$keys[$index]])) {
+                            return $keys[$index];
+            }
             $index ++;
         }
         return -1;
@@ -1215,8 +1244,9 @@ 
         $keys = array_keys($list);
         $index = count($list) - 1;
         while ($index >= 0) {
-            if (_equals($list[$keys[$index]], $item))
-                return $keys[$index];
+            if (_equals($list[$keys[$index]], $item)) {
+                            return $keys[$index];
+            }
             $index --;
         }
         return -1;
@@ -1316,8 +1346,9 @@ 
         $result = [];
         foreach($list as $item) {
             $index = $fn($item);
-            if (! isset($result[$index]))
-                $result[$index] = [];
+            if (! isset($result[$index])) {
+                            $result[$index] = [];
+            }
             $result[$index][] = $item;
         }
         return $result;
@@ -1346,8 +1377,9 @@ 
     $pairsFrom = $pairsFrom ?: curry(function($list1, $list2) {
         $length1 = count($list1);
         $length2 = count($list2);
-        if (0 == $length1 || 0 == $length2)
-            return [];
+        if (0 == $length1 || 0 == $length2) {
+                    return [];
+        }
         $result = [];
         $index = 0;
         $length = min($length1, $length2);