| @@ -82,7 +82,7 @@ discard block | ||
| 82 | 82 | * @param mixed $something | 
| 83 | 83 | * @return string | 
| 84 | 84 | */ | 
| 85 | -function toString () { | |
| 85 | +function toString() { | |
| 86 | 86 |      $toString = function($something) { | 
| 87 | 87 |          switch (type($something)) { | 
| 88 | 88 | case 'String': | 
| @@ -105,11 +105,11 @@ discard block | ||
| 105 | 105 | return $something->__toString(); | 
| 106 | 106 | case 'Object': | 
| 107 | 107 | case 'Array': | 
| 108 | -                return '{' . join(', ', map(function($pair){ | |
| 109 | - return $pair[0].': '. toString($pair[1]); | |
| 108 | +                return '{' . join(', ', map(function($pair) { | |
| 109 | + return $pair[0] . ': ' . toString($pair[1]); | |
| 110 | 110 | }, toPairs($something))) . '}'; | 
| 111 | 111 | default: | 
| 112 | - return '['.type($something).']'; | |
| 112 | + return '[' . type($something) . ']'; | |
| 113 | 113 | } | 
| 114 | 114 | }; | 
| 115 | 115 | return apply(curry($toString), func_get_args()); | 
| @@ -33,9 +33,15 @@ discard block | ||
| 33 | 33 |  function type() { | 
| 34 | 34 | static $type = false; | 
| 35 | 35 |      $type = $type ?: curry(function($data) { | 
| 36 | - if ($data instanceof Error) return 'Error'; | |
| 37 | - if ($data instanceof Stream) return 'Stream'; | |
| 38 | - if (is_callable($data)) return 'Function'; | |
| 36 | +        if ($data instanceof Error) { | |
| 37 | + return 'Error'; | |
| 38 | + } | |
| 39 | +        if ($data instanceof Stream) { | |
| 40 | + return 'Stream'; | |
| 41 | + } | |
| 42 | +        if (is_callable($data)) { | |
| 43 | + return 'Function'; | |
| 44 | + } | |
| 39 | 45 |          switch (gettype($data)) { | 
| 40 | 46 | case 'boolean': | 
| 41 | 47 | return 'Boolean'; | 
| @@ -49,8 +55,9 @@ discard block | ||
| 49 | 55 | case 'resource': | 
| 50 | 56 | return 'Resource'; | 
| 51 | 57 | case 'array': | 
| 52 | -                if (allSatisfies('is_numeric', keys($data))) | |
| 53 | - return 'List'; | |
| 58 | +                if (allSatisfies('is_numeric', keys($data))) { | |
| 59 | + return 'List'; | |
| 60 | + } | |
| 54 | 61 | return 'Array'; | 
| 55 | 62 | case 'object': | 
| 56 | 63 | return 'Object'; | 
| @@ -116,7 +116,7 @@ discard block | ||
| 116 | 116 | * @return array | 
| 117 | 117 | */ | 
| 118 | 118 |  function get_modules() { | 
| 119 | - $composer = json_decode(file_get_contents(__DIR__.'/composer.json')); | |
| 119 | + $composer = json_decode(file_get_contents(__DIR__ . '/composer.json')); | |
| 120 | 120 | return $composer->autoload->files; | 
| 121 | 121 | } | 
| 122 | 122 | |
| @@ -147,10 +147,10 @@ discard block | ||
| 147 | 147 | */ | 
| 148 | 148 |  function write_module($module) { | 
| 149 | 149 |      if ($module->docs) { | 
| 150 | - $docsDir = dirname($module->docsPath); | |
| 150 | + $docsDir = dirname($module->docsPath); | |
| 151 | 151 | if (!is_dir($docsDir)) | 
| 152 | 152 | mkdir($docsDir, 0777, true); | 
| 153 | - file_put_contents($module->docsPath, $module->docs); | |
| 153 | + file_put_contents($module->docsPath, $module->docs); | |
| 154 | 154 | } | 
| 155 | 155 |      if ($module->tests) { | 
| 156 | 156 | $testsDir = dirname($module->testsPath); | 
| @@ -179,7 +179,7 @@ discard block | ||
| 179 | 179 | 'fill_docs_path', | 
| 180 | 180 | 'fill_tests_path', | 
| 181 | 181 | 'fill_blocks' | 
| 182 | - ]), [(object)['path' => $path]]); | |
| 182 | + ]), [(object) ['path' => $path]]); | |
| 183 | 183 | } | 
| 184 | 184 | |
| 185 | 185 | /** | 
| @@ -233,8 +233,8 @@ discard block | ||
| 233 | 233 |  function fill_blocks($module) { | 
| 234 | 234 | $module->blocks = apply(pipe( | 
| 235 | 235 |          prepend('dox -r < '), // "dox -r < src/...php" | 
| 236 | -        'shell_exec',         // "[{...}, ...]" | |
| 237 | - 'json_decode', // [DoxBlock] | |
| 236 | +        'shell_exec', // "[{...}, ...]" | |
| 237 | + 'json_decode', // [DoxBlock] | |
| 238 | 238 |          map(_f('make_block')) | 
| 239 | 239 | // sort() | 
| 240 | 240 | ), [$module->path]); | 
| @@ -256,7 +256,7 @@ discard block | ||
| 256 | 256 |      if (has('class', $tags)) $type = 'class'; | 
| 257 | 257 |      if (has('method', $tags)) $type = 'method'; | 
| 258 | 258 | |
| 259 | -    $params = map(function($tag){ | |
| 259 | +    $params = map(function($tag) { | |
| 260 | 260 |          $parts = split(' ', get('value', $tag)); | 
| 261 | 261 | return [ | 
| 262 | 262 | 'type' => $parts[0], | 
| @@ -292,7 +292,7 @@ discard block | ||
| 292 | 292 | */ | 
| 293 | 293 |  function tags_of($doxBlock) { | 
| 294 | 294 | if ($doxBlock->tags) | 
| 295 | -        return map(function($tag){ | |
| 295 | +        return map(function($tag) { | |
| 296 | 296 | return (object) [ | 
| 297 | 297 | 'name' => $tag->type, | 
| 298 | 298 | 'value' => $tag->string | 
| @@ -341,7 +341,7 @@ discard block | ||
| 341 | 341 | * @return object | 
| 342 | 342 | */ | 
| 343 | 343 |  function generate_docs_sommaire($module) { | 
| 344 | - $blocks = filter ( | |
| 344 | + $blocks = filter( | |
| 345 | 345 |          satisfiesAll(['ignore' => not(), 'internal' => not(), 'type' => equals('function')]), | 
| 346 | 346 | $module->blocks | 
| 347 | 347 | ); | 
| @@ -371,7 +371,7 @@ discard block | ||
| 371 | 371 | * @return object | 
| 372 | 372 | */ | 
| 373 | 373 |  function generate_docs_contents($module) { | 
| 374 | - $blocks = filter ( | |
| 374 | + $blocks = filter( | |
| 375 | 375 | satisfiesAll(['ignore' => not(), 'internal' => not()]), | 
| 376 | 376 | $module->blocks | 
| 377 | 377 | ); | 
| @@ -429,7 +429,7 @@ discard block | ||
| 429 | 429 |      $additionalNamespace = replace("/", "\\", remove(6, dirname($module->testsPath))); | 
| 430 | 430 | if ($additionalNamespace) | 
| 431 | 431 | $namespace .= "\\" . $additionalNamespace; | 
| 432 | -    $name = remove(-4, last(split("/", $module->testsPath))); | |
| 432 | +    $name = remove(- 4, last(split("/", $module->testsPath))); | |
| 433 | 433 |      $module->tests .= "<?php namespace {$namespace};\n\nuse Tarsana\Functional as F;\n\nclass {$name} extends \Tarsana\UnitTests\Functional\UnitTest {\n"; | 
| 434 | 434 | return $module; | 
| 435 | 435 | } | 
| @@ -442,7 +442,7 @@ discard block | ||
| 442 | 442 | * @return object | 
| 443 | 443 | */ | 
| 444 | 444 |  function generate_tests_contents($module) { | 
| 445 | - $blocks = filter ( | |
| 445 | + $blocks = filter( | |
| 446 | 446 | satisfiesAll(['ignore' => not()]), | 
| 447 | 447 | $module->blocks | 
| 448 | 448 | ); | 
| @@ -499,7 +499,7 @@ discard block | ||
| 499 | 499 |      if (!contains('```php', $description)) | 
| 500 | 500 | return ''; | 
| 501 | 501 |      $code = remove(7 + indexOf('```php', $description), $description); | 
| 502 | - return remove(-4, trim($code)); | |
| 502 | + return remove(- 4, trim($code)); | |
| 503 | 503 | } | 
| 504 | 504 | |
| 505 | 505 | /** | 
| @@ -552,7 +552,7 @@ discard block | ||
| 552 | 552 | * @return array | 
| 553 | 553 | */ | 
| 554 | 554 |  function generate_stream_operations($module) { | 
| 555 | - $blocks = filter ( | |
| 555 | + $blocks = filter( | |
| 556 | 556 | satisfiesAll(['ignore' => equals(false), 'stream' => equals(true)]), | 
| 557 | 557 | $module->blocks | 
| 558 | 558 | ); | 
| @@ -621,7 +621,7 @@ discard block | ||
| 621 | 621 | * @return array | 
| 622 | 622 | */ | 
| 623 | 623 |  function generate_stream_methods($module) { | 
| 624 | - $blocks = filter ( | |
| 624 | + $blocks = filter( | |
| 625 | 625 | satisfiesAll(['ignore' => equals(false), 'stream' => equals(true)]), | 
| 626 | 626 | $module->blocks | 
| 627 | 627 | ); | 
| @@ -148,14 +148,16 @@ discard block | ||
| 148 | 148 |  function write_module($module) { | 
| 149 | 149 |      if ($module->docs) { | 
| 150 | 150 | $docsDir = dirname($module->docsPath); | 
| 151 | - if (!is_dir($docsDir)) | |
| 152 | - mkdir($docsDir, 0777, true); | |
| 151 | +        if (!is_dir($docsDir)) { | |
| 152 | + mkdir($docsDir, 0777, true); | |
| 153 | + } | |
| 153 | 154 | file_put_contents($module->docsPath, $module->docs); | 
| 154 | 155 | } | 
| 155 | 156 |      if ($module->tests) { | 
| 156 | 157 | $testsDir = dirname($module->testsPath); | 
| 157 | - if (!is_dir($testsDir)) | |
| 158 | - mkdir($testsDir, 0777, true); | |
| 158 | +        if (!is_dir($testsDir)) { | |
| 159 | + mkdir($testsDir, 0777, true); | |
| 160 | + } | |
| 159 | 161 | file_put_contents($module->testsPath, $module->tests); | 
| 160 | 162 | } | 
| 161 | 163 |      if ($module->streamOperations) { | 
| @@ -252,9 +254,15 @@ discard block | ||
| 252 | 254 |      $tags = groupBy(get('name'), tags_of($doxBlock)); | 
| 253 | 255 | |
| 254 | 256 | $type = 'function'; | 
| 255 | -    if (has('file', $tags)) $type = 'file'; | |
| 256 | -    if (has('class', $tags)) $type = 'class'; | |
| 257 | -    if (has('method', $tags)) $type = 'method'; | |
| 257 | +    if (has('file', $tags)) { | |
| 258 | + $type = 'file'; | |
| 259 | + } | |
| 260 | +    if (has('class', $tags)) { | |
| 261 | + $type = 'class'; | |
| 262 | + } | |
| 263 | +    if (has('method', $tags)) { | |
| 264 | + $type = 'method'; | |
| 265 | + } | |
| 258 | 266 | |
| 259 | 267 |      $params = map(function($tag){ | 
| 260 | 268 |          $parts = split(' ', get('value', $tag)); | 
| @@ -266,8 +274,9 @@ discard block | ||
| 266 | 274 | |
| 267 | 275 | $return = getPath(['return', 0, 'value'], $tags); | 
| 268 | 276 |      $signatures = get('signature', $tags); | 
| 269 | - if ($signatures) | |
| 270 | -        $signatures = map(get('value'), $signatures); | |
| 277 | +    if ($signatures) { | |
| 278 | +            $signatures = map(get('value'), $signatures); | |
| 279 | + } | |
| 271 | 280 | return (object) [ | 
| 272 | 281 | 'type' => $type, | 
| 273 | 282 | 'name' => getPath(['ctx', 'name'], $doxBlock), | 
| @@ -291,12 +300,13 @@ discard block | ||
| 291 | 300 | * @return array | 
| 292 | 301 | */ | 
| 293 | 302 |  function tags_of($doxBlock) { | 
| 294 | - if ($doxBlock->tags) | |
| 295 | -        return map(function($tag){ | |
| 303 | +    if ($doxBlock->tags) { | |
| 304 | +            return map(function($tag){ | |
| 296 | 305 | return (object) [ | 
| 297 | 306 | 'name' => $tag->type, | 
| 298 | 307 | 'value' => $tag->string | 
| 299 | 308 | ]; | 
| 309 | + } | |
| 300 | 310 | }, $doxBlock->tags); | 
| 301 | 311 | return []; | 
| 302 | 312 | } | 
| @@ -310,8 +320,9 @@ discard block | ||
| 310 | 320 | */ | 
| 311 | 321 |  function generate_docs($module) { | 
| 312 | 322 | $module->docs = ''; | 
| 313 | -    if (startsWith('_', $module->name)) | |
| 314 | - return $module; | |
| 323 | +    if (startsWith('_', $module->name)) { | |
| 324 | + return $module; | |
| 325 | + } | |
| 315 | 326 | return apply(process_of([ | 
| 316 | 327 | 'generate_docs_header', | 
| 317 | 328 | 'generate_docs_sommaire', | 
| @@ -388,15 +399,17 @@ discard block | ||
| 388 | 399 | * @return string | 
| 389 | 400 | */ | 
| 390 | 401 |  function generate_docs_contents_item($block) { | 
| 391 | - if ($block->type != 'function') | |
| 392 | - return ''; | |
| 402 | +    if ($block->type != 'function') { | |
| 403 | + return ''; | |
| 404 | + } | |
| 393 | 405 |      $params = join(', ', map(pipe(values(), join(' ')), get('params', $block))); | 
| 394 | 406 |      $return = get('return', $block); | 
| 395 | 407 |      $prototype = "```php\n{$block->name}({$params}) : {$return}\n```\n\n"; | 
| 396 | 408 | $signature = ''; | 
| 397 | 409 |      $blockSignature = join("\n", $block->signatures); | 
| 398 | - if ($blockSignature) | |
| 399 | -        $signature = "```\n{$blockSignature}\n```\n\n"; | |
| 410 | +    if ($blockSignature) { | |
| 411 | +            $signature = "```\n{$blockSignature}\n```\n\n"; | |
| 412 | + } | |
| 400 | 413 |      return "# {$block->name}\n\n{$prototype}{$signature}{$block->description}\n\n"; | 
| 401 | 414 | } | 
| 402 | 415 | |
| @@ -427,8 +440,9 @@ discard block | ||
| 427 | 440 |  function generate_tests_header($module) { | 
| 428 | 441 | $namespace = "Tarsana\UnitTests\Functional"; | 
| 429 | 442 |      $additionalNamespace = replace("/", "\\", remove(6, dirname($module->testsPath))); | 
| 430 | - if ($additionalNamespace) | |
| 431 | - $namespace .= "\\" . $additionalNamespace; | |
| 443 | +    if ($additionalNamespace) { | |
| 444 | + $namespace .= "\\" . $additionalNamespace; | |
| 445 | + } | |
| 432 | 446 |      $name = remove(-4, last(split("/", $module->testsPath))); | 
| 433 | 447 |      $module->tests .= "<?php namespace {$namespace};\n\nuse Tarsana\Functional as F;\n\nclass {$name} extends \Tarsana\UnitTests\Functional\UnitTest {\n"; | 
| 434 | 448 | return $module; | 
| @@ -449,10 +463,11 @@ discard block | ||
| 449 | 463 |      $contents = join("\n", map(function($block) use($module) { | 
| 450 | 464 | return generate_tests_contents_item($block, $module); | 
| 451 | 465 | }, $blocks)); | 
| 452 | - if (trim($contents) != '') | |
| 453 | - $module->tests .= $contents; | |
| 454 | - else | |
| 455 | - $module->tests = ''; | |
| 466 | +    if (trim($contents) != '') { | |
| 467 | + $module->tests .= $contents; | |
| 468 | +    } else { | |
| 469 | + $module->tests = ''; | |
| 470 | + } | |
| 456 | 471 | return $module; | 
| 457 | 472 | } | 
| 458 | 473 | |
| @@ -465,8 +480,9 @@ discard block | ||
| 465 | 480 | * @return string | 
| 466 | 481 | */ | 
| 467 | 482 |  function generate_tests_contents_item($block, $module) { | 
| 468 | - if ($block->type != 'function') | |
| 469 | - return ''; | |
| 483 | +    if ($block->type != 'function') { | |
| 484 | + return ''; | |
| 485 | + } | |
| 470 | 486 | |
| 471 | 487 | $code = apply(pipe( | 
| 472 | 488 |          _f('code_from_description'), | 
| @@ -480,8 +496,9 @@ discard block | ||
| 480 | 496 |          join("\n") | 
| 481 | 497 | ), [$block]); | 
| 482 | 498 | |
| 483 | -    if ('' == trim($code)) | |
| 484 | - return ''; | |
| 499 | +    if ('' == trim($code)) { | |
| 500 | + return ''; | |
| 501 | + } | |
| 485 | 502 |      return prepend("\tpublic function test_{$block->name}() {\n", | 
| 486 | 503 |          append("\n\t}\n", $code) | 
| 487 | 504 | ); | 
| @@ -496,8 +513,9 @@ discard block | ||
| 496 | 513 | */ | 
| 497 | 514 |  function code_from_description($block) { | 
| 498 | 515 |      $description = get('description', $block); | 
| 499 | -    if (!contains('```php', $description)) | |
| 500 | - return ''; | |
| 516 | +    if (!contains('```php', $description)) { | |
| 517 | + return ''; | |
| 518 | + } | |
| 501 | 519 |      $code = remove(7 + indexOf('```php', $description), $description); | 
| 502 | 520 | return remove(-4, trim($code)); | 
| 503 | 521 | } | 
| @@ -513,8 +531,7 @@ discard block | ||
| 513 | 531 |      if (contains('; //=> ', $part)) { | 
| 514 | 532 |          $pieces = split('; //=> ', $part); | 
| 515 | 533 |          $part = "\$this->assertEquals({$pieces[1]}, {$pieces[0]});"; | 
| 516 | - } | |
| 517 | -    elseif (contains('; // throws ', $part)) { | |
| 534 | +    } elseif (contains('; // throws ', $part)) { | |
| 518 | 535 |          $pieces = split('; // throws ', $part); | 
| 519 | 536 |          $variables = match('/ \$[0-9a-zA-Z_]+/', $pieces[0]); | 
| 520 | 537 | $use = ''; | 
| @@ -523,8 +540,7 @@ discard block | ||
| 523 | 540 |              $use = "use({$variables}) "; | 
| 524 | 541 | } | 
| 525 | 542 |          return "\$this->assertErrorThrown(function() {$use}{\n\t$pieces[0]; \n},\n{$pieces[1]});"; | 
| 526 | - } | |
| 527 | -    elseif (startsWith('class ', $part) || startsWith('function ', $part)) { | |
| 543 | +    } elseif (startsWith('class ', $part) || startsWith('function ', $part)) { | |
| 528 | 544 | $module->testsFooter .= $part . "\n\n"; | 
| 529 | 545 | $part = ''; | 
| 530 | 546 | } | 
| @@ -539,8 +555,9 @@ discard block | ||
| 539 | 555 | * @return object | 
| 540 | 556 | */ | 
| 541 | 557 |  function generate_tests_footer($module) { | 
| 542 | - if ($module->tests) | |
| 543 | -        $module->tests .= "}\n\n{$module->testsFooter}"; | |
| 558 | +    if ($module->tests) { | |
| 559 | +            $module->tests .= "}\n\n{$module->testsFooter}"; | |
| 560 | + } | |
| 544 | 561 | return $module; | 
| 545 | 562 | } | 
| 546 | 563 | |
| @@ -676,8 +693,9 @@ discard block | ||
| 676 | 693 | |
| 677 | 694 | // Convert Warnings to Exceptions | 
| 678 | 695 |  set_error_handler(function($errno, $errstr, $errfile, $errline, array $errcontext) { | 
| 679 | - if (0 === error_reporting()) | |
| 680 | - return false; | |
| 696 | +    if (0 === error_reporting()) { | |
| 697 | + return false; | |
| 698 | + } | |
| 681 | 699 | throw new \ErrorException($errstr, 0, $errno, $errfile, $errline); | 
| 682 | 700 | }); | 
| 683 | 701 | |
| @@ -131,8 +131,9 @@ discard block | ||
| 131 | 131 | */ | 
| 132 | 132 |  function _stream_operation($name, $signature, $callable = null) { | 
| 133 | 133 | $callable = $callable ?: $name; | 
| 134 | - if (!is_callable($callable)) | |
| 135 | -        _stream_throw_error('unknown-callable', $callable); | |
| 134 | +    if (!is_callable($callable)) { | |
| 135 | +            _stream_throw_error('unknown-callable', $callable); | |
| 136 | + } | |
| 136 | 137 | |
| 137 | 138 | return [ | 
| 138 | 139 | 'name' => $name, | 
| @@ -163,8 +164,9 @@ discard block | ||
| 163 | 164 | // Assuming $text = 'Number|List -> Number -> String|Array -> Number' | 
| 164 | 165 |      $parts = map(pipe(split('|'), map(pipe('trim', _stream_ensure_type($text)))), split('->', $text)); | 
| 165 | 166 | // $parts = [['Number', 'List'], ['Number'], ['String', 'Array'], ['Number']] | 
| 166 | - if (length($parts) < 2) | |
| 167 | -        _stream_throw_error('invalid-signature', $text); | |
| 167 | +    if (length($parts) < 2) { | |
| 168 | +            _stream_throw_error('invalid-signature', $text); | |
| 169 | + } | |
| 168 | 170 | |
| 169 | 171 |      return reduce(function($result, $part){ | 
| 170 | 172 |          return chain(function($item) use($result){ | 
| @@ -196,8 +198,9 @@ discard block | ||
| 196 | 198 | */ | 
| 197 | 199 |  function _stream_ensure_type() { | 
| 198 | 200 |      $ensureType = function($signature, $type) { | 
| 199 | - if (! contains($type, _stream_types())) | |
| 200 | -            _stream_throw_error('invalid-signature', $signature); | |
| 201 | +        if (! contains($type, _stream_types())) { | |
| 202 | +                    _stream_throw_error('invalid-signature', $signature); | |
| 203 | + } | |
| 201 | 204 | return $type; | 
| 202 | 205 | }; | 
| 203 | 206 | return apply(curry($ensureType), func_get_args()); | 
| @@ -553,8 +556,9 @@ discard block | ||
| 553 | 556 | * @return array | 
| 554 | 557 | */ | 
| 555 | 558 |  function _stream_resolve($stream) { | 
| 556 | -    if (get('resolved', $stream)) | |
| 557 | - return $stream; | |
| 559 | +    if (get('resolved', $stream)) { | |
| 560 | + return $stream; | |
| 561 | + } | |
| 558 | 562 |      $transformations = get('transformations', $stream); | 
| 559 | 563 | $transformation = head($transformations); | 
| 560 | 564 |      if (null === $transformation) { | 
| @@ -167,7 +167,7 @@ discard block | ||
| 167 | 167 | if (length($parts) < 2) | 
| 168 | 168 |          _stream_throw_error('invalid-signature', $text); | 
| 169 | 169 | |
| 170 | -    return reduce(function($result, $part){ | |
| 170 | +    return reduce(function($result, $part) { | |
| 171 | 171 |          return chain(function($item) use($result){ | 
| 172 | 172 | return map(append($item), $result); | 
| 173 | 173 | }, $part); | 
| @@ -197,7 +197,7 @@ discard block | ||
| 197 | 197 | */ | 
| 198 | 198 |  function _stream_ensure_type() { | 
| 199 | 199 |      $ensureType = function($signature, $type) { | 
| 200 | - if (! contains($type, _stream_types())) | |
| 200 | + if (!contains($type, _stream_types())) | |
| 201 | 201 |              _stream_throw_error('invalid-signature', $signature); | 
| 202 | 202 | return $type; | 
| 203 | 203 | }; | 
| @@ -18,7 +18,7 @@ | ||
| 18 | 18 | * @param Error|null $error | 
| 19 | 19 | * @return Error | 
| 20 | 20 | */ | 
| 21 | - public static function of ($message, $code = 0, Error $error = null) | |
| 21 | + public static function of($message, $code = 0, Error $error = null) | |
| 22 | 22 |      { | 
| 23 | 23 | return new Error($message, $code, $error); | 
| 24 | 24 | } | 
| @@ -53,7 +53,7 @@ | ||
| 53 | 53 | */ | 
| 54 | 54 | public static function operation($name, $signatures, $fn = null) | 
| 55 | 55 |      { | 
| 56 | -        if (! is_array($signatures)) { | |
| 56 | +        if (!is_array($signatures)) { | |
| 57 | 57 | $signatures = [$signatures]; | 
| 58 | 58 | } | 
| 59 | 59 |          foreach ($signatures as $signature) { | 
| @@ -11,8 +11,9 @@ | ||
| 11 | 11 |      private function __construct(){} | 
| 12 | 12 | public static function get() | 
| 13 | 13 |      { | 
| 14 | - if(static::$instance === null) | |
| 15 | - static::$instance = new Placeholder; | |
| 14 | +        if(static::$instance === null) { | |
| 15 | + static::$instance = new Placeholder; | |
| 16 | + } | |
| 16 | 17 | return static::$instance; | 
| 17 | 18 | } | 
| 18 | 19 |      public function __toString(){ | 
| @@ -8,10 +8,10 @@ | ||
| 8 | 8 | */ | 
| 9 | 9 |  class Placeholder { | 
| 10 | 10 | private static $instance; | 
| 11 | -    private function __construct(){} | |
| 11 | +    private function __construct() {} | |
| 12 | 12 | public static function get() | 
| 13 | 13 |      { | 
| 14 | - if(static::$instance === null) | |
| 14 | + if (static::$instance === null) | |
| 15 | 15 | static::$instance = new Placeholder; | 
| 16 | 16 | return static::$instance; | 
| 17 | 17 | } | 
| @@ -99,7 +99,7 @@ discard block | ||
| 99 | 99 | */ | 
| 100 | 100 |  function reduce() { | 
| 101 | 101 | static $reduce = false; | 
| 102 | -    $reduce = $reduce ?: curry(function($fn, $initial, $list){ | |
| 102 | +    $reduce = $reduce ?: curry(function($fn, $initial, $list) { | |
| 103 | 103 | return array_reduce($list, $fn, $initial); | 
| 104 | 104 | }); | 
| 105 | 105 | return _apply($reduce, func_get_args()); | 
| @@ -126,7 +126,7 @@ discard block | ||
| 126 | 126 | */ | 
| 127 | 127 |  function each() { | 
| 128 | 128 | static $each = false; | 
| 129 | -    $each = $each ?: curry(function($fn, $list){ | |
| 129 | +    $each = $each ?: curry(function($fn, $list) { | |
| 130 | 130 |          foreach ($list as $item) { | 
| 131 | 131 | $fn($item); | 
| 132 | 132 | } | 
| @@ -176,10 +176,10 @@ discard block | ||
| 176 | 176 | * @param array|string $list | 
| 177 | 177 | * @return mixed | 
| 178 | 178 | */ | 
| 179 | -function last () { | |
| 179 | +function last() { | |
| 180 | 180 | static $last = false; | 
| 181 | 181 |      $last = $last ?: curry(function($list) { | 
| 182 | - if(is_string($list)) | |
| 182 | + if (is_string($list)) | |
| 183 | 183 | return substr($list, -1); | 
| 184 | 184 | $size = count($list); | 
| 185 | 185 | return ($size > 0) | 
| @@ -206,10 +206,10 @@ discard block | ||
| 206 | 206 | * @param array|string $list | 
| 207 | 207 | * @return array | 
| 208 | 208 | */ | 
| 209 | -function init () { | |
| 209 | +function init() { | |
| 210 | 210 | static $init = false; | 
| 211 | 211 |      $init = $init ?: curry(function($list) { | 
| 212 | -        if(is_string($list)) { | |
| 212 | +        if (is_string($list)) { | |
| 213 | 213 | $size = strlen($list); | 
| 214 | 214 | return ($size > 1) | 
| 215 | 215 | ? substr($list, 0, $size - 1) | 
| @@ -240,10 +240,10 @@ discard block | ||
| 240 | 240 | * @param array|string $list | 
| 241 | 241 | * @return array | 
| 242 | 242 | */ | 
| 243 | -function tail () { | |
| 243 | +function tail() { | |
| 244 | 244 | static $tail = false; | 
| 245 | 245 |      $tail = $tail ?: curry(function($list) { | 
| 246 | - if(is_string($list)) | |
| 246 | + if (is_string($list)) | |
| 247 | 247 | return (strlen($list) > 1) | 
| 248 | 248 | ? substr($list, 1) | 
| 249 | 249 | : ''; | 
| @@ -268,7 +268,7 @@ discard block | ||
| 268 | 268 | * @param array|string $list | 
| 269 | 269 | * @return array | 
| 270 | 270 | */ | 
| 271 | -function reverse () { | |
| 271 | +function reverse() { | |
| 272 | 272 | static $reverse = false; | 
| 273 | 273 |      $reverse = $reverse ?: curry(function($list) { | 
| 274 | 274 | return is_string($list) | 
| @@ -321,7 +321,7 @@ discard block | ||
| 321 | 321 | static $allSatisfies = false; | 
| 322 | 322 |      $allSatisfies = $allSatisfies ?: curry(function($predicate, $list) { | 
| 323 | 323 |          foreach ($list as $item) { | 
| 324 | - if (! $predicate($item)) | |
| 324 | + if (!$predicate($item)) | |
| 325 | 325 | return false; | 
| 326 | 326 | } | 
| 327 | 327 | return true; | 
| @@ -497,7 +497,7 @@ discard block | ||
| 497 | 497 | */ | 
| 498 | 498 |  function append() { | 
| 499 | 499 | static $append = false; | 
| 500 | -    $append = $append ?: curry(function ($item, $list) { | |
| 500 | +    $append = $append ?: curry(function($item, $list) { | |
| 501 | 501 | return is_string($list) | 
| 502 | 502 | ? $list . $item | 
| 503 | 503 | : array_merge($list, [$item]); | 
| @@ -523,7 +523,7 @@ discard block | ||
| 523 | 523 | */ | 
| 524 | 524 |  function prepend() { | 
| 525 | 525 | static $prepend = false; | 
| 526 | -    $prepend = $prepend ?: curry(function ($item, $list) { | |
| 526 | +    $prepend = $prepend ?: curry(function($item, $list) { | |
| 527 | 527 | return is_string($list) | 
| 528 | 528 | ? $item . $list | 
| 529 | 529 | : array_merge([$item], $list); | 
| @@ -558,7 +558,7 @@ discard block | ||
| 558 | 558 | $length = length($list); | 
| 559 | 559 | if ($count > $length || $count < -$length) | 
| 560 | 560 | return $list; | 
| 561 | -        if(is_string($list)) { | |
| 561 | +        if (is_string($list)) { | |
| 562 | 562 | return ($count >= 0) | 
| 563 | 563 | ? substr($list, 0, $count) | 
| 564 | 564 | : substr($list, $count); | 
| @@ -709,7 +709,7 @@ discard block | ||
| 709 | 709 | $count = ($count > 0) | 
| 710 | 710 | ? $count - $length | 
| 711 | 711 | : $count + $length; | 
| 712 | -        if(is_string($list)) { | |
| 712 | +        if (is_string($list)) { | |
| 713 | 713 | return ($count >= 0) | 
| 714 | 714 | ? substr($list, 0, $count) | 
| 715 | 715 | : substr($list, $count); | 
| @@ -1066,7 +1066,7 @@ discard block | ||
| 1066 | 1066 |      $indexOf = $indexOf ?: curry(function($item, $list) { | 
| 1067 | 1067 |          if (is_string($list)) { | 
| 1068 | 1068 | $index = strpos($list, $item); | 
| 1069 | - return $index === false ? -1 : $index; | |
| 1069 | + return $index === false ? - 1 : $index; | |
| 1070 | 1070 | } | 
| 1071 | 1071 | $list = (array) $list; | 
| 1072 | 1072 | $index = 0; | 
| @@ -1077,7 +1077,7 @@ discard block | ||
| 1077 | 1077 | return $keys[$index]; | 
| 1078 | 1078 | $index ++; | 
| 1079 | 1079 | } | 
| 1080 | - return -1; | |
| 1080 | + return - 1; | |
| 1081 | 1081 | }); | 
| 1082 | 1082 | return _apply($indexOf, func_get_args()); | 
| 1083 | 1083 | } | 
| @@ -1106,7 +1106,7 @@ discard block | ||
| 1106 | 1106 |      $lastIndexOf = $lastIndexOf ?: curry(function($item, $list) { | 
| 1107 | 1107 |          if (is_string($list)) { | 
| 1108 | 1108 | $index = strrpos($list, $item); | 
| 1109 | - return $index === false ? -1 : $index; | |
| 1109 | + return $index === false ? - 1 : $index; | |
| 1110 | 1110 | } | 
| 1111 | 1111 | $list = (array) $list; | 
| 1112 | 1112 | $keys = array_keys($list); | 
| @@ -1116,7 +1116,7 @@ discard block | ||
| 1116 | 1116 | return $keys[$index]; | 
| 1117 | 1117 | $index --; | 
| 1118 | 1118 | } | 
| 1119 | - return -1; | |
| 1119 | + return - 1; | |
| 1120 | 1120 | }); | 
| 1121 | 1121 | return _apply($lastIndexOf, func_get_args()); | 
| 1122 | 1122 | } | 
| @@ -1151,7 +1151,7 @@ discard block | ||
| 1151 | 1151 | } | 
| 1152 | 1152 | $index ++; | 
| 1153 | 1153 | } | 
| 1154 | -            if (! $found) { | |
| 1154 | +            if (!$found) { | |
| 1155 | 1155 | $result[$size] = $item; | 
| 1156 | 1156 | $size ++; | 
| 1157 | 1157 | } | 
| @@ -1211,9 +1211,9 @@ discard block | ||
| 1211 | 1211 | static $groupBy = false; | 
| 1212 | 1212 |      $groupBy = $groupBy ?: curry(function($fn, $list) { | 
| 1213 | 1213 | $result = []; | 
| 1214 | -        foreach($list as $item) { | |
| 1214 | +        foreach ($list as $item) { | |
| 1215 | 1215 | $index = $fn($item); | 
| 1216 | - if (! isset($result[$index])) | |
| 1216 | + if (!isset($result[$index])) | |
| 1217 | 1217 | $result[$index] = []; | 
| 1218 | 1218 | $result[$index][] = $item; | 
| 1219 | 1219 | } | 
| @@ -72,8 +72,9 @@ discard block | ||
| 72 | 72 |      $filter = $filter ?: curry(function($fn, $list) { | 
| 73 | 73 | $result = []; | 
| 74 | 74 |          foreach ($list as $item) { | 
| 75 | - if ($fn($item)) | |
| 76 | - $result[] = $item; | |
| 75 | +            if ($fn($item)) { | |
| 76 | + $result[] = $item; | |
| 77 | + } | |
| 77 | 78 | } | 
| 78 | 79 | return $result; | 
| 79 | 80 | }); | 
| @@ -154,7 +155,9 @@ discard block | ||
| 154 | 155 |  function head() { | 
| 155 | 156 | static $head = false; | 
| 156 | 157 |      $head = $head ?: curry(function($list) { | 
| 157 | - if (isset($list[0])) return $list[0]; | |
| 158 | +        if (isset($list[0])) { | |
| 159 | + return $list[0]; | |
| 160 | + } | |
| 158 | 161 | return is_string($list) ? '' : null; | 
| 159 | 162 | }); | 
| 160 | 163 | return _apply($head, func_get_args()); | 
| @@ -179,8 +182,9 @@ discard block | ||
| 179 | 182 |  function last () { | 
| 180 | 183 | static $last = false; | 
| 181 | 184 |      $last = $last ?: curry(function($list) { | 
| 182 | - if(is_string($list)) | |
| 183 | - return substr($list, -1); | |
| 185 | +        if(is_string($list)) { | |
| 186 | + return substr($list, -1); | |
| 187 | + } | |
| 184 | 188 | $size = count($list); | 
| 185 | 189 | return ($size > 0) | 
| 186 | 190 | ? $list[$size - 1] | 
| @@ -243,10 +247,11 @@ discard block | ||
| 243 | 247 |  function tail () { | 
| 244 | 248 | static $tail = false; | 
| 245 | 249 |      $tail = $tail ?: curry(function($list) { | 
| 246 | - if(is_string($list)) | |
| 247 | - return (strlen($list) > 1) | |
| 250 | +        if(is_string($list)) { | |
| 251 | + return (strlen($list) > 1) | |
| 248 | 252 | ? substr($list, 1) | 
| 249 | 253 | : ''; | 
| 254 | + } | |
| 250 | 255 | return (count($list) > 1) | 
| 251 | 256 | ? array_slice($list, 1) | 
| 252 | 257 | : []; | 
| @@ -321,8 +326,9 @@ discard block | ||
| 321 | 326 | static $allSatisfies = false; | 
| 322 | 327 |      $allSatisfies = $allSatisfies ?: curry(function($predicate, $list) { | 
| 323 | 328 |          foreach ($list as $item) { | 
| 324 | - if (! $predicate($item)) | |
| 325 | - return false; | |
| 329 | +            if (! $predicate($item)) { | |
| 330 | + return false; | |
| 331 | + } | |
| 326 | 332 | } | 
| 327 | 333 | return true; | 
| 328 | 334 | }); | 
| @@ -348,8 +354,9 @@ discard block | ||
| 348 | 354 | static $anySatisfies = false; | 
| 349 | 355 |      $anySatisfies = $anySatisfies ?: curry(function($predicate, $list) { | 
| 350 | 356 |          foreach ($list as $item) { | 
| 351 | - if ($predicate($item)) | |
| 352 | - return true; | |
| 357 | +            if ($predicate($item)) { | |
| 358 | + return true; | |
| 359 | + } | |
| 353 | 360 | } | 
| 354 | 361 | return false; | 
| 355 | 362 | }); | 
| @@ -374,8 +381,9 @@ discard block | ||
| 374 | 381 |  function concat() { | 
| 375 | 382 | static $concat = false; | 
| 376 | 383 |      $concat = $concat ?: curry(function($list1, $list2) { | 
| 377 | - if (is_string($list1) && is_string($list2)) | |
| 378 | - return $list1 . $list2; | |
| 384 | +        if (is_string($list1) && is_string($list2)) { | |
| 385 | + return $list1 . $list2; | |
| 386 | + } | |
| 379 | 387 | return array_merge($list1, $list2); | 
| 380 | 388 | }); | 
| 381 | 389 | return _apply($concat, func_get_args()); | 
| @@ -397,10 +405,12 @@ discard block | ||
| 397 | 405 |  function concatAll() { | 
| 398 | 406 | static $concatAll = false; | 
| 399 | 407 |      $concatAll = $concatAll ?: curry(function($lists) { | 
| 400 | - if (count($lists) == 0) | |
| 401 | - return []; | |
| 402 | - if (is_string($lists[0])) | |
| 403 | -            return implode('', $lists); | |
| 408 | +        if (count($lists) == 0) { | |
| 409 | + return []; | |
| 410 | + } | |
| 411 | +        if (is_string($lists[0])) { | |
| 412 | +                    return implode('', $lists); | |
| 413 | + } | |
| 404 | 414 |          return _apply('array_merge', $lists); | 
| 405 | 415 | }); | 
| 406 | 416 | return _apply($concatAll, func_get_args()); | 
| @@ -465,14 +475,17 @@ discard block | ||
| 465 | 475 | static $insertAll = false; | 
| 466 | 476 |      $insertAll = $insertAll ?: curry(function($position, $items, $list) { | 
| 467 | 477 | $size = length($list); | 
| 468 | - if ($position < 0) | |
| 469 | - $position = $size + $position; | |
| 470 | - if ($position < 0) | |
| 471 | - $position = 0; | |
| 472 | - if (is_string($list)) | |
| 473 | - return ($position >= $size) | |
| 478 | +        if ($position < 0) { | |
| 479 | + $position = $size + $position; | |
| 480 | + } | |
| 481 | +        if ($position < 0) { | |
| 482 | + $position = 0; | |
| 483 | + } | |
| 484 | +        if (is_string($list)) { | |
| 485 | + return ($position >= $size) | |
| 474 | 486 | ? $list . $items | 
| 475 | 487 | : substr($list, 0, $position) . $items . substr($list, $position); | 
| 488 | + } | |
| 476 | 489 | return ($position >= $size) | 
| 477 | 490 | ? array_merge($list, $items) | 
| 478 | 491 | : array_merge(array_slice($list, 0, $position), $items, array_slice($list, $position)); | 
| @@ -556,8 +569,9 @@ discard block | ||
| 556 | 569 | static $take = false; | 
| 557 | 570 |      $take = $take ?: curry(function($count, $list) { | 
| 558 | 571 | $length = length($list); | 
| 559 | - if ($count > $length || $count < -$length) | |
| 560 | - return $list; | |
| 572 | +        if ($count > $length || $count < -$length) { | |
| 573 | + return $list; | |
| 574 | + } | |
| 561 | 575 |          if(is_string($list)) { | 
| 562 | 576 | return ($count >= 0) | 
| 563 | 577 | ? substr($list, 0, $count) | 
| @@ -591,8 +605,9 @@ discard block | ||
| 591 | 605 |      $takeWhile = $takeWhile ?: curry(function($predicate, $list) { | 
| 592 | 606 | $index = 0; | 
| 593 | 607 | $size = length($list); | 
| 594 | - while ($index < $size && $predicate($list[$index])) | |
| 595 | - $index ++; | |
| 608 | +        while ($index < $size && $predicate($list[$index])) { | |
| 609 | + $index ++; | |
| 610 | + } | |
| 596 | 611 | return array_slice($list, 0, $index); | 
| 597 | 612 | }); | 
| 598 | 613 | return _apply($takeWhile, func_get_args()); | 
| @@ -617,8 +632,9 @@ discard block | ||
| 617 | 632 | static $takeLastWhile = false; | 
| 618 | 633 |      $takeLastWhile = $takeLastWhile ?: curry(function($predicate, $list) { | 
| 619 | 634 | $index = length($list) - 1; | 
| 620 | - while ($index >= 0 && $predicate($list[$index])) | |
| 621 | - $index --; | |
| 635 | +        while ($index >= 0 && $predicate($list[$index])) { | |
| 636 | + $index --; | |
| 637 | + } | |
| 622 | 638 | return array_slice($list, $index + 1); | 
| 623 | 639 | }); | 
| 624 | 640 | return _apply($takeLastWhile, func_get_args()); | 
| @@ -645,8 +661,9 @@ discard block | ||
| 645 | 661 |      $takeUntil = $takeUntil ?: curry(function($predicate, $list) { | 
| 646 | 662 | $index = 0; | 
| 647 | 663 | $size = length($list); | 
| 648 | - while ($index < $size && !$predicate($list[$index])) | |
| 649 | - $index ++; | |
| 664 | +        while ($index < $size && !$predicate($list[$index])) { | |
| 665 | + $index ++; | |
| 666 | + } | |
| 650 | 667 | return array_slice($list, 0, $index); | 
| 651 | 668 | }); | 
| 652 | 669 | return _apply($takeUntil, func_get_args()); | 
| @@ -671,8 +688,9 @@ discard block | ||
| 671 | 688 | static $takeLastUntil = false; | 
| 672 | 689 |      $takeLastUntil = $takeLastUntil ?: curry(function($predicate, $list) { | 
| 673 | 690 | $index = length($list) - 1; | 
| 674 | - while ($index >= 0 && !$predicate($list[$index])) | |
| 675 | - $index --; | |
| 691 | +        while ($index >= 0 && !$predicate($list[$index])) { | |
| 692 | + $index --; | |
| 693 | + } | |
| 676 | 694 | return array_slice($list, $index + 1); | 
| 677 | 695 | }); | 
| 678 | 696 | return _apply($takeLastUntil, func_get_args()); | 
| @@ -704,8 +722,9 @@ discard block | ||
| 704 | 722 |      $remove = $remove ?: curry(function($count, $list) { | 
| 705 | 723 | // ... | 
| 706 | 724 | $length = length($list); | 
| 707 | - if ($count > $length || $count < -$length) | |
| 708 | - return []; | |
| 725 | +        if ($count > $length || $count < -$length) { | |
| 726 | + return []; | |
| 727 | + } | |
| 709 | 728 | $count = ($count > 0) | 
| 710 | 729 | ? $count - $length | 
| 711 | 730 | : $count + $length; | 
| @@ -742,8 +761,9 @@ discard block | ||
| 742 | 761 |      $removeWhile = $removeWhile ?: curry(function($predicate, $list) { | 
| 743 | 762 | $index = 0; | 
| 744 | 763 | $size = length($list); | 
| 745 | - while ($index < $size && $predicate($list[$index])) | |
| 746 | - $index ++; | |
| 764 | +        while ($index < $size && $predicate($list[$index])) { | |
| 765 | + $index ++; | |
| 766 | + } | |
| 747 | 767 | return array_slice($list, $index); | 
| 748 | 768 | }); | 
| 749 | 769 | return _apply($removeWhile, func_get_args()); | 
| @@ -768,8 +788,9 @@ discard block | ||
| 768 | 788 | static $removeLastWhile = false; | 
| 769 | 789 |      $removeLastWhile = $removeLastWhile ?: curry(function($predicate, $list) { | 
| 770 | 790 | $index = length($list) - 1; | 
| 771 | - while ($index >= 0 && $predicate($list[$index])) | |
| 772 | - $index --; | |
| 791 | +        while ($index >= 0 && $predicate($list[$index])) { | |
| 792 | + $index --; | |
| 793 | + } | |
| 773 | 794 | return array_slice($list, 0, $index + 1); | 
| 774 | 795 | }); | 
| 775 | 796 | return _apply($removeLastWhile, func_get_args()); | 
| @@ -797,8 +818,9 @@ discard block | ||
| 797 | 818 |      $removeUntil = $removeUntil ?: curry(function($predicate, $list) { | 
| 798 | 819 | $index = 0; | 
| 799 | 820 | $size = length($list); | 
| 800 | - while ($index < $size && !$predicate($list[$index])) | |
| 801 | - $index ++; | |
| 821 | +        while ($index < $size && !$predicate($list[$index])) { | |
| 822 | + $index ++; | |
| 823 | + } | |
| 802 | 824 | return array_slice($list, $index); | 
| 803 | 825 | }); | 
| 804 | 826 | return _apply($removeUntil, func_get_args()); | 
| @@ -824,8 +846,9 @@ discard block | ||
| 824 | 846 | static $removeLastUntil = false; | 
| 825 | 847 |      $removeLastUntil = $removeLastUntil ?: curry(function($predicate, $list) { | 
| 826 | 848 | $index = length($list) - 1; | 
| 827 | - while ($index >= 0 && !$predicate($list[$index])) | |
| 828 | - $index --; | |
| 849 | +        while ($index >= 0 && !$predicate($list[$index])) { | |
| 850 | + $index --; | |
| 851 | + } | |
| 829 | 852 | return array_slice($list, 0, $index + 1); | 
| 830 | 853 | }); | 
| 831 | 854 | return _apply($removeLastUntil, func_get_args()); | 
| @@ -878,8 +901,9 @@ discard block | ||
| 878 | 901 | static $slices = false; | 
| 879 | 902 |      $slices = $slices ?: curry(function($size, &$list) { | 
| 880 | 903 | $length = length($list); | 
| 881 | - if ($length == 0) | |
| 882 | - return is_string($list) ? [''] : []; | |
| 904 | +        if ($length == 0) { | |
| 905 | + return is_string($list) ? [''] : []; | |
| 906 | + } | |
| 883 | 907 | $start = 0; | 
| 884 | 908 | $result = []; | 
| 885 | 909 | $slicer = is_string($list) ? 'substr' : 'array_slice'; | 
| @@ -940,8 +964,9 @@ discard block | ||
| 940 | 964 | static $findIndex = false; | 
| 941 | 965 |      $findIndex = $findIndex ?: curry(function($predicate, $list) { | 
| 942 | 966 |          foreach ($list as $key => &$value) { | 
| 943 | - if ($predicate($value)) | |
| 944 | - return $key; | |
| 967 | +            if ($predicate($value)) { | |
| 968 | + return $key; | |
| 969 | + } | |
| 945 | 970 | } | 
| 946 | 971 | return null; | 
| 947 | 972 | }); | 
| @@ -971,8 +996,9 @@ discard block | ||
| 971 | 996 | $keys = array_keys($list); | 
| 972 | 997 | $index = count($keys) - 1; | 
| 973 | 998 |          while ($index >= 0) { | 
| 974 | - if ($predicate($list[$keys[$index]])) | |
| 975 | - return $keys[$index]; | |
| 999 | +            if ($predicate($list[$keys[$index]])) { | |
| 1000 | + return $keys[$index]; | |
| 1001 | + } | |
| 976 | 1002 | $index --; | 
| 977 | 1003 | } | 
| 978 | 1004 | return null; | 
| @@ -999,8 +1025,9 @@ discard block | ||
| 999 | 1025 | static $find = false; | 
| 1000 | 1026 |      $find = $find ?: curry(function($predicate, $list) { | 
| 1001 | 1027 |          foreach ($list as $key => &$value) { | 
| 1002 | - if ($predicate($value)) | |
| 1003 | - return $value; | |
| 1028 | +            if ($predicate($value)) { | |
| 1029 | + return $value; | |
| 1030 | + } | |
| 1004 | 1031 | } | 
| 1005 | 1032 | return null; | 
| 1006 | 1033 | }); | 
| @@ -1028,8 +1055,9 @@ discard block | ||
| 1028 | 1055 | $keys = array_keys($list); | 
| 1029 | 1056 | $index = count($keys) - 1; | 
| 1030 | 1057 |          while ($index >= 0) { | 
| 1031 | - if ($predicate($list[$keys[$index]])) | |
| 1032 | - return $list[$keys[$index]]; | |
| 1058 | +            if ($predicate($list[$keys[$index]])) { | |
| 1059 | + return $list[$keys[$index]]; | |
| 1060 | + } | |
| 1033 | 1061 | $index --; | 
| 1034 | 1062 | } | 
| 1035 | 1063 | return null; | 
| @@ -1073,8 +1101,9 @@ discard block | ||
| 1073 | 1101 | $keys = array_keys($list); | 
| 1074 | 1102 | $length = count($keys); | 
| 1075 | 1103 |          while ($index < $length) { | 
| 1076 | - if (_equals($item, $list[$keys[$index]])) | |
| 1077 | - return $keys[$index]; | |
| 1104 | +            if (_equals($item, $list[$keys[$index]])) { | |
| 1105 | + return $keys[$index]; | |
| 1106 | + } | |
| 1078 | 1107 | $index ++; | 
| 1079 | 1108 | } | 
| 1080 | 1109 | return -1; | 
| @@ -1112,8 +1141,9 @@ discard block | ||
| 1112 | 1141 | $keys = array_keys($list); | 
| 1113 | 1142 | $index = count($list) - 1; | 
| 1114 | 1143 |          while ($index >= 0) { | 
| 1115 | - if (_equals($list[$keys[$index]], $item)) | |
| 1116 | - return $keys[$index]; | |
| 1144 | +            if (_equals($list[$keys[$index]], $item)) { | |
| 1145 | + return $keys[$index]; | |
| 1146 | + } | |
| 1117 | 1147 | $index --; | 
| 1118 | 1148 | } | 
| 1119 | 1149 | return -1; | 
| @@ -1213,8 +1243,9 @@ discard block | ||
| 1213 | 1243 | $result = []; | 
| 1214 | 1244 |          foreach($list as $item) { | 
| 1215 | 1245 | $index = $fn($item); | 
| 1216 | - if (! isset($result[$index])) | |
| 1217 | - $result[$index] = []; | |
| 1246 | +            if (! isset($result[$index])) { | |
| 1247 | + $result[$index] = []; | |
| 1248 | + } | |
| 1218 | 1249 | $result[$index][] = $item; | 
| 1219 | 1250 | } | 
| 1220 | 1251 | return $result; | 
| @@ -1243,8 +1274,9 @@ discard block | ||
| 1243 | 1274 |      $pairsFrom = $pairsFrom ?: curry(function($list1, $list2) { | 
| 1244 | 1275 | $length1 = count($list1); | 
| 1245 | 1276 | $length2 = count($list2); | 
| 1246 | - if (0 == $length1 || 0 == $length2) | |
| 1247 | - return []; | |
| 1277 | +        if (0 == $length1 || 0 == $length2) { | |
| 1278 | + return []; | |
| 1279 | + } | |
| 1248 | 1280 | $result = []; | 
| 1249 | 1281 | $index = 0; | 
| 1250 | 1282 | $length = min($length1, $length2); | 
| @@ -46,7 +46,7 @@ | ||
| 46 | 46 | */ | 
| 47 | 47 |  function join() { | 
| 48 | 48 | static $join = false; | 
| 49 | -    $join = $join ?: curry(function($glue, $pieces){ | |
| 49 | +    $join = $join ?: curry(function($glue, $pieces) { | |
| 50 | 50 | return implode($glue, $pieces); | 
| 51 | 51 | }); | 
| 52 | 52 | return _apply($join, func_get_args()); | 
| @@ -345,10 +345,11 @@ discard block | ||
| 345 | 345 | ]; | 
| 346 | 346 |          foreach (str_split($surrounders) as $key => $char) { | 
| 347 | 347 | $counters['values'][$key / 2] = 0; | 
| 348 | - if ($key % 2 == 0) | |
| 349 | - $counters['openings'][$char] = $key / 2; | |
| 350 | - else | |
| 351 | - $counters['closings'][$char] = $key / 2; | |
| 348 | +            if ($key % 2 == 0) { | |
| 349 | + $counters['openings'][$char] = $key / 2; | |
| 350 | +            } else { | |
| 351 | + $counters['closings'][$char] = $key / 2; | |
| 352 | + } | |
| 352 | 353 | } | 
| 353 | 354 | // $counters = [ | 
| 354 | 355 | // 'values' => [0, 0, 0], | 
| @@ -394,8 +395,9 @@ discard block | ||
| 394 | 395 | $index ++; | 
| 395 | 396 | } | 
| 396 | 397 | } | 
| 397 | - if ($buffer != '') | |
| 398 | - $result[] = $buffer; | |
| 398 | +        if ($buffer != '') { | |
| 399 | + $result[] = $buffer; | |
| 400 | + } | |
| 399 | 401 | |
| 400 | 402 | return $result; | 
| 401 | 403 | }); | 
| @@ -20,7 +20,7 @@ discard block | ||
| 20 | 20 | */ | 
| 21 | 21 |  function plus() { | 
| 22 | 22 | static $plus = false; | 
| 23 | -    $plus = $plus ?: curry(function($x, $y){ | |
| 23 | +    $plus = $plus ?: curry(function($x, $y) { | |
| 24 | 24 | return $x + $y; | 
| 25 | 25 | }); | 
| 26 | 26 | return _apply($plus, func_get_args()); | 
| @@ -41,7 +41,7 @@ discard block | ||
| 41 | 41 | */ | 
| 42 | 42 |  function minus() { | 
| 43 | 43 | static $minus = false; | 
| 44 | -    $minus = $minus ?: curry(function($x, $y){ | |
| 44 | +    $minus = $minus ?: curry(function($x, $y) { | |
| 45 | 45 | return $x - $y; | 
| 46 | 46 | }); | 
| 47 | 47 | return _apply($minus, func_get_args()); | 
| @@ -62,8 +62,8 @@ discard block | ||
| 62 | 62 | */ | 
| 63 | 63 |  function negate() { | 
| 64 | 64 | static $negate = false; | 
| 65 | -    $negate = $negate ?: curry(function($x){ | |
| 66 | - return -$x; | |
| 65 | +    $negate = $negate ?: curry(function($x) { | |
| 66 | + return - $x; | |
| 67 | 67 | }); | 
| 68 | 68 | return _apply($negate, func_get_args()); | 
| 69 | 69 | } | 
| @@ -84,7 +84,7 @@ discard block | ||
| 84 | 84 | */ | 
| 85 | 85 |  function multiply() { | 
| 86 | 86 | static $multiply = false; | 
| 87 | -    $multiply = $multiply ?: curry(function($x, $y){ | |
| 87 | +    $multiply = $multiply ?: curry(function($x, $y) { | |
| 88 | 88 | return $y * $x; | 
| 89 | 89 | }); | 
| 90 | 90 | return _apply($multiply, func_get_args()); | 
| @@ -105,7 +105,7 @@ discard block | ||
| 105 | 105 | */ | 
| 106 | 106 |  function divide() { | 
| 107 | 107 | static $divide = false; | 
| 108 | -    $divide = $divide ?: curry(function($x, $y){ | |
| 108 | +    $divide = $divide ?: curry(function($x, $y) { | |
| 109 | 109 | return $x / $y; | 
| 110 | 110 | }); | 
| 111 | 111 | return _apply($divide, func_get_args()); | 
| @@ -126,7 +126,7 @@ discard block | ||
| 126 | 126 | */ | 
| 127 | 127 |  function modulo() { | 
| 128 | 128 | static $modulo = false; | 
| 129 | -    $modulo = $modulo ?: curry(function($x, $y){ | |
| 129 | +    $modulo = $modulo ?: curry(function($x, $y) { | |
| 130 | 130 | return $x % $y; | 
| 131 | 131 | }); | 
| 132 | 132 | return _apply($modulo, func_get_args()); | 
| @@ -186,7 +186,7 @@ discard block | ||
| 186 | 186 | */ | 
| 187 | 187 |  function min() { | 
| 188 | 188 | static $min = false; | 
| 189 | -    $min = $min ?: curry(function($a, $b){ | |
| 189 | +    $min = $min ?: curry(function($a, $b) { | |
| 190 | 190 | return $a < $b ? $a : $b; | 
| 191 | 191 | }); | 
| 192 | 192 | return _apply($min, func_get_args()); | 
| @@ -209,7 +209,7 @@ discard block | ||
| 209 | 209 | */ | 
| 210 | 210 |  function minBy() { | 
| 211 | 211 | static $minBy = false; | 
| 212 | -    $minBy = $minBy ?: curry(function($fn, $a, $b){ | |
| 212 | +    $minBy = $minBy ?: curry(function($fn, $a, $b) { | |
| 213 | 213 | return $fn($a) < $fn($b) ? $a : $b; | 
| 214 | 214 | }); | 
| 215 | 215 | return _apply($minBy, func_get_args()); | 
| @@ -231,7 +231,7 @@ discard block | ||
| 231 | 231 | */ | 
| 232 | 232 |  function max() { | 
| 233 | 233 | static $max = false; | 
| 234 | -    $max = $max ?: curry(function($a, $b){ | |
| 234 | +    $max = $max ?: curry(function($a, $b) { | |
| 235 | 235 | return $a > $b ? $a : $b; | 
| 236 | 236 | }); | 
| 237 | 237 | return _apply($max, func_get_args()); | 
| @@ -254,7 +254,7 @@ discard block | ||
| 254 | 254 | */ | 
| 255 | 255 |  function maxBy() { | 
| 256 | 256 | static $maxBy = false; | 
| 257 | -    $maxBy = $maxBy ?: curry(function($fn, $a, $b){ | |
| 257 | +    $maxBy = $maxBy ?: curry(function($fn, $a, $b) { | |
| 258 | 258 | return $fn($a) > $fn($b) ? $a : $b; | 
| 259 | 259 | }); | 
| 260 | 260 | return _apply($maxBy, func_get_args()); |