@@ -26,8 +26,6 @@ |
||
26 | 26 | * > iter\iterable('ABC', 'DEF')->chain() |
27 | 27 | * A B C D E F |
28 | 28 | * |
29 | - * @param array|string|\Iterator $iterable |
|
30 | - * @param array|string|\Iterator $iterable2 |
|
31 | 29 | * @return iter\lib\ChainIterator |
32 | 30 | */ |
33 | 31 | public function chain(/* $iterable, $iterable2, ... */) |
@@ -34,7 +34,6 @@ |
||
34 | 34 | * 2.5 3.5 4.5 |
35 | 35 | * |
36 | 36 | * @param null|string|\Closure $strategy |
37 | - * @param array|string|\Iterator $iterable2 |
|
38 | 37 | * @return iter\lib\MapIterator |
39 | 38 | */ |
40 | 39 | public function map($strategy /*, $iterable2, ... */) |
@@ -25,7 +25,6 @@ |
||
25 | 25 | * > iter\iterable([])->reduce('min', 1) |
26 | 26 | * 1 |
27 | 27 | * |
28 | - * @param array|string|\Iterator $iterable |
|
29 | 28 | * @param string|\Closure $closure |
30 | 29 | * @param mixed $initializer |
31 | 30 | * @return mixed |
@@ -22,7 +22,6 @@ |
||
22 | 22 | * > zip([1, 2, 3], ['a', 'b', 'c']) |
23 | 23 | * [1, 'a'] [2, 'b'] [3, 'c'] |
24 | 24 | * |
25 | - * @param array|string|\Iterator $iterable2 |
|
26 | 25 | * @return iter\lib\ZipIterator |
27 | 26 | */ |
28 | 27 | public function zip(/* $iterable2, ... */) |
@@ -160,7 +160,7 @@ |
||
160 | 160 | $array = iterator_to_array($this); |
161 | 161 | array_walk( |
162 | 162 | $array, |
163 | - function (&$value) { |
|
163 | + function(&$value) { |
|
164 | 164 | /** @var GroupedIterator $value */ |
165 | 165 | $value = $value->toArray(); |
166 | 166 | } |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | */ |
17 | 17 | public static function lstrip($chars = " \t\n\r\0\x0B") |
18 | 18 | { |
19 | - return function ($value) use ($chars) { |
|
19 | + return function($value) use ($chars) { |
|
20 | 20 | return ltrim($value, $chars); |
21 | 21 | }; |
22 | 22 | } |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | */ |
27 | 27 | public static function rstrip($chars = " \t\n\r\0\x0B") |
28 | 28 | { |
29 | - return function ($value) use ($chars) { |
|
29 | + return function($value) use ($chars) { |
|
30 | 30 | return rtrim($value, $chars); |
31 | 31 | }; |
32 | 32 | } |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | */ |
37 | 37 | public static function strip($chars = " \t\n\r\0\x0B") |
38 | 38 | { |
39 | - return function ($value) use ($chars) { |
|
39 | + return function($value) use ($chars) { |
|
40 | 40 | return trim($value, $chars); |
41 | 41 | }; |
42 | 42 | } |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | */ |
47 | 47 | public static function length() |
48 | 48 | { |
49 | - return function ($value) { |
|
49 | + return function($value) { |
|
50 | 50 | return sizeof($value); |
51 | 51 | }; |
52 | 52 | } |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | */ |
16 | 16 | function add() |
17 | 17 | { |
18 | - return function ($a, $b) { |
|
18 | + return function($a, $b) { |
|
19 | 19 | if (!is_numeric($a)) { |
20 | 20 | throw new \InvalidArgumentException('Argument $A must be numeric to perform addition'); |
21 | 21 | } |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | */ |
34 | 34 | function sub() |
35 | 35 | { |
36 | - return function ($a, $b) { |
|
36 | + return function($a, $b) { |
|
37 | 37 | if (!is_numeric($a)) { |
38 | 38 | throw new \InvalidArgumentException('Argument $A must be numeric to perform subtraction'); |
39 | 39 | } |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | */ |
52 | 52 | function mul() |
53 | 53 | { |
54 | - return function ($a, $b) { |
|
54 | + return function($a, $b) { |
|
55 | 55 | if (!is_numeric($a)) { |
56 | 56 | throw new \InvalidArgumentException('Argument $A must be numeric to perform multiplication'); |
57 | 57 | } |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | */ |
70 | 70 | function min() |
71 | 71 | { |
72 | - return function ($a, $b) { |
|
72 | + return function($a, $b) { |
|
73 | 73 | if (!is_numeric($a)) { |
74 | 74 | throw new \InvalidArgumentException('Argument $A must be numeric to determine minimum'); |
75 | 75 | } |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | */ |
88 | 88 | function max() |
89 | 89 | { |
90 | - return function ($a, $b) { |
|
90 | + return function($a, $b) { |
|
91 | 91 | if (!is_numeric($a)) { |
92 | 92 | throw new \InvalidArgumentException('Argument $A must be numeric to determine maximum'); |
93 | 93 | } |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | if (!is_string($glue)) { |
110 | 110 | throw new \InvalidArgumentException('Argument $GLUE must be a string to join'); |
111 | 111 | } |
112 | - return function ($a, $b) use ($glue) { |
|
112 | + return function($a, $b) use ($glue) { |
|
113 | 113 | if (!is_string($a)) { |
114 | 114 | throw new \InvalidArgumentException('Argument $A must be a string to join'); |
115 | 115 | } |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | */ |
132 | 132 | function chain() |
133 | 133 | { |
134 | - return function ($chainIterator, $b) { |
|
134 | + return function($chainIterator, $b) { |
|
135 | 135 | if (!($chainIterator instanceof ChainIterator)) { |
136 | 136 | throw new \InvalidArgumentException('Argument $A must be a ChainIterator. Did your call "reduce" with "new ChainIterator()" as the initial parameter?'); |
137 | 137 | } |
@@ -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 | { |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | */ |
17 | 17 | function lstrip($chars = " \t\n\r\0\x0B") |
18 | 18 | { |
19 | - return function ($value) use ($chars) { |
|
19 | + return function($value) use ($chars) { |
|
20 | 20 | return ltrim($value, $chars); |
21 | 21 | }; |
22 | 22 | } |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | */ |
30 | 30 | function rstrip($chars = " \t\n\r\0\x0B") |
31 | 31 | { |
32 | - return function ($value) use ($chars) { |
|
32 | + return function($value) use ($chars) { |
|
33 | 33 | return rtrim($value, $chars); |
34 | 34 | }; |
35 | 35 | } |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | */ |
43 | 43 | function strip($chars = " \t\n\r\0\x0B") |
44 | 44 | { |
45 | - return function ($value) use ($chars) { |
|
45 | + return function($value) use ($chars) { |
|
46 | 46 | return trim($value, $chars); |
47 | 47 | }; |
48 | 48 | } |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | */ |
55 | 55 | function length() |
56 | 56 | { |
57 | - return function ($value) { |
|
57 | + return function($value) { |
|
58 | 58 | if (is_null($value)) { |
59 | 59 | return 0; |
60 | 60 | } |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | */ |
75 | 75 | function key() |
76 | 76 | { |
77 | - return function ($value, $key) { |
|
77 | + return function($value, $key) { |
|
78 | 78 | return $key; |
79 | 79 | }; |
80 | 80 | } |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | */ |
87 | 87 | function lower() |
88 | 88 | { |
89 | - return function ($value) { |
|
89 | + return function($value) { |
|
90 | 90 | return strtolower($value); |
91 | 91 | }; |
92 | 92 | } |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | */ |
99 | 99 | function upper() |
100 | 100 | { |
101 | - return function ($value) { |
|
101 | + return function($value) { |
|
102 | 102 | return strtoupper($value); |
103 | 103 | }; |
104 | 104 | } |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | { |
135 | 135 | $strategies = array_map('\Zicht\Itertools\conversions\mixed_to_value_getter', $strategies); |
136 | 136 | |
137 | - return function ($value, $key) use ($strategies) { |
|
137 | + return function($value, $key) use ($strategies) { |
|
138 | 138 | $res = []; |
139 | 139 | foreach ($strategies as $strategyKey => $strategy) { |
140 | 140 | $res[$strategyKey] = $strategy($value, $key); |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | $max = getrandmax(); |
157 | 157 | } |
158 | 158 | |
159 | - return function () use ($min, $max) { |
|
159 | + return function() use ($min, $max) { |
|
160 | 160 | return rand($min, $max); |
161 | 161 | }; |
162 | 162 | } |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | function type($strategy = null) |
171 | 171 | { |
172 | 172 | $strategy = conversions\mixed_to_value_getter($strategy); |
173 | - return function ($value) use ($strategy) { |
|
173 | + return function($value) use ($strategy) { |
|
174 | 174 | $value = $strategy($value); |
175 | 175 | return is_object($value) ? get_class($value) : gettype($value); |
176 | 176 | }; |
@@ -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) |
@@ -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 | */ |