@@ -48,7 +48,7 @@ |
||
48 | 48 | |
49 | 49 | public function __construct(/* \Iterator $iterable1, \Iterator $iterable2, ... */) |
50 | 50 | { |
51 | - parent::__construct(\MultipleIterator::MIT_NEED_ALL| \MultipleIterator::MIT_KEYS_NUMERIC); |
|
51 | + parent::__construct(\MultipleIterator::MIT_NEED_ALL|\MultipleIterator::MIT_KEYS_NUMERIC); |
|
52 | 52 | foreach (func_get_args() as $iterable) { |
53 | 53 | if (!$iterable instanceof \Iterator) { |
54 | 54 | throw new \InvalidArgumentException(sprintf('Not all arguments are iterators')); |
@@ -61,11 +61,11 @@ discard block |
||
61 | 61 | |
62 | 62 | public function __construct(\Closure $valueFunc /* [\Closure $keyFunc], \Iterator $iterable1, [\Iterator $iterable2, [...]] */) |
63 | 63 | { |
64 | - parent::__construct(\MultipleIterator::MIT_NEED_ALL| \MultipleIterator::MIT_KEYS_NUMERIC); |
|
64 | + parent::__construct(\MultipleIterator::MIT_NEED_ALL|\MultipleIterator::MIT_KEYS_NUMERIC); |
|
65 | 65 | $args = func_get_args(); |
66 | 66 | $argsContainsKeyFunc = $args[1] instanceof \Closure; |
67 | 67 | $this->valueFunc = $args[0]; |
68 | - $this->keyFunc = $argsContainsKeyFunc ? $args[1] : function () { return $this->genericKeysToKey(func_get_args()); }; |
|
68 | + $this->keyFunc = $argsContainsKeyFunc ? $args[1] : function() { return $this->genericKeysToKey(func_get_args()); }; |
|
69 | 69 | foreach (array_slice($args, $argsContainsKeyFunc ? 2 : 1) as $iterable) { |
70 | 70 | if (!$iterable instanceof \Iterator) { |
71 | 71 | throw new \InvalidArgumentException(sprintf('Not all arguments are iterators')); |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | foreach ($keys as $key) { |
87 | 87 | if ($key !== $value) { |
88 | 88 | // the keys are different, we will make a new string identifying this entry |
89 | - return join(':', array_map(function ($key) { return (string)$key; }, $keys)); |
|
89 | + return join(':', array_map(function($key) { return (string)$key; }, $keys)); |
|
90 | 90 | } |
91 | 91 | } |
92 | 92 |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | // http://php.net/manual/en/functions.arguments.php#functions.variable-arg-list |
175 | 175 | |
176 | 176 | $iterables = array_map( |
177 | - function ($iterable) { |
|
177 | + function($iterable) { |
|
178 | 178 | return conversions\mixed_to_iterator($iterable); |
179 | 179 | }, |
180 | 180 | func_get_args() |
@@ -327,7 +327,7 @@ discard block |
||
327 | 327 | // http://php.net/manual/en/functions.arguments.php#functions.variable-arg-list |
328 | 328 | |
329 | 329 | $iterables = array_map( |
330 | - function ($iterable) { |
|
330 | + function($iterable) { |
|
331 | 331 | return conversions\mixed_to_iterator($iterable); |
332 | 332 | }, |
333 | 333 | array_slice(func_get_args(), 1) |
@@ -525,7 +525,7 @@ discard block |
||
525 | 525 | } |
526 | 526 | |
527 | 527 | $strategy = conversions\mixed_to_value_getter($strategy); |
528 | - $isValid = function ($value, $key) use ($strategy) { |
|
528 | + $isValid = function($value, $key) use ($strategy) { |
|
529 | 529 | $tempVarPhp54 = $strategy($value, $key); |
530 | 530 | return !empty($tempVarPhp54); |
531 | 531 | }; |
@@ -562,7 +562,7 @@ discard block |
||
562 | 562 | switch (sizeof($args)) { |
563 | 563 | case 2: |
564 | 564 | $strategy = conversions\mixed_to_value_getter($args[0]); |
565 | - $closure = function ($value, $key) use ($strategy) { |
|
565 | + $closure = function($value, $key) use ($strategy) { |
|
566 | 566 | $tempVarPhp54 = call_user_func($strategy, $value, $key); |
567 | 567 | return !empty($tempVarPhp54); |
568 | 568 | }; |
@@ -572,7 +572,7 @@ discard block |
||
572 | 572 | case 3: |
573 | 573 | $strategy = conversions\mixed_to_value_getter($args[0]); |
574 | 574 | $userClosure = $args[1]; |
575 | - $closure = function ($value, $key) use ($strategy, $userClosure) { |
|
575 | + $closure = function($value, $key) use ($strategy, $userClosure) { |
|
576 | 576 | return call_user_func($userClosure, call_user_func($strategy, $value, $key)); |
577 | 577 | }; |
578 | 578 | $iterable = conversions\mixed_to_iterator($args[2]); |
@@ -607,7 +607,7 @@ discard block |
||
607 | 607 | // http://php.net/manual/en/functions.arguments.php#functions.variable-arg-list |
608 | 608 | |
609 | 609 | $iterables = array_map( |
610 | - function ($iterable) { |
|
610 | + function($iterable) { |
|
611 | 611 | return conversions\mixed_to_iterator($iterable); |
612 | 612 | }, |
613 | 613 | func_get_args() |
@@ -193,8 +193,8 @@ discard block |
||
193 | 193 | * > count(2.5, 0.5) |
194 | 194 | * 2.5 3.0 3.5 4.0 ... |
195 | 195 | * |
196 | - * @param int|float $start |
|
197 | - * @param int|float $step |
|
196 | + * @param integer $start |
|
197 | + * @param integer $step |
|
198 | 198 | * @return CountIterator |
199 | 199 | */ |
200 | 200 | function count($start = 0, $step = 1) |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | * > cycle('ABCD') |
219 | 219 | * A B C D A B C D A B C D ... |
220 | 220 | * |
221 | - * @param array|string|\Iterator $iterable |
|
221 | + * @param lib\Traits\CycleTrait $iterable |
|
222 | 222 | * @return CycleIterator |
223 | 223 | */ |
224 | 224 | function cycle($iterable) |
@@ -441,7 +441,7 @@ discard block |
||
441 | 441 | * the same key function |
442 | 442 | * |
443 | 443 | * @param null|string|\Closure $strategy |
444 | - * @param array|string|\Iterator $iterable |
|
444 | + * @param lib\Traits\GroupByTrait $iterable |
|
445 | 445 | * @param boolean $sort |
446 | 446 | * @return GroupbyIterator |
447 | 447 | * |
@@ -597,7 +597,7 @@ discard block |
||
597 | 597 | * > zip([1, 2, 3], ['a', 'b', 'c']) |
598 | 598 | * [1, 'a'] [2, 'b'] [3, 'c'] |
599 | 599 | * |
600 | - * @param array|string|\Iterator $iterable Additional $iterable parameters may follow |
|
600 | + * @param array|string|\Iterator $iterableA Additional $iterable parameters may follow |
|
601 | 601 | * @return ZipIterator |
602 | 602 | */ |
603 | 603 | function zip($iterableA) |
@@ -619,7 +619,7 @@ discard block |
||
619 | 619 | /** |
620 | 620 | * Returns an iterable with all the elements from $iterable reversed |
621 | 621 | * |
622 | - * @param array|string|\Iterator $iterable |
|
622 | + * @param lib\Traits\ReversedTrait $iterable |
|
623 | 623 | * @return ReversedIterator |
624 | 624 | */ |
625 | 625 | function reversed($iterable) |
@@ -802,7 +802,7 @@ discard block |
||
802 | 802 | * > slice(['a', 'b', 'c', 'd', 'e', 1, -1] |
803 | 803 | * 'b', 'c', 'd' |
804 | 804 | * |
805 | - * @param array|string|\Iterator $iterable |
|
805 | + * @param lib\Traits\SliceTrait $iterable |
|
806 | 806 | * @param integer $start |
807 | 807 | * @param null|integer $end |
808 | 808 | * @return SliceIterator |
@@ -827,7 +827,7 @@ discard block |
||
827 | 827 | * > first([]) |
828 | 828 | * null |
829 | 829 | * |
830 | - * @param array|string|\Iterator $iterable |
|
830 | + * @param lib\Traits\FirstTrait $iterable |
|
831 | 831 | * @param mixed $default |
832 | 832 | * @return mixed |
833 | 833 | */ |
@@ -849,7 +849,7 @@ discard block |
||
849 | 849 | * > last([]) |
850 | 850 | * null |
851 | 851 | * |
852 | - * @param array|string|\Iterator $iterable |
|
852 | + * @param lib\Traits\LastTrait $iterable |
|
853 | 853 | * @param mixed $default |
854 | 854 | * @return mixed |
855 | 855 | */ |
@@ -176,6 +176,7 @@ |
||
176 | 176 | |
177 | 177 | /** |
178 | 178 | * @deprecated please use the reduction functions directly, will be removed in version 3.0 |
179 | + * @param string $name |
|
179 | 180 | */ |
180 | 181 | function getReduction($name) |
181 | 182 | { |