@@ -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) { |
@@ -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(){ |
@@ -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'; |
@@ -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 | |
@@ -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); |
@@ -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 | }); |
@@ -80,8 +80,9 @@ discard block |
||
| 80 | 80 | function attributes() { |
| 81 | 81 | static $attrs = false; |
| 82 | 82 | $attrs = $attrs ?: curry(function($object) { |
| 83 | - if (is_object($object)) |
|
| 84 | - return get_object_vars($object); |
|
| 83 | + if (is_object($object)) { |
|
| 84 | + return get_object_vars($object); |
|
| 85 | + } |
|
| 85 | 86 | return $object; |
| 86 | 87 | }); |
| 87 | 88 | return _apply($attrs, func_get_args()); |
@@ -174,8 +175,12 @@ discard block |
||
| 174 | 175 | function has() { |
| 175 | 176 | static $has = false; |
| 176 | 177 | $has = $has ?: curry(function($name, $object){ |
| 177 | - if (is_object($object)) return isset($object->{$name}); |
|
| 178 | - if (is_array($object)) return isset($object[$name]); |
|
| 178 | + if (is_object($object)) { |
|
| 179 | + return isset($object->{$name}); |
|
| 180 | + } |
|
| 181 | + if (is_array($object)) { |
|
| 182 | + return isset($object[$name]); |
|
| 183 | + } |
|
| 179 | 184 | return false; |
| 180 | 185 | }); |
| 181 | 186 | return _apply($has, func_get_args()); |
@@ -276,8 +281,9 @@ discard block |
||
| 276 | 281 | if (is_object($object)) { |
| 277 | 282 | $object = clone_($object); |
| 278 | 283 | $object->{$name} = $value; |
| 279 | - } else |
|
| 280 | - $object[$name] = $value; |
|
| 284 | + } else { |
|
| 285 | + $object[$name] = $value; |
|
| 286 | + } |
|
| 281 | 287 | return $object; |
| 282 | 288 | }); |
| 283 | 289 | return _apply($set, func_get_args()); |
@@ -370,8 +376,9 @@ discard block |
||
| 370 | 376 | static $satisfiesAll = false; |
| 371 | 377 | $satisfiesAll = $satisfiesAll ?: curry(function($predicates, $object) { |
| 372 | 378 | foreach ($predicates as $key => $predicate) { |
| 373 | - if (!satisfies($predicate, $key, $object)) |
|
| 374 | - return false; |
|
| 379 | + if (!satisfies($predicate, $key, $object)) { |
|
| 380 | + return false; |
|
| 381 | + } |
|
| 375 | 382 | } |
| 376 | 383 | return true; |
| 377 | 384 | }); |
@@ -408,8 +415,9 @@ discard block |
||
| 408 | 415 | static $satisfiesAny = false; |
| 409 | 416 | $satisfiesAny = $satisfiesAny ?: curry(function($predicates, $object) { |
| 410 | 417 | foreach ($predicates as $key => $predicate) { |
| 411 | - if (satisfies($predicate, $key, $object)) |
|
| 412 | - return true; |
|
| 418 | + if (satisfies($predicate, $key, $object)) { |
|
| 419 | + return true; |
|
| 420 | + } |
|
| 413 | 421 | } |
| 414 | 422 | return false; |
| 415 | 423 | }); |
@@ -433,8 +441,9 @@ discard block |
||
| 433 | 441 | function toPairs() { |
| 434 | 442 | static $toPairs = false; |
| 435 | 443 | $toPairs = $toPairs ?: curry(function($object) { |
| 436 | - if (is_object($object)) |
|
| 437 | - $object = get_object_vars($object); |
|
| 444 | + if (is_object($object)) { |
|
| 445 | + $object = get_object_vars($object); |
|
| 446 | + } |
|
| 438 | 447 | $result = []; |
| 439 | 448 | foreach ($object as $key => $value) { |
| 440 | 449 | $result[] = [$key, $value]; |
@@ -102,8 +102,9 @@ discard block |
||
| 102 | 102 | */ |
| 103 | 103 | function pipe() { |
| 104 | 104 | $fns = func_get_args(); |
| 105 | - if(count($fns) < 1) |
|
| 106 | - return identity(); |
|
| 105 | + if(count($fns) < 1) { |
|
| 106 | + return identity(); |
|
| 107 | + } |
|
| 107 | 108 | return function () use ($fns) { |
| 108 | 109 | $result = _apply(array_shift($fns), func_get_args()); |
| 109 | 110 | foreach ($fns as $fn) { |
@@ -181,8 +182,9 @@ discard block |
||
| 181 | 182 | $predicates = func_get_args(); |
| 182 | 183 | return _curry_one(function($value) use(&$predicates) { |
| 183 | 184 | foreach ($predicates as $predicate) { |
| 184 | - if (! $predicate($value)) |
|
| 185 | - return false; |
|
| 185 | + if (! $predicate($value)) { |
|
| 186 | + return false; |
|
| 187 | + } |
|
| 186 | 188 | } |
| 187 | 189 | return true; |
| 188 | 190 | }); |
@@ -215,8 +217,9 @@ discard block |
||
| 215 | 217 | $predicates = func_get_args(); |
| 216 | 218 | return _curry_one(function($value) use(&$predicates) { |
| 217 | 219 | foreach ($predicates as $predicate) { |
| 218 | - if ($predicate($value)) |
|
| 219 | - return true; |
|
| 220 | + if ($predicate($value)) { |
|
| 221 | + return true; |
|
| 222 | + } |
|
| 220 | 223 | } |
| 221 | 224 | return false; |
| 222 | 225 | }); |
@@ -279,8 +282,12 @@ discard block |
||
| 279 | 282 | static $comparator = false; |
| 280 | 283 | $comparator = $comparator ?: curry(function($fn) { |
| 281 | 284 | return function($a, $b) use($fn) { |
| 282 | - if ($fn($a, $b)) return -1; |
|
| 283 | - if ($fn($b, $a)) return 1; |
|
| 285 | + if ($fn($a, $b)) { |
|
| 286 | + return -1; |
|
| 287 | + } |
|
| 288 | + if ($fn($b, $a)) { |
|
| 289 | + return 1; |
|
| 290 | + } |
|
| 284 | 291 | return 0; |
| 285 | 292 | }; |
| 286 | 293 | }); |
@@ -184,17 +184,20 @@ discard block |
||
| 184 | 184 | } |
| 185 | 185 | function _equals($a, $b) { |
| 186 | 186 | $type = type($a); |
| 187 | - if ($type != type($b)) |
|
| 188 | - return false; |
|
| 187 | + if ($type != type($b)) { |
|
| 188 | + return false; |
|
| 189 | + } |
|
| 189 | 190 | switch ($type) { |
| 190 | 191 | case 'List': |
| 191 | 192 | $length = count($a); |
| 192 | - if (count($b) != $length) |
|
| 193 | - return false; |
|
| 193 | + if (count($b) != $length) { |
|
| 194 | + return false; |
|
| 195 | + } |
|
| 194 | 196 | $index = 0; |
| 195 | 197 | while ($index < $length) { |
| 196 | - if (!_equals($a[$index], $b[$index])) |
|
| 197 | - return false; |
|
| 198 | + if (!_equals($a[$index], $b[$index])) { |
|
| 199 | + return false; |
|
| 200 | + } |
|
| 198 | 201 | $index ++; |
| 199 | 202 | } |
| 200 | 203 | return true; |
@@ -204,14 +207,17 @@ discard block |
||
| 204 | 207 | $keysA = keys($a); |
| 205 | 208 | $keysB = keys($b); |
| 206 | 209 | $length = count($keysA); |
| 207 | - if (count($keysB) != $length) |
|
| 208 | - return false; |
|
| 210 | + if (count($keysB) != $length) { |
|
| 211 | + return false; |
|
| 212 | + } |
|
| 209 | 213 | $index = 0; |
| 210 | 214 | while ($index < $length) { |
| 211 | - if (!_equals($keysA[$index], $keysB[$index])) |
|
| 212 | - return false; |
|
| 213 | - if (!_equals(get($keysA[$index], $a), get($keysB[$index], $b))) |
|
| 214 | - return false; |
|
| 215 | + if (!_equals($keysA[$index], $keysB[$index])) { |
|
| 216 | + return false; |
|
| 217 | + } |
|
| 218 | + if (!_equals(get($keysA[$index], $a), get($keysB[$index], $b))) { |
|
| 219 | + return false; |
|
| 220 | + } |
|
| 215 | 221 | $index ++; |
| 216 | 222 | } |
| 217 | 223 | return true; |