tarsana / functional

src/functions.php

Doc Comments +1 added lines, -3 removed lines

@@ -80,7 +80,7 @@ 
  * @param  callable $fn
  * @param  int $argsCount
  * @param  array  $boundArgs
- * @return callable
+ * @return \Closure
  */
 function _curried_function($fn, $argsCount, $boundArgs = []) {
     return function() use($fn, $argsCount, $boundArgs) {
@@ -152,8 +152,6 @@ 
  * ```
  *
  * @signature (*... -> a) -> [*] -> a
- * @param  callable $fn
- * @param  array    $args
  * @return mixed
  */
 function apply() {

Braces +9 added lines, -6 removed lines

@@ -59,8 +59,9 @@ 
     $addArgument = function($currentBoundArgs, $arg) use($fnArgsCount) {
         $currentBoundArgsCount = count($currentBoundArgs);
         $placeholderPosition = 0;
-        while($placeholderPosition < $currentBoundArgsCount && !_is_placeholder($currentBoundArgs[$placeholderPosition]))
-            $placeholderPosition ++;
+        while($placeholderPosition < $currentBoundArgsCount && !_is_placeholder($currentBoundArgs[$placeholderPosition])) {
+                    $placeholderPosition ++;
+        }
         if ($currentBoundArgsCount < $fnArgsCount || $placeholderPosition == $currentBoundArgsCount) {
             $currentBoundArgs[] = $arg;
         } else { // There is a placeholder and number of bound args > $fnArgsCount
@@ -87,8 +88,9 @@ 
         $boundArgs = _merge_args($argsCount, $boundArgs, func_get_args());
         $numberOfPlaceholders = count(array_filter($boundArgs, _f('_is_placeholder')));
         $numberOfGivenArgs = count($boundArgs) - $numberOfPlaceholders;
-        if ($numberOfGivenArgs >= $argsCount)
-            return call_user_func_array($fn, $boundArgs);
+        if ($numberOfGivenArgs >= $argsCount) {
+                    return call_user_func_array($fn, $boundArgs);
+        }
         return _curried_function($fn, $argsCount, $boundArgs);
     };
 }
@@ -179,8 +181,9 @@ 
  */
 function pipe() {
     $fns = func_get_args();
-    if(count($fns) < 1)
-        throw new InvalidArgument("pipe() requires at least one argument");
+    if(count($fns) < 1) {
+            throw new InvalidArgument("pipe() requires at least one argument");
+    }
     return curry(function () use ($fns) {
         $result = _apply(array_shift($fns), func_get_args());
         foreach ($fns as $fn) {

src/list.php

Braces +39 added lines, -26 removed lines

@@ -128,8 +128,9 @@ 
  * @return mixed
  */
 function head($list) {
-    if(is_string($list))
-        return substr($list, 0, 1);
+    if(is_string($list)) {
+            return substr($list, 0, 1);
+    }
     return (count($list) > 0)
         ? $list[0]
         : null;
@@ -150,8 +151,9 @@ 
  * @return mixed
  */
 function last($list) {
-    if(is_string($list))
-        return substr($list, -1);
+    if(is_string($list)) {
+            return substr($list, -1);
+    }
     return (count($list) > 0)
         ? $list[count($list) - 1]
         : null;
@@ -173,10 +175,11 @@ 
  * @return array
  */
 function init($list) {
-    if(is_string($list))
-        return (strlen($list) > 1)
+    if(is_string($list)) {
+            return (strlen($list) > 1)
             ? substr($list, 0, strlen($list) - 1)
             : '';
+    }
     return (count($list) > 1)
         ? array_slice($list, 0, count($list) - 1)
         : [];
@@ -198,10 +201,11 @@ 
  * @return array
  */
 function tail($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)
         : [];
@@ -302,8 +306,9 @@ 
         $t1 = toString($list1);
         $t2 = toString($list2);
         // echo "Concating {$t1} and {$t2}", PHP_EOL;
-        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(curry($concat), func_get_args());
@@ -377,8 +382,9 @@ 
 function insertAll() {
     $insertAll = function($position, $items, $list) {
         $length = length($list);
-        if ($position < 0)
-            $position = $length + $position;
+        if ($position < 0) {
+                    $position = $length + $position;
+        }
         return ($position >= $length) 
             ? concat($list, $items) 
             : concatAll([take($position, $list), $items, remove($position, $list)]);
@@ -445,8 +451,9 @@ 
 function take() {
     $take = function($count, $list) {
         $length = length($list);
-        if ($count > $length || $count < -$length)
-            return [];
+        if ($count > $length || $count < -$length) {
+                    return [];
+        }
         if(is_string($list)) {
             return ($count >= 0)
                 ? substr($list, 0, $count)
@@ -571,8 +578,9 @@ 
 function remove() {
     $remove = function($count, $list) {
         $length = length($list);
-        if ($count > $length || $count < -$length)
-            return [];
+        if ($count > $length || $count < -$length) {
+                    return [];
+        }
         return ($count > 0)
             ? take($count - $length, $list)
             : take($count + $length, $list);
@@ -703,10 +711,12 @@ 
  */
 function slices() {
     $slices = function($size, $list) {
-        if(empty($list))
-            return is_string($list) ? '' : [];
-        if(length($list) <= $size)
-            return [$list];
+        if(empty($list)) {
+                    return is_string($list) ? '' : [];
+        }
+        if(length($list) <= $size) {
+                    return [$list];
+        }
         return prepend(take($size, $list), slices($size, remove($size, $list)));
     };
     return apply(curry($slices), func_get_args());
@@ -752,8 +762,9 @@ 
 function findIndex() {
     $findIndex = function($predicate, $list) {
         foreach ($list as $key => $value) {
-            if ($predicate($value))
-                return $key;
+            if ($predicate($value)) {
+                            return $key;
+            }
         }
         return null;
     };
@@ -778,8 +789,9 @@ 
 function findLastIndex() {
     $findLastIndex = function($predicate, $list) {
         foreach (reverse(toPairs($list)) as $pair) {
-            if($predicate($pair[1]))
-                return $pair[0];
+            if($predicate($pair[1])) {
+                            return $pair[0];
+            }
         }
         return null;
     };
@@ -968,8 +980,9 @@ 
     $groupBy = function($fn, $list) {
         return reduce(function($result, $item) use($fn) {
             $index = $fn($item);
-            if (! isset($result[$index]))
-                $result[$index] = [];
+            if (! isset($result[$index])) {
+                            $result[$index] = [];
+            }
             $result[$index][] = $item;
             return $result;
         }, [], $list);