@@ -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) { |
@@ -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 |
@@ -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]; |
@@ -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; |
@@ -103,8 +103,9 @@ |
||
103 | 103 | protected function getWordsHavingOccurrences($number) { |
104 | 104 | $result = []; |
105 | 105 | foreach ($this->list as $word) { |
106 | - if ($word->occurrences() == $number) |
|
107 | - $result[] = $word; |
|
106 | + if ($word->occurrences() == $number) { |
|
107 | + $result[] = $word; |
|
108 | + } |
|
108 | 109 | } |
109 | 110 | usort($result, function(Word $w1, Word $w2) { |
110 | 111 | return strcmp($w1->value(), $w2->value()); |
@@ -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 | } |
@@ -33,9 +33,15 @@ discard block |
||
33 | 33 | function type() { |
34 | 34 | static $type = false; |
35 | 35 | $type = $type ?: _curry_one(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'; |
@@ -112,8 +112,9 @@ discard block |
||
112 | 112 | */ |
113 | 113 | function pipe() { |
114 | 114 | $fns = func_get_args(); |
115 | - if(count($fns) < 1) |
|
116 | - return identity(); |
|
115 | + if(count($fns) < 1) { |
|
116 | + return identity(); |
|
117 | + } |
|
117 | 118 | return function () use ($fns) { |
118 | 119 | $result = _apply(array_shift($fns), func_get_args()); |
119 | 120 | foreach ($fns as $fn) { |
@@ -143,8 +144,9 @@ discard block |
||
143 | 144 | */ |
144 | 145 | function compose() { |
145 | 146 | $fns = array_reverse(func_get_args()); |
146 | - if(count($fns) < 1) |
|
147 | - return identity(); |
|
147 | + if(count($fns) < 1) { |
|
148 | + return identity(); |
|
149 | + } |
|
148 | 150 | return function () use ($fns) { |
149 | 151 | $result = _apply(array_shift($fns), func_get_args()); |
150 | 152 | foreach ($fns as $fn) { |
@@ -222,8 +224,9 @@ discard block |
||
222 | 224 | $predicates = func_get_args(); |
223 | 225 | return _curry_one(function($value) use(&$predicates) { |
224 | 226 | foreach ($predicates as $predicate) { |
225 | - if (! $predicate($value)) |
|
226 | - return false; |
|
227 | + if (! $predicate($value)) { |
|
228 | + return false; |
|
229 | + } |
|
227 | 230 | } |
228 | 231 | return true; |
229 | 232 | }); |
@@ -256,8 +259,9 @@ discard block |
||
256 | 259 | $predicates = func_get_args(); |
257 | 260 | return _curry_one(function($value) use(&$predicates) { |
258 | 261 | foreach ($predicates as $predicate) { |
259 | - if ($predicate($value)) |
|
260 | - return true; |
|
262 | + if ($predicate($value)) { |
|
263 | + return true; |
|
264 | + } |
|
261 | 265 | } |
262 | 266 | return false; |
263 | 267 | }); |
@@ -320,8 +324,12 @@ discard block |
||
320 | 324 | static $comparator = false; |
321 | 325 | $comparator = $comparator ?: curry(function($fn) { |
322 | 326 | return function($a, $b) use($fn) { |
323 | - if ($fn($a, $b)) return -1; |
|
324 | - if ($fn($b, $a)) return 1; |
|
327 | + if ($fn($a, $b)) { |
|
328 | + return -1; |
|
329 | + } |
|
330 | + if ($fn($b, $a)) { |
|
331 | + return 1; |
|
332 | + } |
|
325 | 333 | return 0; |
326 | 334 | }; |
327 | 335 | }); |