@@ -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) { |
@@ -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()); |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | */ |
| 174 | 174 | function has() { |
| 175 | 175 | static $has = false; |
| 176 | - $has = $has ?: curry(function($name, $object){ |
|
| 176 | + $has = $has ?: curry(function($name, $object) { |
|
| 177 | 177 | if (is_object($object)) return isset($object->{$name}); |
| 178 | 178 | if (is_array($object)) return isset($object[$name]); |
| 179 | 179 | return false; |
@@ -208,7 +208,7 @@ discard block |
||
| 208 | 208 | */ |
| 209 | 209 | function get() { |
| 210 | 210 | static $get = false; |
| 211 | - $get = $get ?: curry(function($name, $object){ |
|
| 211 | + $get = $get ?: curry(function($name, $object) { |
|
| 212 | 212 | return is_object($object) |
| 213 | 213 | ? (isset($object->{$name}) ? $object->{$name} : null) |
| 214 | 214 | : (isset($object[$name]) ? $object[$name] : null); |
@@ -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]; |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | */ |
| 23 | 23 | function and_() { |
| 24 | 24 | static $and = false; |
| 25 | - $and = $and ?: curry(function($a, $b){ |
|
| 25 | + $and = $and ?: curry(function($a, $b) { |
|
| 26 | 26 | return $a && $b; |
| 27 | 27 | }); |
| 28 | 28 | return _apply($and, func_get_args()); |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | */ |
| 46 | 46 | function or_() { |
| 47 | 47 | static $or = false; |
| 48 | - $or = $or ?: curry(function($a, $b){ |
|
| 48 | + $or = $or ?: curry(function($a, $b) { |
|
| 49 | 49 | return $a || $b; |
| 50 | 50 | }); |
| 51 | 51 | return _apply($or, func_get_args()); |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | * @return bool |
| 86 | 86 | */ |
| 87 | 87 | function eq() { |
| 88 | - $eq = curry(function($a, $b){ |
|
| 88 | + $eq = curry(function($a, $b) { |
|
| 89 | 89 | return $a == $b; |
| 90 | 90 | }); |
| 91 | 91 | return _apply($eq, func_get_args()); |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | */ |
| 107 | 107 | function notEq() { |
| 108 | 108 | static $notEq = false; |
| 109 | - $notEq = $notEq ?: curry(function($a, $b){ |
|
| 109 | + $notEq = $notEq ?: curry(function($a, $b) { |
|
| 110 | 110 | return $a != $b; |
| 111 | 111 | }); |
| 112 | 112 | return _apply($notEq, func_get_args()); |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | */ |
| 127 | 127 | function eqq() { |
| 128 | 128 | static $eqq = false; |
| 129 | - $eqq = $eqq ?: curry(function($a, $b){ |
|
| 129 | + $eqq = $eqq ?: curry(function($a, $b) { |
|
| 130 | 130 | return $a === $b; |
| 131 | 131 | }); |
| 132 | 132 | return _apply($eqq, func_get_args()); |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | */ |
| 148 | 148 | function notEqq() { |
| 149 | 149 | static $notEqq = false; |
| 150 | - $notEqq = $notEqq ?: curry(function($a, $b){ |
|
| 150 | + $notEqq = $notEqq ?: curry(function($a, $b) { |
|
| 151 | 151 | return $a !== $b; |
| 152 | 152 | }); |
| 153 | 153 | return _apply($notEqq, func_get_args()); |
@@ -264,7 +264,7 @@ discard block |
||
| 264 | 264 | */ |
| 265 | 265 | function lt() { |
| 266 | 266 | static $lt = false; |
| 267 | - $lt = $lt ?: curry(function($a, $b){ |
|
| 267 | + $lt = $lt ?: curry(function($a, $b) { |
|
| 268 | 268 | return $a < $b; |
| 269 | 269 | }); |
| 270 | 270 | return _apply($lt, func_get_args()); |
@@ -286,7 +286,7 @@ discard block |
||
| 286 | 286 | */ |
| 287 | 287 | function lte() { |
| 288 | 288 | static $lte = false; |
| 289 | - $lte = $lte ?: curry(function($a, $b){ |
|
| 289 | + $lte = $lte ?: curry(function($a, $b) { |
|
| 290 | 290 | return $a <= $b; |
| 291 | 291 | }); |
| 292 | 292 | return _apply($lte, func_get_args()); |
@@ -308,7 +308,7 @@ discard block |
||
| 308 | 308 | */ |
| 309 | 309 | function gt() { |
| 310 | 310 | static $gt = false; |
| 311 | - $gt = $gt ?: curry(function($a, $b){ |
|
| 311 | + $gt = $gt ?: curry(function($a, $b) { |
|
| 312 | 312 | return $a > $b; |
| 313 | 313 | }); |
| 314 | 314 | return _apply($gt, func_get_args()); |
@@ -330,7 +330,7 @@ discard block |
||
| 330 | 330 | */ |
| 331 | 331 | function gte() { |
| 332 | 332 | static $gte = false; |
| 333 | - $gte = $gte ?: curry(function($a, $b){ |
|
| 333 | + $gte = $gte ?: curry(function($a, $b) { |
|
| 334 | 334 | return $a >= $b; |
| 335 | 335 | }); |
| 336 | 336 | return _apply($gte, func_get_args()); |
@@ -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; |
@@ -35,8 +35,7 @@ discard block |
||
| 35 | 35 | */ |
| 36 | 36 | function _number_of_args($fn) { |
| 37 | 37 | $reflector = is_array($fn) ? |
| 38 | - new \ReflectionMethod($fn[0], $fn[1]) : |
|
| 39 | - new \ReflectionFunction($fn); |
|
| 38 | + new \ReflectionMethod($fn[0], $fn[1]) : new \ReflectionFunction($fn); |
|
| 40 | 39 | return $reflector->getNumberOfRequiredParameters(); |
| 41 | 40 | } |
| 42 | 41 | |
@@ -85,7 +84,7 @@ discard block |
||
| 85 | 84 | function _curry_one($fn) { |
| 86 | 85 | return function() use($fn) { |
| 87 | 86 | $args = func_get_args(); |
| 88 | - return (count($args) > 0 && ! _is_placeholder($args[0])) |
|
| 87 | + return (count($args) > 0 && !_is_placeholder($args[0])) |
|
| 89 | 88 | ? $fn($args[0]) |
| 90 | 89 | : _curry_one($fn); |
| 91 | 90 | }; |
@@ -119,25 +119,30 @@ discard block |
||
| 119 | 119 | return function() use($fn) { |
| 120 | 120 | $args = func_get_args(); |
| 121 | 121 | $n = count($args); |
| 122 | - while ($n > 0 && _is_placeholder($args[$n - 1])) |
|
| 123 | - $n --; |
|
| 124 | - if ($n == 0) |
|
| 125 | - return _curry_two($fn); |
|
| 122 | + while ($n > 0 && _is_placeholder($args[$n - 1])) { |
|
| 123 | + $n --; |
|
| 124 | + } |
|
| 125 | + if ($n == 0) { |
|
| 126 | + return _curry_two($fn); |
|
| 127 | + } |
|
| 126 | 128 | if ($n == 1) { |
| 127 | 129 | $a = &$args[0]; |
| 128 | - if (_is_placeholder($a)) |
|
| 129 | - return _curry_two($fn); |
|
| 130 | + if (_is_placeholder($a)) { |
|
| 131 | + return _curry_two($fn); |
|
| 132 | + } |
|
| 130 | 133 | return _curry_one(function($b) use($fn, &$a) { |
| 131 | 134 | return $fn($a, $b); |
| 132 | 135 | }); |
| 133 | 136 | } |
| 134 | 137 | $a = &$args[0]; |
| 135 | 138 | $b = &$args[1]; |
| 136 | - if (_is_placeholder($a) && _is_placeholder($b)) |
|
| 137 | - return _curry_two($fn); |
|
| 138 | - if (_is_placeholder($a)) |
|
| 139 | - return _curry_one(function($_a) use($fn, &$b) { |
|
| 139 | + if (_is_placeholder($a) && _is_placeholder($b)) { |
|
| 140 | + return _curry_two($fn); |
|
| 141 | + } |
|
| 142 | + if (_is_placeholder($a)) { |
|
| 143 | + return _curry_one(function($_a) use($fn, &$b) { |
|
| 140 | 144 | return $fn($_a, $b); |
| 145 | + } |
|
| 141 | 146 | }); |
| 142 | 147 | return $fn($args[0], $args[1]); |
| 143 | 148 | }; |
@@ -168,10 +173,12 @@ discard block |
||
| 168 | 173 | return function() use($fn) { |
| 169 | 174 | $args = func_get_args(); |
| 170 | 175 | $n = count($args); |
| 171 | - while ($n > 0 && _is_placeholder($args[$n - 1])) |
|
| 172 | - $n --; |
|
| 173 | - if ($n == 0) |
|
| 174 | - return _curry_three($fn); |
|
| 176 | + while ($n > 0 && _is_placeholder($args[$n - 1])) { |
|
| 177 | + $n --; |
|
| 178 | + } |
|
| 179 | + if ($n == 0) { |
|
| 180 | + return _curry_three($fn); |
|
| 181 | + } |
|
| 175 | 182 | if ($n == 1) { |
| 176 | 183 | $a = &$args[0]; |
| 177 | 184 | return _curry_two(function($b, $c) use($fn, &$a) { |
@@ -181,9 +188,10 @@ discard block |
||
| 181 | 188 | if ($n == 2) { |
| 182 | 189 | $a = &$args[0]; $b = &$args[1]; |
| 183 | 190 | |
| 184 | - if (_is_placeholder($a)) |
|
| 185 | - return _curry_two(function($_a, $c) use($fn, &$b) { |
|
| 191 | + if (_is_placeholder($a)) { |
|
| 192 | + return _curry_two(function($_a, $c) use($fn, &$b) { |
|
| 186 | 193 | return $fn($_a, $b, $c); |
| 194 | + } |
|
| 187 | 195 | }); |
| 188 | 196 | return _curry_one(function($c) use($fn, &$a, &$b) { |
| 189 | 197 | return $fn($a, $b, $c); |
@@ -192,17 +200,20 @@ discard block |
||
| 192 | 200 | |
| 193 | 201 | $a = &$args[0]; $b = &$args[1]; $c = &$args[2]; |
| 194 | 202 | |
| 195 | - if (_is_placeholder($a) && _is_placeholder($b)) |
|
| 196 | - return _curry_two(function($_a, $_b) use($fn, &$c) { |
|
| 203 | + if (_is_placeholder($a) && _is_placeholder($b)) { |
|
| 204 | + return _curry_two(function($_a, $_b) use($fn, &$c) { |
|
| 197 | 205 | return $fn($_a, $_b, $c); |
| 206 | + } |
|
| 198 | 207 | }); |
| 199 | - if (_is_placeholder($a)) |
|
| 200 | - return _curry_one(function($_a) use($fn, &$b, &$c) { |
|
| 208 | + if (_is_placeholder($a)) { |
|
| 209 | + return _curry_one(function($_a) use($fn, &$b, &$c) { |
|
| 201 | 210 | return $fn($_a, $b, $c); |
| 211 | + } |
|
| 202 | 212 | }); |
| 203 | - if (_is_placeholder($b)) |
|
| 204 | - return _curry_one(function($_b) use($fn, &$a, &$c) { |
|
| 213 | + if (_is_placeholder($b)) { |
|
| 214 | + return _curry_one(function($_b) use($fn, &$a, &$c) { |
|
| 205 | 215 | return $fn($a, $_b, $c); |
| 216 | + } |
|
| 206 | 217 | }); |
| 207 | 218 | |
| 208 | 219 | return $fn($a, $b, $c); |
@@ -284,8 +295,9 @@ discard block |
||
| 284 | 295 | $merged->args[$mergedIndex] = $given[$givenIndex]; |
| 285 | 296 | } |
| 286 | 297 | |
| 287 | - if (_is_placeholder($merged->args[$mergedIndex])) |
|
| 288 | - $merged->placeholders ++; |
|
| 298 | + if (_is_placeholder($merged->args[$mergedIndex])) { |
|
| 299 | + $merged->placeholders ++; |
|
| 300 | + } |
|
| 289 | 301 | |
| 290 | 302 | $givenIndex ++; |
| 291 | 303 | $mergedIndex ++; |
@@ -303,8 +315,9 @@ discard block |
||
| 303 | 315 | $argsCount = count($args); |
| 304 | 316 | $fillersCount = count($fillers); |
| 305 | 317 | while ($fillersIndex < $fillersCount) { |
| 306 | - while (!_is_placeholder($args[$argsIndex])) |
|
| 307 | - $argsIndex ++; |
|
| 318 | + while (!_is_placeholder($args[$argsIndex])) { |
|
| 319 | + $argsIndex ++; |
|
| 320 | + } |
|
| 308 | 321 | $args[$argsIndex] = $fillers[$fillersIndex]; |
| 309 | 322 | $fillersIndex ++; |
| 310 | 323 | } |