diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-03-24 15:45:18 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-03-24 15:45:18 +0100 |
| commit | 400277c03624788e6a31f9aa4a15b883478f58cc (patch) | |
| tree | ab0959cb6ef734104eb85dcb74da6569559aa3ab /phpBB/includes | |
| parent | 935a4abb7ec6ab247ee5fa90bd4d4bfe0e2f9f01 (diff) | |
| download | forums-400277c03624788e6a31f9aa4a15b883478f58cc.tar forums-400277c03624788e6a31f9aa4a15b883478f58cc.tar.gz forums-400277c03624788e6a31f9aa4a15b883478f58cc.tar.bz2 forums-400277c03624788e6a31f9aa4a15b883478f58cc.tar.xz forums-400277c03624788e6a31f9aa4a15b883478f58cc.zip | |
[feature/event-dispatcher] Change phpbb_event_dispatcher to inheritance, tests
PHPBB3-9550
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/event/dispatcher.php | 42 | ||||
| -rw-r--r-- | phpBB/includes/event/dispatcher_wrapper.php | 88 |
2 files changed, 42 insertions, 88 deletions
diff --git a/phpBB/includes/event/dispatcher.php b/phpBB/includes/event/dispatcher.php new file mode 100644 index 0000000000..2bf46b9b06 --- /dev/null +++ b/phpBB/includes/event/dispatcher.php @@ -0,0 +1,42 @@ +<?php +/** +* +* @package phpBB3 +* @copyright (c) 2012 phpBB Group +* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 +* +*/ + +/** +* @ignore +*/ +if (!defined('IN_PHPBB')) +{ + exit; +} + +use Symfony\Component\EventDispatcher\EventDispatcher; + +/** +* Extension of the Symfony2 EventDispatcher +* +* It provides an additional `trigger_event` method, which +* gives some syntactic sugar for dispatching events. Instead +* of creating the event object, the method will do that for +* you. +* +* Example: +* +* $vars = array('page_title'); +* extract($phpbb_dispatcher->trigger_event('core.index', compact($vars))); +* +*/ +class phpbb_event_dispatcher extends EventDispatcher +{ + public function trigger_event($eventName, $data = array()) + { + $event = new phpbb_event_data($data); + $this->dispatch($eventName, $event); + return $event->get_data_filtered(array_keys($data)); + } +} diff --git a/phpBB/includes/event/dispatcher_wrapper.php b/phpBB/includes/event/dispatcher_wrapper.php deleted file mode 100644 index 5f5d653c3c..0000000000 --- a/phpBB/includes/event/dispatcher_wrapper.php +++ /dev/null @@ -1,88 +0,0 @@ -<?php -/** -* -* @package phpBB3 -* @copyright (c) 2012 phpBB Group -* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 -* -*/ - -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ - exit; -} - -use Symfony\Component\EventDispatcher\Event; -use Symfony\Component\EventDispatcher\EventSubscriberInterface; -use Symfony\Component\EventDispatcher\EventDispatcherInterface; - -/** -* Wrapper around a Symfony2 EventDispatcherInterface -* -* It provides an additional `trigger_event` method, which -* gives some syntactic sugar for dispatching events. Instead -* of creating the event object, the method will do that for -* you. -* -* Example: -* -* $vars = array('page_title'); -* extract($phpbb_dispatcher->trigger_event('core.index', compact($vars))); -* -* Apart from that it implements the EventDispatcherInterface -* and proxies all method calls to the member dispatcher. -*/ -class phpbb_event_dispatcher_wrapper implements EventDispatcherInterface -{ - private $dispatcher; - - public function __construct(EventDispatcherInterface $dispatcher) - { - $this->dispatcher = $dispatcher; - } - - public function dispatch($eventName, Event $event = null) - { - $this->dispatcher->dispatch($eventName, $event); - } - - public function addListener($eventName, $listener, $priority = 0) - { - $this->dispatcher->addListener($eventName, $listener, $priority); - } - - public function addSubscriber(EventSubscriberInterface $subscriber) - { - $this->dispatcher->addSubscriber($subscriber); - } - - public function removeListener($eventName, $listener) - { - $this->dispatcher->removeListener($eventName, $listener); - } - - public function removeSubscriber(EventSubscriberInterface $subscriber) - { - $this->dispatcher->removeSubscriber($subscriber); - } - - public function getListeners($eventName = null) - { - return $this->dispatcher->getListeners($eventName); - } - - public function hasListeners($eventName = null) - { - return $this->dispatcher->hasListeners($eventName); - } - - public function trigger_event($eventName, $data = array()) - { - $event = new phpbb_event_data($data); - $this->dispatch($eventName, $event); - return $event->get_data_filtered(array_keys($data)); - } -} |