Skip to content

Commit f1f6610

Browse files
committed
Non-issue : Added variadic and spread operators of PHP5.6
1 parent 578f779 commit f1f6610

File tree

8 files changed

+22
-22
lines changed

8 files changed

+22
-22
lines changed

src/Channel/src/Router/RuleMatch/RuleNegate.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public function __destruct()
3434
*/
3535
public function __invoke($name, ProtocolInterface $protocol)
3636
{
37-
return !call_user_func_array($this->rule, [ $name, $protocol ]);
37+
$call = $this->rule;
38+
return !$call($name, $protocol);
3839
}
3940
}

src/Config/src/Config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ protected function overwrite($current, $new, $handler = null)
143143
$handler = $this->overwriteHandler;
144144
}
145145

146-
return call_user_func_array($handler, [ $current, $new ]);
146+
return $handler($current, $new);
147147
}
148148

149149
/**

src/Event/src/AsyncEventEmitterTrait.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ protected function attachOnListener($pointer, $event, callable $listener)
1717
return function() use($listener) {
1818
$args = func_get_args();
1919
$this->getLoop()->onTick(function() use($listener, $args) {
20-
call_user_func_array($listener, $args);
20+
$listener(...$args);
2121
});
2222
};
2323
}
@@ -32,7 +32,7 @@ protected function attachOnceListener($pointer, $event, callable $listener)
3232

3333
$args = func_get_args();
3434
$this->getLoop()->onTick(function() use($listener, $args) {
35-
call_user_func_array($listener, $args);
35+
$listener(...$args);
3636
});
3737
};
3838
}
@@ -52,7 +52,7 @@ protected function attachTimesListener($pointer, $event, $limit, callable $liste
5252

5353
$args = func_get_args();
5454
$this->getLoop()->onTick(function() use($listener, $args) {
55-
call_user_func_array($listener, $args);
55+
$listener(...$args);
5656
});
5757
};
5858
}

src/Event/src/BaseEventEmitterTrait.php

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,10 @@ public function times($event, $limit, callable $listener)
131131
public function delay($event, $ticks, callable $listener)
132132
{
133133
$counter = 0;
134-
return $this->on($event, function() use(&$counter, $event, $ticks, $listener) {
134+
return $this->on($event, function(...$args) use(&$counter, $event, $ticks, $listener) {
135135
if (++$counter >= $ticks)
136136
{
137-
call_user_func_array($listener, func_get_args());
137+
$listener(...$args);
138138
}
139139
});
140140
}
@@ -145,10 +145,10 @@ public function delay($event, $ticks, callable $listener)
145145
public function delayOnce($event, $ticks, callable $listener)
146146
{
147147
$counter = 0;
148-
return $this->times($event, $ticks, function() use(&$counter, $event, $ticks, $listener) {
148+
return $this->times($event, $ticks, function(...$args) use(&$counter, $event, $ticks, $listener) {
149149
if (++$counter >= $ticks)
150150
{
151-
call_user_func_array($listener, func_get_args());
151+
$listener(...$args);
152152
}
153153
});
154154
}
@@ -159,10 +159,10 @@ public function delayOnce($event, $ticks, callable $listener)
159159
public function delayTimes($event, $ticks, $limit, callable $listener)
160160
{
161161
$counter = 0;
162-
return $this->times($event, $ticks+$limit-1, function() use(&$counter, $event, $ticks, $listener) {
162+
return $this->times($event, $ticks+$limit-1, function(...$args) use(&$counter, $event, $ticks, $listener) {
163163
if (++$counter >= $ticks)
164164
{
165-
call_user_func_array($listener, func_get_args());
165+
$listener(...$args);
166166
}
167167
});
168168
}
@@ -316,10 +316,10 @@ protected function attachOnListener($pointer, $event, callable $listener)
316316
protected function attachOnceListener($pointer, $event, callable $listener)
317317
{
318318
$emitter = $this;
319-
return function() use($emitter, $listener, $event, $pointer) {
319+
return function(...$args) use($emitter, $listener, $event, $pointer) {
320320
unset($emitter->eventListeners[$event][$pointer]);
321321

322-
return call_user_func_array($listener, func_get_args());
322+
return $listener(...$args);
323323
};
324324
}
325325

@@ -333,14 +333,13 @@ protected function attachOnceListener($pointer, $event, callable $listener)
333333
protected function attachTimesListener($pointer, $event, $limit, callable $listener)
334334
{
335335
$emitter = $this;
336-
return function() use($emitter, $listener, $event, $pointer, &$limit) {
336+
return function(...$args) use($emitter, $listener, $event, $pointer, &$limit) {
337337
if (--$limit === 0)
338338
{
339339
unset($limit);
340340
unset($emitter->eventListeners[$event][$pointer]);
341341
}
342-
343-
return call_user_func_array($listener, func_get_args());
342+
return $listener(...$args);
344343
};
345344
}
346345

src/Promise/src/Promise.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,13 +136,13 @@ public function spread(callable $onFulfilled = null, callable $onRejected = null
136136
{
137137
return $this->then(
138138
function($values) use($onFulfilled) {
139-
return call_user_func_array($onFulfilled, (array) $values);
139+
return $onFulfilled(...((array) $values));
140140
},
141141
function($rejections) use($onRejected) {
142-
return call_user_func_array($onRejected, (array) $rejections);
142+
return $onRejected(...((array) $rejections));
143143
},
144144
function($reasons) use($onCancel) {
145-
return call_user_func_array($onCancel, (array) $reasons);
145+
return $onCancel(...((array) $reasons));
146146
}
147147
);
148148
}

src/Promise/src/PromiseCancelled.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public function spread(callable $onFulfilled = null, callable $onRejected = null
103103
null,
104104
null,
105105
function($reasons) use($onCancel) {
106-
return call_user_func_array($onCancel, (array) $reasons);
106+
return $onCancel(...((array) $reasons));
107107
}
108108
);
109109
}

src/Promise/src/PromiseFulfilled.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public function spread(callable $onFulfilled = null, callable $onRejected = null
8989
{
9090
return $this->then(
9191
function($values) use($onFulfilled) {
92-
return call_user_func_array($onFulfilled, (array) $values);
92+
return $onFulfilled(...((array) $values));
9393
}
9494
);
9595
}

src/Promise/src/PromiseRejected.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public function spread(callable $onFulfilled = null, callable $onRejected = null
9797
return $this->then(
9898
null,
9999
function($rejections) use($onRejected) {
100-
return call_user_func_array($onRejected, (array) $rejections);
100+
return $onRejected(...((array) $rejections));
101101
}
102102
);
103103
}

0 commit comments

Comments
 (0)