Update tests

Author: iMattPro

tests/controller/page_main_controller_test.php

@@ -12,19 +12,19 @@
 
 class page_main_controller_test extends \phpbb_database_test_case
 {
-	/** @var \PHPUnit_Framework_MockObject_MockObject|\phpbb\auth\auth */
+	/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\auth\auth */
 	protected $auth;
 
-	/** @var \PHPUnit_Framework_MockObject_MockObject|\Symfony\Component\DependencyInjection\ContainerInterface */
+	/** @var \PHPUnit\Framework\MockObject\MockObject|\Symfony\Component\DependencyInjection\ContainerInterface */
 	protected $container;
 
-	/** @var \PHPUnit_Framework_MockObject_MockObject|\phpbb\controller\helper */
+	/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\controller\helper */
 	protected $controller_helper;
 
 	/** @var \phpbb\language\language */
 	protected $lang;
 
-	/** @var \PHPUnit_Framework_MockObject_MockObject|\phpbb\template\template */
+	/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\template\template */
 	protected $template;
 
 	/** @var \phpbb\user */

tests/event/event_listener_base.php

@@ -12,19 +12,19 @@
 
 class event_listener_base extends \phpbb_test_case
 {
-	/** @var \PHPUnit_Framework_MockObject_MockObject|\phpbb\auth\auth */
+	/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\auth\auth */
 	protected $auth;
 
-	/** @var \PHPUnit_Framework_MockObject_MockObject|\phpbb\controller\helper */
+	/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\controller\helper */
 	protected $controller_helper;
 
 	/** @var \phpbb\language\language */
 	protected $lang;
 
-	/** @var \PHPUnit_Framework_MockObject_MockObject|\phpbb\pages\operators\page */
+	/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\pages\operators\page */
 	protected $page_operator;
 
-	/** @var \PHPUnit_Framework_MockObject_MockObject|\phpbb\template\template */
+	/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\template\template */
 	protected $template;
 
 	/** @var \phpbb\user */

tests/event/event_listener_viewonline_test.php

@@ -119,19 +119,12 @@ public function test_viewonline_page($on_page, $row, $location_url, $location, $
 
 		$listener = $this->get_listener();
 
-		$dispatcher = new \Symfony\Component\EventDispatcher\EventDispatcher();
+		$dispatcher = new \phpbb\event\dispatcher();
 		$dispatcher->addListener('core.viewonline_overwrite_location', array($listener, 'viewonline_page'));
 
 		$event_data = array('on_page', 'row', 'location_url', 'location');
-		$event = new \phpbb\event\data(compact($event_data));
-		$dispatcher->dispatch('core.viewonline_overwrite_location', $event);
-
-		$event_data_after = $event->get_data_filtered($event_data);
-		foreach ($event_data as $expected)
-		{
-			self::assertArrayHasKey($expected, $event_data_after);
-		}
-		extract($event_data_after);
+		$event_data_after = $dispatcher->trigger_event('core.viewonline_overwrite_location', compact($event_data));
+		extract($event_data_after, EXTR_OVERWRITE);
 
 		self::assertEquals($expected_location_url, $location_url);
 		self::assertEquals($expected_location, $location);

tests/event/show_page_links_test.php

@@ -106,8 +106,8 @@ public function test_show_page_links()
 				array('S_OVERALL_HEADER_NAVIGATION_APPEND', true)
 			);
 
-		$dispatcher = new \Symfony\Component\EventDispatcher\EventDispatcher();
+		$dispatcher = new \phpbb\event\dispatcher();
 		$dispatcher->addListener('core.page_header', array($listener, 'show_page_links'));
-		$dispatcher->dispatch('core.page_header');
+		$dispatcher->trigger_event('core.page_header');
 	}
 }

tests/operators/page_operator_base.php

@@ -31,7 +31,7 @@ protected static function setup_extensions()
 	/** @var \phpbb\config\config */
 	protected $config;
 
-	/** @var \PHPUnit_Framework_MockObject_MockObject|\Symfony\Component\DependencyInjection\ContainerInterface */
+	/** @var \PHPUnit\Framework\MockObject\MockObject|\Symfony\Component\DependencyInjection\ContainerInterface */
 	protected $container;
 
 	/** @var \phpbb\db\driver\driver_interface */
@@ -46,7 +46,7 @@ protected static function setup_extensions()
 	/** @var \phpbb\textformatter\s9e\utils */
 	protected $text_formatter_utils;
 
-	/** @var \PHPUnit_Framework_MockObject_MockObject|\phpbb\user */
+	/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\user */
 	protected $user;
 
 	public function getDataSet()