Skip to content

Commit

Permalink
Revert "Always pass the subject as the second argument in event handl…
Browse files Browse the repository at this point in the history
…ers."

This reverts commit 9125c1a77ade38ea44229eff36ac877895834dfa.
  • Loading branch information
markstory committed Jul 18, 2013
1 parent f172348 commit 31a3b0c
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions lib/Cake/Event/EventManager.php
Expand Up @@ -262,18 +262,16 @@ protected function _callListener(callable $listener, Event $event) {
if ($length) {
$data = array_values($data);
}
$subject = $event->subject();
switch ($length) {
case 0:
return $listener($event, $subject());
return $listener($event);
case 1:
return $listener($event, $subject(), $data[0]);
return $listener($event, $data[0]);
case 2:
return $listener($event, $subject, $data[0], $data[1]);
return $listener($event, $data[0], $data[1]);
case 3:
return $listener($event, $subject, $data[0], $data[1], $data[2]);
return $listener($event, $data[0], $data[1], $data[2]);
default:
array_unshift($data, $subject);
array_unshift($data, $event);
return call_user_func_array($listener, $data);
}
Expand Down

0 comments on commit 31a3b0c

Please sign in to comment.