2 files changed, 7 insertions, 3 deletions
diff --git a/phpBB/includes/event/data.php b/phpBB/includes/event/data.php
index 754876c119..62e2f2312e 100644
--- a/phpBB/includes/event/data.php
+++ b/phpBB/includes/event/data.php
@@ -15,7 +15,9 @@ if (!defined('IN_PHPBB'))
     exit;
 }
 
-class phpbb_event_data extends phpbb_event implements ArrayAccess
+use Symfony\Component\EventDispatcher\Event;
+
+class phpbb_event_data extends Event implements ArrayAccess
 {
     private $data;
 
diff --git a/phpBB/includes/event/extension_subscriber_loader.php b/phpBB/includes/event/extension_subscriber_loader.php
index 2a53af1249..aa32ca9686 100644
--- a/phpBB/includes/event/extension_subscriber_loader.php
+++ b/phpBB/includes/event/extension_subscriber_loader.php
@@ -15,12 +15,14 @@ if (!defined('IN_PHPBB'))
 	exit;
 }
 
+use Symfony\Component\EventDispatcher\EventDispatcher;
+
 class phpbb_event_extension_subscriber_loader
 {
 	private $dispatcher;
 	private $extension_manager;
 
-	public function __construct(phpbb_event_dispatcher $dispatcher, phpbb_extension_manager $extension_manager)
+	public function __construct(EventDispatcher $dispatcher, phpbb_extension_manager $extension_manager)
 	{
 		$this->dispatcher = $dispatcher;
 		$this->extension_manager = $extension_manager;
@@ -37,7 +39,7 @@ class phpbb_event_extension_subscriber_loader
 
 		foreach ($subscriber_classes as $class) {
 			$subscriber = new $class();
-			$this->dispatcher->add_subscriber($subscriber);
+			$this->dispatcher->addSubscriber($subscriber);
 		}
 	}
 }