Update code and tests

Author: iMattPro

migrations/v10x/m1_initial_data.php

@@ -22,7 +22,7 @@ class m1_initial_data extends \phpbb\db\migration\migration
 	* @static
 	* @access public
 	*/
-	static public function depends_on()
+	public static function depends_on()
 	{
 		return array('\phpbb\db\migration\data\v310\gold');
 	}

migrations/v10x/m2_anonymize_ip.php

@@ -18,7 +18,7 @@ class m2_anonymize_ip extends \phpbb\db\migration\migration
 	/**
 	 * {@inheritdoc}
 	 */
-	static public function depends_on()
+	public static function depends_on()
 	{
 		return array('\phpbb\googleanalytics\migrations\v10x\m1_initial_data');
 	}

tests/event/listener_test.php

@@ -20,7 +20,7 @@ class listener_test extends \phpbb_test_case
 	/** @var \phpbb\config\config */
 	protected $config;
 
-	/** @var \PHPUnit_Framework_MockObject_MockObject|\phpbb\template\template */
+	/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\template\template */
 	protected $template;
 
 	/** @var \phpbb\user */
@@ -98,9 +98,9 @@ public function test_load_google_analytics()
 				'S_ANONYMIZE_IP'			=> $this->config['ga_anonymize_ip'],
 			));
 
-		$dispatcher = new \Symfony\Component\EventDispatcher\EventDispatcher();
+		$dispatcher = new \phpbb\event\dispatcher();
 		$dispatcher->addListener('core.page_header', array($this->listener, 'load_google_analytics'));
-		$dispatcher->dispatch('core.page_header');
+		$dispatcher->trigger_event('core.page_header');
 	}
 
 	/**
@@ -143,19 +143,12 @@ public function test_add_googleanalytics_configs($mode, $display_vars, $expected
 	{
 		$this->set_listener();
 
-		$dispatcher = new \Symfony\Component\EventDispatcher\EventDispatcher();
+		$dispatcher = new \phpbb\event\dispatcher();
 		$dispatcher->addListener('core.acp_board_config_edit_add', array($this->listener, 'add_googleanalytics_configs'));
 
 		$event_data = array('display_vars', 'mode');
-		$event = new \phpbb\event\data(compact($event_data));
-		$dispatcher->dispatch('core.acp_board_config_edit_add', $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.acp_board_config_edit_add', compact($event_data));
+		extract($event_data_after, EXTR_OVERWRITE);
 
 		$keys = array_keys($display_vars['vars']);
 
@@ -236,19 +229,17 @@ public function test_validate_googleanalytics_id($cfg_array, $expected_error)
 		$config_definition = array('validate' => 'googleanalytics_id');
 		$error = array();
 
-		$dispatcher = new \Symfony\Component\EventDispatcher\EventDispatcher();
+		$dispatcher = new \phpbb\event\dispatcher();
 		$dispatcher->addListener('core.validate_config_variable', array($this->listener, 'validate_googleanalytics_id'));
 
 		$event_data = array('cfg_array', 'config_name', 'config_definition', 'error');
-		$event = new \phpbb\event\data(compact($event_data));
-		$dispatcher->dispatch('core.validate_config_variable', $event);
+		$event_data_after = $dispatcher->trigger_event('core.validate_config_variable', compact($event_data));
 
-		$event_data_after = $event->get_data_filtered($event_data);
 		foreach ($event_data as $expected)
 		{
 			self::assertArrayHasKey($expected, $event_data_after);
 		}
-		extract($event_data_after);
+		extract($event_data_after, EXTR_OVERWRITE);
 
 		self::assertEquals($expected_error, $error);
 	}