@@ -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
0 commit comments