Update old code in unit tests

Author: iMattPro

tests/controller/index_controller_test.php

@@ -58,10 +58,10 @@ public function controller_exception_test_data()
 	 * Basic controller exception test
 	 *
 	 * @dataProvider controller_exception_test_data
-	 * @expectedException \phpbb\exception\http_exception
 	 */
 	public function test_controller_exception($forum)
 	{
+		$this->expectException(\phpbb\exception\http_exception::class);
 		$this->config['ideas_forum_id'] = $forum;
 
 		/** @var \phpbb\ideas\controller\index_controller $controller */

tests/controller/list_controller_test.php

@@ -189,10 +189,10 @@ public function controller_exception_test_data()
 	 * Basic controller exception test
 	 *
 	 * @dataProvider controller_exception_test_data
-	 * @expectedException \phpbb\exception\http_exception
 	 */
 	public function test_controller_exception($forum)
 	{
+		$this->expectException(\phpbb\exception\http_exception::class);
 		$this->config['ideas_forum_id'] = $forum;
 
 		/** @var \phpbb\ideas\controller\list_controller $controller */

tests/functional/ideas_test.php

@@ -44,8 +44,8 @@ public function test_new_idea()
 		$this->assertContains($this->lang('IDEAS'), $crawler->filter('#nav-breadcrumbs')->text());
 		$this->assertContains($idea['title'], $crawler->filter('h2')->text());
 		$this->assertContains($idea['message'], $crawler->filter('.content')->text());
-		$this->assertContains('1', $crawler->filter('.rating > .vote-up')->text());
-		$this->assertContains('0', $crawler->filter('.rating > .vote-down')->text());
+		$this->assertStringContainsString('1', $crawler->filter('.rating > .vote-up')->text());
+		$this->assertStringContainsString('0', $crawler->filter('.rating > .vote-down')->text());
 	}
 
 	/**
@@ -131,7 +131,7 @@ public function create_idea($title, $message)
 
 		// Submit and verify success
 		$crawler = self::submit($form);
-		$this->assertContains($data['title'], $crawler->filter('h2')->text());
+		$this->assertStringContainsString($data['title'], $crawler->filter('h2')->text());
 
 		// Get the new idea's ID and add it to the data array
 		$url = $crawler->selectLink($this->lang('REMOVE_VOTE'))->link()->getUri();

tests/functional/viewonline_test.php

@@ -41,7 +41,7 @@ public function test_viewonline_check_viewonline()
 		$crawler = self::request('GET', "viewonline.php?sid={$this->sid}");
 
 		// Is admin still viewing Ideas page
-		$this->assertContains('admin', $crawler->filter('#page-body table.table1')->text());
+		$this->assertStringContainsString('admin', $crawler->filter('#page-body table.table1')->text());
 
 		$session_entries = $crawler->filter('#page-body table.table1 tr')->count();
 		$this->assertGreaterThanOrEqual(3, $session_entries, 'Too few session entries found');
@@ -54,7 +54,7 @@ public function test_viewonline_check_viewonline()
 			$subcrawler = $crawler->filter('#page-body table.table1 tr')->eq($i);
 			if (strpos($subcrawler->filter('td')->text(), 'admin') !== false)
 			{
-				$this->assertContains($this->lang('VIEWING_IDEAS'), $subcrawler->filter('td.info')->text());
+				$this->assertContainsLang('VIEWING_IDEAS', $subcrawler->filter('td.info')->text());
 				return;
 			}
 		}

tests/template/status_icon_test.php

@@ -41,7 +41,6 @@ protected function setup_engine(array $new_config = array())
 
 		$this->template_path = $this->test_path . '/templates';
 
-		$container = new \phpbb_mock_container_builder();
 		$cache_path = $phpbb_root_path . 'cache/twig';
 		$context = new \phpbb\template\context();
 		$loader = new \phpbb\template\twig\loader(new \phpbb\filesystem\filesystem(), '');
@@ -52,7 +51,7 @@ protected function setup_engine(array $new_config = array())
 			$cache_path,
 			null,
 			$loader,
-			new \phpbb\event\dispatcher($container),
+			new \phpbb\event\dispatcher(),
 			[
 				'cache'			=> false,
 				'debug'			=> false,