Update tests

iMattPro · Jan 4, 2018 · fe0a1d5 · fe0a1d5
1 parent 1c74943
commit fe0a1d5
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 11 deletions.
diff --git a/tests/acp/controller_test.php b/tests/acp/controller_test.php
@@ -56,8 +56,11 @@ public function setUp()
 		$db = $this->new_dbal();
 		$phpbb_extension_manager = new \phpbb_mock_extension_manager($phpbb_root_path);
 		$phpbb_dispatcher = new \phpbb_mock_event_dispatcher();
-		$request = $this->request = $this->getMock('\phpbb\request\request');
-		$template = $this->template = $this->getMock('\phpbb\template\template');
+		$request = $this->request = $this->getMockBuilder('\phpbb\request\request')
+			->disableOriginalConstructor()
+			->getMock();
+		$template = $this->template = $this->getMockBuilder('\phpbb\template\template')
+			->getMock();
 		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
 		$this->language = new \phpbb\language\language($lang_loader);
 		$this->user = new \phpbb\user($this->language, '\phpbb\datetime');

diff --git a/tests/acp/module_test.php b/tests/acp/module_test.php
@@ -33,7 +33,8 @@ public function test_module()
 			->setMethods(array('handle'))
 			->getMock();
 
-		$phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+		$phpbb_container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')
+			->getMock();
 		$phpbb_container
 			->expects($this->at(0))
 			->method('get')

diff --git a/tests/core/base.php b/tests/core/base.php
@@ -68,18 +68,19 @@ public function setUp()
 		$phpbb_dispatcher = $this->dispatcher = new \phpbb\event\dispatcher(new \phpbb_mock_container_builder());
 
 		$this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
-		$user = $this->user = $this->getMock('\phpbb\user', array(), array($this->language, '\phpbb\datetime'));
+		$user = $this->user = $this->getMockBuilder('\phpbb\user')
+			->setConstructorArgs(array($this->language, '\phpbb\datetime'))
+			->setMethods(array())
+			->getMock();
 		$this->user->expects($this->any())
 			->method('optionget')
 			->with($this->anything())
 			->will($this->returnValueMap(array(array('viewavatars', false, true), array('viewcensors', false, false))));
 		$this->user->style['style_path'] = 'prosilver';
 		$this->user->data['user_topic_preview'] = 1;
-
 		$this->trim = tools\helper::trimTools()
 			->setTools($config)
 			->getTrim();
-
 		$this->template = $this->getMockBuilder('\phpbb\template\template')
 			->getMock();
 	}

diff --git a/tests/core/display_topic_preview_test.php b/tests/core/display_topic_preview_test.php
@@ -44,7 +44,9 @@ public function setUp()
 			->will($this->returnValue(self::$avatar_data));
 
 		/** @var \phpbb\request\request|\PHPUnit_Framework_MockObject_MockObject $request */
-		$request = $this->getMock('\phpbb\request\request');
+		$request = $this->getMockBuilder('\phpbb\request\request')
+			->disableOriginalConstructor()
+			->getMock();
 
 		$phpbb_path_helper = new \phpbb\path_helper(
 			new \phpbb\symfony_request(

diff --git a/tests/event/ucp_listener_test.php b/tests/event/ucp_listener_test.php
@@ -27,7 +27,7 @@ class ucp_listener_test extends \phpbb_test_case
 	/** @var \phpbb\template\template|\PHPUnit_Framework_MockObject_MockObject */
 	protected $template;
 
-	/** @var \phpbb\user|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var \phpbb\user */
 	protected $user;
 
 	/**
@@ -41,9 +41,11 @@ public function setUp()
 
 		// Load/Mock classes required by the event listener class
 		$this->config = new \phpbb\config\config(array('topic_preview_limit' => 1));
-		$this->request = $this->getMock('\phpbb\request\request');
+		$this->request = $this->getMockBuilder('\phpbb\request\request')
+			->disableOriginalConstructor()
+			->getMock();
 		$this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
-		$this->user = $this->getMock('\phpbb\user', array(), array($this->language, '\phpbb\datetime'));
+		$this->user = new \phpbb\user($this->language, '\phpbb\datetime');
 		$this->template = $this->getMockBuilder('\phpbb\template\template')
 			->getMock();
 	}

diff --git a/tests/system/ext_test.php b/tests/system/ext_test.php
@@ -28,7 +28,8 @@ public function setUp()
 		parent::setUp();
 
 		// Stub the container
-		$this->container = $this->getMock('\Symfony\Component\DependencyInjection\ContainerInterface');
+		$this->container = $this->getMockBuilder('\Symfony\Component\DependencyInjection\ContainerInterface')
+			->getMock();
 
 		// Stub the ext finder and disable its constructor
 		$this->extension_finder = $this->getMockBuilder('\phpbb\finder')