From 4334b446b5e4dd3459c270bb8ef0830cbc3024cc Mon Sep 17 00:00:00 2001 From: mrgoldy Date: Thu, 27 Feb 2020 16:03:24 +0100 Subject: [PATCH 1/2] [ticket/16379] Update deprecated event dispatcher class PHPBB3-16379 --- phpBB/phpbb/event/dispatcher.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/phpbb/event/dispatcher.php b/phpBB/phpbb/event/dispatcher.php index 1ba2ab8987..5e57ff9fe2 100644 --- a/phpBB/phpbb/event/dispatcher.php +++ b/phpBB/phpbb/event/dispatcher.php @@ -13,11 +13,11 @@ namespace phpbb\event; -use Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher; +use Symfony\Component\EventDispatcher\EventDispatcher; use Symfony\Component\EventDispatcher\Event; /** -* Extension of the Symfony2 EventDispatcher +* Extension of the Symfony3.3 EventDispatcher * * It provides an additional `trigger_event` method, which * gives some syntactic sugar for dispatching events. Instead @@ -30,7 +30,7 @@ use Symfony\Component\EventDispatcher\Event; * extract($phpbb_dispatcher->trigger_event('core.index', compact($vars))); * */ -class dispatcher extends ContainerAwareEventDispatcher implements dispatcher_interface +class dispatcher extends EventDispatcher implements dispatcher_interface { /** * @var bool @@ -40,7 +40,7 @@ class dispatcher extends ContainerAwareEventDispatcher implements dispatcher_int /** * {@inheritdoc} */ - public function trigger_event($eventName, $data = array()) + public function trigger_event($eventName, $data = []) { $event = new \phpbb\event\data($data); $this->dispatch($eventName, $event); From 1946d81ab3061293e0b71658653ba661129aeee6 Mon Sep 17 00:00:00 2001 From: mrgoldy Date: Fri, 28 Feb 2020 12:42:41 +0100 Subject: [PATCH 2/2] [ticket/16379] Remove Symfony version from docblock PHPBB3-16379 --- phpBB/phpbb/event/dispatcher.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/event/dispatcher.php b/phpBB/phpbb/event/dispatcher.php index 5e57ff9fe2..516a94cb3f 100644 --- a/phpBB/phpbb/event/dispatcher.php +++ b/phpBB/phpbb/event/dispatcher.php @@ -17,7 +17,7 @@ use Symfony\Component\EventDispatcher\EventDispatcher; use Symfony\Component\EventDispatcher\Event; /** -* Extension of the Symfony3.3 EventDispatcher +* Extension of the Symfony EventDispatcher * * It provides an additional `trigger_event` method, which * gives some syntactic sugar for dispatching events. Instead