tarsana / functional

build.php

Braces +55 added lines, -37 removed lines

@@ -148,14 +148,16 @@ 
 function write_module($module) {
     if ($module->docs) {
         $docsDir  = dirname($module->docsPath);
-        if (!is_dir($docsDir))
-            mkdir($docsDir, 0777, true);
+        if (!is_dir($docsDir)) {
+                    mkdir($docsDir, 0777, true);
+        }
         file_put_contents($module->docsPath,  $module->docs);
     }
     if ($module->tests) {
         $testsDir = dirname($module->testsPath);
-        if (!is_dir($testsDir))
-            mkdir($testsDir, 0777, true);
+        if (!is_dir($testsDir)) {
+                    mkdir($testsDir, 0777, true);
+        }
         file_put_contents($module->testsPath, $module->tests);
     }
     if ($module->streamOperations) {
@@ -252,9 +254,15 @@ 
     $tags = groupBy(get('name'), tags_of($doxBlock));
 
     $type = 'function';
-    if (has('file', $tags)) $type = 'file';
-    if (has('class', $tags)) $type = 'class';
-    if (has('method', $tags)) $type = 'method';
+    if (has('file', $tags)) {
+        $type = 'file';
+    }
+    if (has('class', $tags)) {
+        $type = 'class';
+    }
+    if (has('method', $tags)) {
+        $type = 'method';
+    }
 
     $params = map(function($tag){
         $parts = split(' ', get('value', $tag));
@@ -266,8 +274,9 @@ 
 
     $return = getPath(['return', 0, 'value'], $tags);
     $signatures = get('signature', $tags);
-    if ($signatures)
-        $signatures = map(get('value'), $signatures);
+    if ($signatures) {
+            $signatures = map(get('value'), $signatures);
+    }
     return (object) [
         'type' => $type,
         'name' => getPath(['ctx', 'name'], $doxBlock),
@@ -291,12 +300,13 @@ 
  * @return array
  */
 function tags_of($doxBlock) {
-    if ($doxBlock->tags)
-        return map(function($tag){
+    if ($doxBlock->tags) {
+            return map(function($tag){
             return (object) [
                 'name'  => $tag->type,
                 'value' => $tag->string
             ];
+    }
         }, $doxBlock->tags);
     return [];
 }
@@ -310,8 +320,9 @@ 
  */
 function generate_docs($module) {
     $module->docs = '';
-    if (startsWith('_', $module->name))
-        return $module;
+    if (startsWith('_', $module->name)) {
+            return $module;
+    }
     return apply(process_of([
         'generate_docs_header',
         'generate_docs_sommaire',
@@ -388,15 +399,17 @@ 
  * @return string
  */
 function generate_docs_contents_item($block) {
-    if ($block->type != 'function')
-        return '';
+    if ($block->type != 'function') {
+            return '';
+    }
     $params = join(', ', map(pipe(values(), join(' ')), get('params', $block)));
     $return = get('return', $block);
     $prototype = "```php\n{$block->name}({$params}) : {$return}\n```\n\n";
     $signature = '';
     $blockSignature = join("\n", $block->signatures);
-    if ($blockSignature)
-        $signature = "```\n{$blockSignature}\n```\n\n";
+    if ($blockSignature) {
+            $signature = "```\n{$blockSignature}\n```\n\n";
+    }
     return "# {$block->name}\n\n{$prototype}{$signature}{$block->description}\n\n";
 }
 
@@ -427,8 +440,9 @@ 
 function generate_tests_header($module) {
     $namespace = "Tarsana\UnitTests\Functional";
     $additionalNamespace = replace("/", "\\", remove(6, dirname($module->testsPath)));
-    if ($additionalNamespace)
-        $namespace .= "\\" . $additionalNamespace;
+    if ($additionalNamespace) {
+            $namespace .= "\\" . $additionalNamespace;
+    }
     $name = remove(-4, last(split("/", $module->testsPath)));
     $module->tests .= "<?php namespace {$namespace};\n\nuse Tarsana\Functional as F;\n\nclass {$name} extends \Tarsana\UnitTests\Functional\UnitTest {\n";
     return $module;
@@ -449,10 +463,11 @@ 
     $contents = join("\n", map(function($block) use($module) {
         return generate_tests_contents_item($block, $module);
     }, $blocks));
-    if (trim($contents) != '')
-        $module->tests .= $contents;
-    else
-        $module->tests = '';
+    if (trim($contents) != '') {
+            $module->tests .= $contents;
+    } else {
+            $module->tests = '';
+    }
     return $module;
 }
 
@@ -465,8 +480,9 @@ 
  * @return string
  */
 function generate_tests_contents_item($block, $module) {
-    if ($block->type != 'function')
-        return '';
+    if ($block->type != 'function') {
+            return '';
+    }
 
     $code = apply(pipe(
         _f('code_from_description'),
@@ -480,8 +496,9 @@ 
         join("\n")
     ), [$block]);
 
-    if ('' == trim($code))
-        return '';
+    if ('' == trim($code)) {
+            return '';
+    }
     return prepend("\tpublic function test_{$block->name}() {\n",
         append("\n\t}\n", $code)
     );
@@ -496,8 +513,9 @@ 
  */
 function code_from_description($block) {
     $description = get('description', $block);
-    if (!contains('```php', $description))
-        return '';
+    if (!contains('```php', $description)) {
+            return '';
+    }
     $code = remove(7 + indexOf('```php', $description), $description);
     return remove(-4, trim($code));
 }
@@ -513,8 +531,7 @@ 
     if (contains('; //=> ', $part)) {
         $pieces = split('; //=> ', $part);
         $part = "\$this->assertEquals({$pieces[1]}, {$pieces[0]});";
-    }
-    elseif (contains('; // throws ', $part)) {
+    } elseif (contains('; // throws ', $part)) {
         $pieces = split('; // throws ', $part);
         $variables = match('/ \$[0-9a-zA-Z_]+/', $pieces[0]);
         $use = '';
@@ -523,8 +540,7 @@ 
             $use = "use({$variables}) ";
         }
         return "\$this->assertErrorThrown(function() {$use}{\n\t$pieces[0]; \n},\n{$pieces[1]});";
-    }
-    elseif (startsWith('class ', $part) || startsWith('function ', $part)) {
+    } elseif (startsWith('class ', $part) || startsWith('function ', $part)) {
         $module->testsFooter .= $part . "\n\n";
         $part = '';
     }
@@ -539,8 +555,9 @@ 
  * @return object
  */
 function generate_tests_footer($module) {
-    if ($module->tests)
-        $module->tests .= "}\n\n{$module->testsFooter}";
+    if ($module->tests) {
+            $module->tests .= "}\n\n{$module->testsFooter}";
+    }
     return $module;
 }
 
@@ -676,8 +693,9 @@ 
 
 // Convert Warnings to Exceptions
 set_error_handler(function($errno, $errstr, $errfile, $errline, array $errcontext) {
-    if (0 === error_reporting())
-        return false;
+    if (0 === error_reporting()) {
+            return false;
+    }
     throw new \ErrorException($errstr, 0, $errno, $errfile, $errline);
 });
 

src/list.php

Braces +93 added lines, -61 removed lines

@@ -72,8 +72,9 @@ 
     $filter = $filter ?: curry(function($fn, $list) {
         $result = [];
         foreach ($list as $item) {
-            if ($fn($item))
-                $result[] = $item;
+            if ($fn($item)) {
+                            $result[] = $item;
+            }
         }
         return $result;
     });
@@ -154,7 +155,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());
@@ -179,8 +182,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]
@@ -243,10 +247,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)
             : [];
@@ -321,8 +326,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;
     });
@@ -348,8 +354,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;
     });
@@ -374,8 +381,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());
@@ -397,10 +405,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());
@@ -465,14 +475,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));
@@ -556,8 +569,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)
@@ -591,8 +605,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());
@@ -617,8 +632,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());
@@ -645,8 +661,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());
@@ -671,8 +688,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());
@@ -704,8 +722,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;
@@ -742,8 +761,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());
@@ -768,8 +788,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());
@@ -797,8 +818,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());
@@ -824,8 +846,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());
@@ -878,8 +901,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';
@@ -940,8 +964,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;
     });
@@ -971,8 +996,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;
@@ -999,8 +1025,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;
     });
@@ -1028,8 +1055,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;
@@ -1073,8 +1101,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;
@@ -1112,8 +1141,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;
@@ -1213,8 +1243,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;
@@ -1243,8 +1274,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);

src/string.php

Braces +8 added lines, -6 removed lines

@@ -345,10 +345,11 @@ 
         ];
         foreach (str_split($surrounders) as $key => $char) {
             $counters['values'][$key / 2] = 0;
-            if ($key % 2 == 0)
-                $counters['openings'][$char] = $key / 2;
-            else
-                $counters['closings'][$char] = $key / 2;
+            if ($key % 2 == 0) {
+                            $counters['openings'][$char] = $key / 2;
+            } else {
+                            $counters['closings'][$char] = $key / 2;
+            }
         }
         // $counters = [
         //   'values'   => [0, 0, 0],
@@ -394,8 +395,9 @@ 
                 $index ++;
             }
         }
-        if ($buffer != '')
-            $result[] = $buffer;
+        if ($buffer != '') {
+                    $result[] = $buffer;
+        }
 
         return $result;
     });

src/object.php

Braces +21 added lines, -12 removed lines

@@ -80,8 +80,9 @@ 
 function attributes() {
     static $attrs = false;
     $attrs = $attrs ?: curry(function($object) {
-        if (is_object($object))
-            return get_object_vars($object);
+        if (is_object($object)) {
+                    return get_object_vars($object);
+        }
         return $object;
     });
     return _apply($attrs, func_get_args());
@@ -174,8 +175,12 @@ 
 function has() {
     static $has = false;
     $has = $has ?: curry(function($name, $object){
-        if (is_object($object)) return isset($object->{$name});
-        if (is_array($object)) return isset($object[$name]);
+        if (is_object($object)) {
+            return isset($object->{$name});
+        }
+        if (is_array($object)) {
+            return isset($object[$name]);
+        }
         return false;
     });
     return _apply($has, func_get_args());
@@ -276,8 +281,9 @@ 
         if (is_object($object)) {
             $object = clone_($object);
             $object->{$name} = $value;
-        } else
-            $object[$name] = $value;
+        } else {
+                    $object[$name] = $value;
+        }
         return $object;
     });
     return _apply($set, func_get_args());
@@ -370,8 +376,9 @@ 
     static $satisfiesAll = false;
     $satisfiesAll = $satisfiesAll ?: curry(function($predicates, $object) {
         foreach ($predicates as $key => $predicate) {
-            if (!satisfies($predicate, $key, $object))
-                return false;
+            if (!satisfies($predicate, $key, $object)) {
+                            return false;
+            }
         }
         return true;
     });
@@ -408,8 +415,9 @@ 
     static $satisfiesAny = false;
     $satisfiesAny = $satisfiesAny ?: curry(function($predicates, $object) {
         foreach ($predicates as $key => $predicate) {
-            if (satisfies($predicate, $key, $object))
-                return true;
+            if (satisfies($predicate, $key, $object)) {
+                            return true;
+            }
         }
         return false;
     });
@@ -433,8 +441,9 @@ 
 function toPairs() {
     static $toPairs = false;
     $toPairs = $toPairs ?: curry(function($object) {
-        if (is_object($object))
-            $object = get_object_vars($object);
+        if (is_object($object)) {
+                    $object = get_object_vars($object);
+        }
         $result = [];
         foreach ($object as $key => $value) {
             $result[] = [$key, $value];

src/functions.php

Braces +15 added lines, -8 removed lines

@@ -102,8 +102,9 @@ 
  */
 function pipe() {
     $fns = func_get_args();
-    if(count($fns) < 1)
-        return identity();
+    if(count($fns) < 1) {
+            return identity();
+    }
     return function () use ($fns) {
         $result = _apply(array_shift($fns), func_get_args());
         foreach ($fns as $fn) {
@@ -181,8 +182,9 @@ 
     $predicates = func_get_args();
     return _curry_one(function($value) use(&$predicates) {
         foreach ($predicates as $predicate) {
-            if (! $predicate($value))
-                return false;
+            if (! $predicate($value)) {
+                            return false;
+            }
         }
         return true;
     });
@@ -215,8 +217,9 @@ 
     $predicates = func_get_args();
     return _curry_one(function($value) use(&$predicates) {
         foreach ($predicates as $predicate) {
-            if ($predicate($value))
-                return true;
+            if ($predicate($value)) {
+                            return true;
+            }
         }
         return false;
     });
@@ -279,8 +282,12 @@ 
     static $comparator = false;
     $comparator = $comparator ?: curry(function($fn) {
         return function($a, $b) use($fn) {
-            if ($fn($a, $b)) return -1;
-            if ($fn($b, $a)) return 1;
+            if ($fn($a, $b)) {
+                return -1;
+            }
+            if ($fn($b, $a)) {
+                return 1;
+            }
             return 0;
         };
     });

src/operators.php

Braces +18 added lines, -12 removed lines

@@ -184,17 +184,20 @@ 
 }
 function _equals($a, $b) {
     $type = type($a);
-    if ($type != type($b))
-        return false;
+    if ($type != type($b)) {
+            return false;
+    }
     switch ($type) {
         case 'List':
             $length = count($a);
-            if (count($b) != $length)
-                return false;
+            if (count($b) != $length) {
+                            return false;
+            }
             $index = 0;
             while ($index < $length) {
-                if (!_equals($a[$index], $b[$index]))
-                    return false;
+                if (!_equals($a[$index], $b[$index])) {
+                                    return false;
+                }
                 $index ++;
             }
             return true;
@@ -204,14 +207,17 @@ 
             $keysA = keys($a);
             $keysB = keys($b);
             $length = count($keysA);
-            if (count($keysB) != $length)
-                return false;
+            if (count($keysB) != $length) {
+                            return false;
+            }
             $index = 0;
             while ($index < $length) {
-                if (!_equals($keysA[$index], $keysB[$index]))
-                    return false;
-                if (!_equals(get($keysA[$index], $a), get($keysB[$index], $b)))
-                    return false;
+                if (!_equals($keysA[$index], $keysB[$index])) {
+                                    return false;
+                }
+                if (!_equals(get($keysA[$index], $a), get($keysB[$index], $b))) {
+                                    return false;
+                }
                 $index ++;
             }
             return true;

performance/scripts/object-oriented.php

Braces +3 added lines, -2 removed lines

@@ -103,8 +103,9 @@
     protected function getWordsHavingOccurrences($number) {
         $result = [];
         foreach ($this->list as $word) {
-            if ($word->occurrences() == $number)
-                $result[] = $word;
+            if ($word->occurrences() == $number) {
+                            $result[] = $word;
+            }
         }
         usort($result, function(Word $w1, Word $w2) {
             return strcmp($w1->value(), $w2->value());

src/Internal/_functions.php

Braces +39 added lines, -26 removed lines

@@ -119,25 +119,30 @@ 
     return function() use($fn) {
         $args = func_get_args();
         $n = count($args);
-        while ($n > 0 && _is_placeholder($args[$n - 1]))
-            $n --;
-        if ($n == 0)
-            return _curry_two($fn);
+        while ($n > 0 && _is_placeholder($args[$n - 1])) {
+                    $n --;
+        }
+        if ($n == 0) {
+                    return _curry_two($fn);
+        }
         if ($n == 1) {
             $a = &$args[0];
-            if (_is_placeholder($a))
-                return _curry_two($fn);
+            if (_is_placeholder($a)) {
+                            return _curry_two($fn);
+            }
             return _curry_one(function($b) use($fn, &$a) {
                 return $fn($a, $b);
             });
         }
         $a = &$args[0];
         $b = &$args[1];
-        if (_is_placeholder($a) && _is_placeholder($b))
-            return _curry_two($fn);
-        if (_is_placeholder($a))
-            return _curry_one(function($_a) use($fn, &$b) {
+        if (_is_placeholder($a) && _is_placeholder($b)) {
+                    return _curry_two($fn);
+        }
+        if (_is_placeholder($a)) {
+                    return _curry_one(function($_a) use($fn, &$b) {
                 return $fn($_a, $b);
+        }
             });
         return $fn($args[0], $args[1]);
     };
@@ -168,10 +173,12 @@ 
     return function() use($fn) {
         $args = func_get_args();
         $n = count($args);
-        while ($n > 0 && _is_placeholder($args[$n - 1]))
-            $n --;
-        if ($n == 0)
-            return _curry_three($fn);
+        while ($n > 0 && _is_placeholder($args[$n - 1])) {
+                    $n --;
+        }
+        if ($n == 0) {
+                    return _curry_three($fn);
+        }
         if ($n == 1) {
             $a = &$args[0];
             return _curry_two(function($b, $c) use($fn, &$a) {
@@ -181,9 +188,10 @@ 
         if ($n == 2) {
             $a = &$args[0]; $b = &$args[1];
 
-            if (_is_placeholder($a))
-                return _curry_two(function($_a, $c) use($fn, &$b) {
+            if (_is_placeholder($a)) {
+                            return _curry_two(function($_a, $c) use($fn, &$b) {
                     return $fn($_a, $b, $c);
+            }
                 });
             return _curry_one(function($c) use($fn, &$a, &$b) {
                 return $fn($a, $b, $c);
@@ -192,17 +200,20 @@ 
 
         $a = &$args[0]; $b = &$args[1]; $c = &$args[2];
 
-        if (_is_placeholder($a) && _is_placeholder($b))
-            return _curry_two(function($_a, $_b) use($fn, &$c) {
+        if (_is_placeholder($a) && _is_placeholder($b)) {
+                    return _curry_two(function($_a, $_b) use($fn, &$c) {
                 return $fn($_a, $_b, $c);
+        }
             });
-        if (_is_placeholder($a))
-            return _curry_one(function($_a) use($fn, &$b, &$c) {
+        if (_is_placeholder($a)) {
+                    return _curry_one(function($_a) use($fn, &$b, &$c) {
                 return $fn($_a, $b, $c);
+        }
             });
-        if (_is_placeholder($b))
-            return _curry_one(function($_b) use($fn, &$a, &$c) {
+        if (_is_placeholder($b)) {
+                    return _curry_one(function($_b) use($fn, &$a, &$c) {
                 return $fn($a, $_b, $c);
+        }
             });
 
         return $fn($a, $b, $c);
@@ -284,8 +295,9 @@ 
             $merged->args[$mergedIndex] = $given[$givenIndex];
         }
 
-        if (_is_placeholder($merged->args[$mergedIndex]))
-            $merged->placeholders ++;
+        if (_is_placeholder($merged->args[$mergedIndex])) {
+                    $merged->placeholders ++;
+        }
 
         $givenIndex ++;
         $mergedIndex ++;
@@ -303,8 +315,9 @@ 
     $argsCount = count($args);
     $fillersCount = count($fillers);
     while ($fillersIndex < $fillersCount) {
-        while (!_is_placeholder($args[$argsIndex]))
-            $argsIndex ++;
+        while (!_is_placeholder($args[$argsIndex])) {
+                    $argsIndex ++;
+        }
         $args[$argsIndex] = $fillers[$fillersIndex];
         $fillersIndex ++;
     }