Merge pull request #59 from iMattPro/updates

iMattPro · web-flow · commit a876d6d6f2df · 2021-06-06T19:27:44.000-07:00
Some code fixes and test updates
diff --git a/event/listener.php b/event/listener.php
@@ -63,7 +63,7 @@ public function __construct(\phpbb\config\config $config, \phpbb\language\langua
 	 * @static
 	 * @access public
 	 */
-	static public function getSubscribedEvents()
+	public static function getSubscribedEvents()
 	{
 		return array(
 			'core.user_setup'						=> 'load_language_on_setup',
diff --git a/migrations/m1_initial.php b/migrations/m1_initial.php
@@ -12,7 +12,7 @@
 
 class m1_initial extends \phpbb\db\migration\migration
 {
-	static public function depends_on()
+	public static function depends_on()
 	{
 		return array('\phpbb\db\migration\data\v31x\v313');
 	}
diff --git a/migrations/m2_email_config.php b/migrations/m2_email_config.php
@@ -12,7 +12,7 @@
 
 class m2_email_config extends \phpbb\db\migration\migration
 {
-	static public function depends_on()
+	public static function depends_on()
 	{
 		return array('\phpbb\teamsecurity\migrations\m1_initial');
 	}
diff --git a/migrations/m3_email_changes.php b/migrations/m3_email_changes.php
@@ -12,7 +12,7 @@
 
 class m3_email_changes extends \phpbb\db\migration\migration
 {
-	static public function depends_on()
+	public static function depends_on()
 	{
 		return array('\phpbb\teamsecurity\migrations\m1_initial');
 	}
diff --git a/migrations/m4_serialize_to_json.php b/migrations/m4_serialize_to_json.php
@@ -12,7 +12,7 @@
 
 class m4_serialize_to_json extends \phpbb\db\migration\migration
 {
-	static public function depends_on()
+	public static function depends_on()
 	{
 		return array('\phpbb\teamsecurity\migrations\m1_initial');
 	}
@@ -33,7 +33,7 @@ public function update_data()
 	 */
 	public function serialize_to_json($cfg)
 	{
-		$data = unserialize(trim($this->config[$cfg]));
+		$data = unserialize(trim($this->config[$cfg]), ['allowed_classes' => false]);
 
 		return $data ? json_encode($data) : '';
 	}
diff --git a/tests/event/delete_log_security_test.php b/tests/event/delete_log_security_test.php
@@ -42,15 +42,13 @@ public function test_delete_logs_security($mode, $log_type, $expected_log_type)
 
 		$this->set_listener();
 
-		$dispatcher = new \Symfony\Component\EventDispatcher\EventDispatcher();
+		$dispatcher = new \phpbb\event\dispatcher();
 		$dispatcher->addListener('core.delete_log', array($this->listener, 'delete_logs_security'));
 
 		$event_data = array('mode', 'log_type');
-		$event = new \phpbb\event\data(compact($event_data));
-		$dispatcher->dispatch('core.delete_log', $event);
+		$event_data_after = $dispatcher->trigger_event('core.delete_log', compact($event_data));
+		extract($event_data_after, EXTR_OVERWRITE);
 
-		$new_events = $event->get_data_filtered($event_data);
-
-		self::assertSame($expected_log_type, $new_events['log_type']);
+		self::assertSame($expected_log_type, $log_type);
 	}
 }
diff --git a/tests/event/email_change_notification_test.php b/tests/event/email_change_notification_test.php
@@ -165,11 +165,10 @@ public function test_email_change_notification($listener, $enabled, $in_watch_gr
 			->method('send_message')
 			->with($expected);
 
-		$dispatcher = new \Symfony\Component\EventDispatcher\EventDispatcher();
+		$dispatcher = new \phpbb\event\dispatcher();
 		$dispatcher->addListener($listener, array($this->listener, 'email_change_notification'));
 
 		$event_data = array('user_row', 'data');
-		$event = new \phpbb\event\data(compact($event_data));
-		$dispatcher->dispatch($listener, $event);
+		$dispatcher->trigger_event($listener, compact($event_data));
 	}
 }
diff --git a/tests/event/failed_logins_test.php b/tests/event/failed_logins_test.php
@@ -50,11 +50,10 @@ public function test_log_failed_login_attempts($enabled, $in_watch_group, $resul
 			->method('add')
 			->with('user', $result['user_row']['user_id'], $this->user->ip, 'LOG_TEAM_AUTH_FAIL', time(), array('reportee_id' => $result['user_row']['user_id']));
 
-		$dispatcher = new \Symfony\Component\EventDispatcher\EventDispatcher();
+		$dispatcher = new \phpbb\event\dispatcher();
 		$dispatcher->addListener('core.login_box_failed', array($this->listener, 'log_failed_login_attempts'));
 
 		$event_data = array('result');
-		$event = new \phpbb\event\data(compact($event_data));
-		$dispatcher->dispatch('core.login_box_failed', $event);
+		$dispatcher->trigger_event('core.login_box_failed', compact($event_data));
 	}
 }
diff --git a/tests/event/listener_base.php b/tests/event/listener_base.php
@@ -12,13 +12,13 @@
 
 class listener_base extends \phpbb_test_case
 {
-	/** @var \PHPUnit_Framework_MockObject_MockObject|\phpbb\teamsecurity\event\listener */
+	/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\teamsecurity\event\listener */
 	protected $listener;
 
 	/** @var \phpbb\config\config */
 	protected $config;
 
-	/** @var \PHPUnit_Framework_MockObject_MockObject|\phpbb\log\log */
+	/** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\log\log */
 	protected $log;
 
 	/** @var \phpbb\user */
diff --git a/tests/event/load_language_test.php b/tests/event/load_language_test.php
@@ -59,15 +59,12 @@ public function test_load_language_on_setup($lang_set_ext, $expected_contains)
 	{
 		$this->set_listener();
 
-		$dispatcher = new \Symfony\Component\EventDispatcher\EventDispatcher();
+		$dispatcher = new \phpbb\event\dispatcher();
 		$dispatcher->addListener('core.user_setup', array($this->listener, 'load_language_on_setup'));
 
 		$event_data = array('lang_set_ext');
-		$event = new \phpbb\event\data(compact($event_data));
-		$dispatcher->dispatch('core.user_setup', $event);
-
-		$lang_set_ext = $event->get_data_filtered($event_data);
-		$lang_set_ext = $lang_set_ext['lang_set_ext'];
+		$event_data_after = $dispatcher->trigger_event('core.user_setup', compact($event_data));
+		extract($event_data_after, EXTR_OVERWRITE);
 
 		foreach ($expected_contains as $expected)
 		{
diff --git a/tests/event/login_notification_test.php b/tests/event/login_notification_test.php
@@ -61,11 +61,10 @@ public function test_acp_login_notification($enabled, $admin, $username, $ip, $e
 			->method('send_message')
 			->with($expected);
 
-		$dispatcher = new \Symfony\Component\EventDispatcher\EventDispatcher();
+		$dispatcher = new \phpbb\event\dispatcher();
 		$dispatcher->addListener('core.login_box_redirect', array($this->listener, 'acp_login_notification'));
 
 		$event_data = array('admin');
-		$event = new \phpbb\event\data(compact($event_data));
-		$dispatcher->dispatch('core.login_box_redirect', $event);
+		$dispatcher->trigger_event('core.login_box_redirect', compact($event_data));
 	}
 }
diff --git a/tests/event/team_passwords_test.php b/tests/event/team_passwords_test.php
@@ -55,12 +55,11 @@ public function test_set_team_password_configs($listener, $mode, $user_row, $sec
 			->method('in_watch_group')
 			->willReturn($in_watch_group);
 
-		$dispatcher = new \Symfony\Component\EventDispatcher\EventDispatcher();
+		$dispatcher = new \phpbb\event\dispatcher();
 		$dispatcher->addListener($listener, array($this->listener, 'set_team_password_configs'));
 
 		$event_data = array('mode', 'user_row');
-		$event = new \phpbb\event\data(compact($event_data));
-		$dispatcher->dispatch($listener, $event);
+		$dispatcher->trigger_event($listener, compact($event_data));
 
 		self::assertEquals($expected, $this->config['pass_complex']);
 		self::assertEquals($sec_min_pass_chars, $this->config['min_pass_chars']);
diff --git a/tests/functional/functional_test.php b/tests/functional/functional_test.php
@@ -27,7 +27,7 @@ public function test_acp_modules()
 		$this->login();
 		$this->admin_login();
 
-		$crawler = self::request('GET', "adm/index.php?i=\\phpbb\\teamsecurity\\acp\\teamsecurity_module&mode=settings&sid={$this->sid}");
+		$crawler = self::request('GET', "adm/index.php?i=\\phpbb\\teamsecurity\\acp\\teamsecurity_module&mode=settings&sid=$this->sid");
 		$this->assertContainsLang('ACP_TEAM_SECURITY_SETTINGS', $crawler->filter('#main h1')->text());
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function __construct(\phpbb\config\config $config, \phpbb\language\langua`
`63`	`63`	`* @static`
`64`	`64`	`* @access public`
`65`	`65`	`*/`
`66`		`- static public function getSubscribedEvents()`
	`66`	`+ public static function getSubscribedEvents()`
`67`	`67`	`{`
`68`	`68`	`return array(`
`69`	`69`	`'core.user_setup' => 'load_language_on_setup',`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`
`13`	`13`	`class m1_initial extends \phpbb\db\migration\migration`
`14`	`14`	`{`
`15`		`- static public function depends_on()`
	`15`	`+ public static function depends_on()`
`16`	`16`	`{`
`17`	`17`	`return array('\phpbb\db\migration\data\v31x\v313');`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -165,11 +165,10 @@ public function test_email_change_notification($listener, $enabled, $in_watch_gr`
`165`	`165`	`->method('send_message')`
`166`	`166`	`->with($expected);`
`167`	`167`
`168`		`- $dispatcher = new \Symfony\Component\EventDispatcher\EventDispatcher();`
	`168`	`+ $dispatcher = new \phpbb\event\dispatcher();`
`169`	`169`	`$dispatcher->addListener($listener, array($this->listener, 'email_change_notification'));`
`170`	`170`
`171`	`171`	`$event_data = array('user_row', 'data');`
`172`		`- $event = new \phpbb\event\data(compact($event_data));`
`173`		`- $dispatcher->dispatch($listener, $event);`
	`172`	`+ $dispatcher->trigger_event($listener, compact($event_data));`
`174`	`173`	`}`
`175`	`174`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,11 +50,10 @@ public function test_log_failed_login_attempts($enabled, $in_watch_group, $resul`
`50`	`50`	`->method('add')`
`51`	`51`	`->with('user', $result['user_row']['user_id'], $this->user->ip, 'LOG_TEAM_AUTH_FAIL', time(), array('reportee_id' => $result['user_row']['user_id']));`
`52`	`52`
`53`		`- $dispatcher = new \Symfony\Component\EventDispatcher\EventDispatcher();`
	`53`	`+ $dispatcher = new \phpbb\event\dispatcher();`
`54`	`54`	`$dispatcher->addListener('core.login_box_failed', array($this->listener, 'log_failed_login_attempts'));`
`55`	`55`
`56`	`56`	`$event_data = array('result');`
`57`		`- $event = new \phpbb\event\data(compact($event_data));`
`58`		`- $dispatcher->dispatch('core.login_box_failed', $event);`
	`57`	`+ $dispatcher->trigger_event('core.login_box_failed', compact($event_data));`
`59`	`58`	`}`
`60`	`59`	`}`