Skip to content

Commit

Permalink
Trying something new
Browse files Browse the repository at this point in the history
  • Loading branch information
@bakura10
bakura10 committed Nov 12, 2013
1 parent 2b69af9 commit 68d6fbe
Show file tree
Hide file tree
Showing 4 changed files with 83 additions and 193 deletions.
165 changes: 44 additions & 121 deletions library/Zend/EventManager/EventManager.php
View file
Expand Up @@ -11,8 +11,6 @@

use ArrayObject;
use Traversable;
use Zend\Stdlib\CallbackHandler;
use Zend\Stdlib\PriorityQueue;

/**
* Event manager: notification system
Expand All @@ -25,7 +23,7 @@ class EventManager implements EventManagerInterface
/**
* Subscribed events and their listeners
*
* @var array|PriorityQueue[] Array of PriorityQueue objects
* @var array
*/
protected $events = array();

Expand Down Expand Up @@ -91,36 +89,16 @@ public function getSharedManager()
* You can specify "*" for the event name. In such cases, the listener will
* be triggered for every event.
*
* @param string|array|ListenerAggregateInterface $event An event or array of event names. If a ListenerAggregateInterface,
* proxies to {@link attachAggregate()}.
* @param callable $callback
* @param int $priority If provided, the priority at which to register the callable
* @return CallbackHandler|mixed CallbackHandler if attaching callable (to allow later unsubscribe); mixed if attaching aggregate
* @param string $event An event or array of event names
* @param callable $listener
* @param int $priority If provided, the priority at which to register the callable
* @return callable if attaching callable (to allow later unsubscribe)
* @throws Exception\InvalidArgumentException
*/
public function attach($event, callable $callback, $priority = 1)
public function attach($event, callable $listener, $priority = 1)
{
// Array of events should be registered individually, and return an array of all listeners
if (is_array($event)) {
$listeners = array();

foreach ($event as $name) {
$listeners[] = $this->attach($name, $callback, $priority);
}

return $listeners;
}

// If we don't have a priority queue for the event yet, create one
if (empty($this->events[$event])) {
$this->events[$event] = new PriorityQueue();
}

// Create a callback handler, setting the event and priority in its metadata
$listener = new CallbackHandler($callback, array('event' => $event, 'priority' => $priority));

// Inject the callback handler into the queue
$this->events[$event]->insert($listener, $priority);
$event = (string) $event;
$this->events[$event][spl_object_hash($listener)] = $priority;

return $listener;
}
Expand All @@ -133,7 +111,7 @@ public function attach($event, callable $callback, $priority = 1)
* methods.
*
* @param ListenerAggregateInterface $aggregate
* @param int $priority If provided, a suggested priority for the aggregate to use
* @param int $priority If provided, a suggested priority for the aggregate to use
* @return mixed return value of {@link ListenerAggregateInterface::attach()}
*/
public function attachAggregate(ListenerAggregateInterface $aggregate, $priority = 1)
Expand All @@ -144,24 +122,21 @@ public function attachAggregate(ListenerAggregateInterface $aggregate, $priority
/**
* Unsubscribe a listener from an event
*
* @param CallbackHandler $listener
* This method is quite inefficient as it needs to traverse each priority queue
*
* @param string $eventName
* @param callable $listener
* @return bool Returns true if event and listener found, and unsubscribed; returns false if either event or listener not found
*/
public function detach(CallbackHandler $listener)
public function detach($eventName, callable $listener)
{
$event = $listener->getMetadatum('event');
if (!$event || empty($this->events[$event])) {
return false;
}
$hash = spl_object_hash($listener);

$return = $this->events[$event]->remove($listener);
if (!$return) {
if (!isset($this->events[$eventName]) && !isset($this->events[$eventName][$hash])) {
return false;
}

if (!count($this->events[$event])) {
unset($this->events[$event]);
}
unset($this->events[$eventName][$hash]);

return true;
}
Expand Down Expand Up @@ -226,21 +201,17 @@ public function getEvents()
/**
* {@inheritDoc}
*/
public function getListeners($event)
public function getListeners($eventName)
{
if (!isset($this->events[$event])) {
return new PriorityQueue();
}

return $this->events[$event];
return isset($this->events[$eventName]) ? $this->events[$eventName] : array();
}

/**
* {@inheritDoc}
*/
public function clearListeners($event)
public function clearListeners($eventName)
{
unset($this->events[$event]);
unset($this->events[$eventName]);
}

/**
Expand Down Expand Up @@ -296,53 +267,32 @@ public function prepareArgs(array $args)
* Actual functionality for triggering listeners, to which both trigger() and triggerUntil()
* delegate.
*
* @param string $event Event name
* @param EventInterface $e
* @param string $eventName Event name
* @param EventInterface $event
* @param callable|null $callback
* @return ResponseCollection
*/
protected function triggerListeners($event, EventInterface $e, callable $callback = null)
protected function triggerListeners($eventName, EventInterface $event, callable $callback = null)
{
$responses = new ResponseCollection;
$listeners = $this->getListeners($event);

// Add shared/wildcard listeners to the list of listeners,
// but don't modify the listeners object
$sharedListeners = $this->getSharedListeners($event);
$sharedWildcardListeners = $this->getSharedListeners('*');
$wildcardListeners = $this->getListeners('*');

if (count($sharedListeners) || count($sharedWildcardListeners) || count($wildcardListeners)) {
$listeners = clone $listeners;

// Shared listeners on this specific event
$this->insertListeners($listeners, $sharedListeners);
$responses = new ResponseCollection();
$listeners = $this->getListeners($eventName)
+ $this->getListeners('*')
+ $this->getSharedListeners($eventName)
+ $this->getSharedListeners('*');

// Shared wildcard listeners
$this->insertListeners($listeners, $sharedWildcardListeners);
asort($listeners);

// Add wildcard listeners
$this->insertListeners($listeners, $wildcardListeners);
}

foreach ($listeners as $listener) {
$listenerCallback = $listener->getCallback();

// Trigger the listener's callback, and push its result onto the
// response collection
$responses->push($listenerCallback($e));
foreach ($listeners as $listener => $priority) {
$responses->push($listener($event));

// If the event was asked to stop propagating, do so
if ($e->isPropagationStopped()) {
if ($event->isPropagationStopped()) {
$responses->setStopped(true);
break;
return $responses;
}

// If the result causes our validation callback to return true,
// stop propagation
if ($callback && $callback($responses->last())) {
$responses->setStopped(true);
break;
return $responses;
}
}

Expand All @@ -353,54 +303,27 @@ protected function triggerListeners($event, EventInterface $e, callable $callbac
* Get list of all listeners attached to the shared event manager for
* identifiers registered by this instance
*
* @param string $event
* @return PriorityQueue
* @param string $eventName
* @return array
*/
protected function getSharedListeners($event)
protected function getSharedListeners($eventName)
{
if (!$sharedManager = $this->getSharedManager()) {
return new PriorityQueue();
if (null === $this->sharedManager) {
return array();
}

$identifiers = $this->getIdentifiers();
$listeners = array();

// Add wildcard id to the search, if not already added
if (!in_array('*', $identifiers)) {
$identifiers[] = '*';
}

$sharedListeners = new PriorityQueue();

foreach ($identifiers as $id) {
if (!$listeners = $sharedManager->getListeners($id, $event)) {
continue;
}

$listeners = $listeners->toArray(PriorityQueue::EXTR_BOTH);

foreach ($listeners as $listener) {
$sharedListeners->insert($listener['data'], $listener['priority']);
}
foreach ($identifiers as $identifier) {
$listeners = $listeners + $this->sharedManager->getListeners($identifier, $eventName);
}

return $sharedListeners;
}

/**
* Add listeners to the master queue of listeners
*
* Used to inject shared listeners and wildcard listeners.
*
* @param PriorityQueue $masterListeners
* @param PriorityQueue $listeners
* @return void
*/
protected function insertListeners(PriorityQueue $masterListeners, PriorityQueue $listeners)
{
$listeners = $listeners->toArray(PriorityQueue::EXTR_BOTH);

foreach ($listeners as $listener) {
$masterListeners->insert($listener['data'], $listener['priority']);
}
return $listeners;
}
}
22 changes: 11 additions & 11 deletions library/Zend/EventManager/EventManagerInterface.php
View file
Expand Up @@ -10,7 +10,6 @@
namespace Zend\EventManager;

use Traversable;
use Zend\Stdlib\CallbackHandler;

/**
* Interface for messengers
Expand All @@ -21,11 +20,11 @@ interface EventManagerInterface extends SharedEventManagerAwareInterface
* Attach a listener to an event
*
* @param string $event
* @param callable $callback
* @param callable $listener
* @param int $priority Priority at which to register listener
* @return CallbackHandler
* @return callable
*/
public function attach($event, callable $callback, $priority = 1);
public function attach($event, callable $listener, $priority = 1);

/**
* Attach a listener aggregate
Expand All @@ -39,10 +38,11 @@ public function attachAggregate(ListenerAggregateInterface $aggregate, $priority
/**
* Detach an event listener
*
* @param CallbackHandler $listener
* @param string $eventName
* @param callable $listener
* @return bool
*/
public function detach(CallbackHandler $listener);
public function detach($eventName, callable $listener);

/**
* Detach a listener aggregate
Expand Down Expand Up @@ -81,18 +81,18 @@ public function getEvents();
/**
* Retrieve a list of listeners registered to a given event
*
* @param string $event
* @return \Zend\Stdlib\PriorityQueue
* @param string $eventName
* @return array
*/
public function getListeners($event);
public function getListeners($eventName);

/**
* Clear all listeners for a given event
*
* @param string $event
* @param string $eventName
* @return void
*/
public function clearListeners($event);
public function clearListeners($eventName);

/**
* Set the identifiers (overrides any currently set identifiers)
Expand Down

0 comments on commit 68d6fbe

Please sign in to comment.