Merge pull request #103 from VSEphpbb/tests

Replace deprecated getMock()

Author: senky

tests/controller/controller_base.php

@@ -57,7 +57,9 @@ public function setUp()
 		$phpbb_dispatcher = new \phpbb_mock_event_dispatcher();
 
 		// Constructor arguments
-		$this->auth = $this->getMock('\phpbb\auth\auth');
+		$this->auth = $this->getMockBuilder('\phpbb\auth\auth')
+			->disableOriginalConstructor()
+			->getMock();
 		$this->config = new \phpbb\config\config(array('ideas_forum_id' => 2, 'ideas_poster_id' => 2));
 		$this->controller_helper = $this->getMockBuilder('\phpbb\controller\helper')
 			->disableOriginalConstructor()
@@ -84,10 +86,17 @@ public function setUp()
 		$this->pagination = $this->getMockBuilder('\phpbb\pagination')
 			->disableOriginalConstructor()
 			->getMock();
-		$this->request = $request = $this->getMock('\phpbb\request\request');
+		$this->request = $request = $this->getMockBuilder('\phpbb\request\request')
+			->disableOriginalConstructor()
+			->getMock();
 		$this->template = $this->getMockBuilder('\phpbb\template\template')
 			->getMock();
-		$this->user = $this->getMock('\phpbb\user', array(), array($this->lang, '\phpbb\datetime'));
+		$this->user = $this->getMockBuilder('\phpbb\user')
+			->setConstructorArgs(array(
+				$this->lang,
+				'\phpbb\datetime'
+			))
+			->getMock();
 		$this->root_path = $phpbb_root_path;
 		$this->php_ext = $phpEx;
 	}

tests/controller/idea_controller_test.php

@@ -58,9 +58,12 @@ public function test_controller($idea_id, $mode, $callback, $is_ajax, $authorise
 			->will($this->returnValue(array('idea_id' => $idea_id, 'idea_author' => 2)));
 
 		// mock a result from each method called by the idea controller
-		$this->ideas->expects(($callback !== '' ? $this->once() : $this->never()))
-			->method($callback)
-			->will($this->returnValue($authorised));
+		if ($callback !== '')
+		{
+			$this->ideas->expects($this->once())
+				->method(($callback))
+				->will($this->returnValue($authorised));
+		}
 
 		// set if using ajax or not
 		$this->request->expects($this->any())

tests/controller/post_controller_test.php

@@ -17,8 +17,12 @@ public function setUp()
 		parent::setUp();
 
 		global $db, $phpbb_container;
-		$db = $this->getMock('\phpbb\db\driver\driver_interface');
-		$phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+		$db = $this->getMockBuilder('\phpbb\db\driver\driver_interface')
+			->disableOriginalConstructor()
+			->getMock();
+		$phpbb_container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')
+			->disableOriginalConstructor()
+			->getMock();
 	}
 
 	/**

tests/event/listener_test.php

@@ -49,7 +49,9 @@ public function setUp()
 		global $phpbb_root_path, $phpEx;
 
 		// Load/Mock classes required by the event listener class
-		$this->auth = $this->getMock('\phpbb\auth\auth');
+		$this->auth = $this->getMockBuilder('\phpbb\auth\auth')
+			->disableOriginalConstructor()
+			->getMock();
 		$this->config = new \phpbb\config\config(array('ideas_forum_id' => 2, 'ideas_poster_id' => 2));
 		$this->helper = $this->getMockBuilder('\phpbb\controller\helper')
 			->disableOriginalConstructor()

tests/factory/linkhelper_test.php

@@ -49,7 +49,9 @@ public function setUp()
 		$this->user_loader = new \phpbb\user_loader($this->db, $phpbb_root_path, $phpEx, 'phpbb_users');
 
 		$phpbb_dispatcher = new \phpbb_mock_event_dispatcher();
-		$auth = $this->getMock('\phpbb\auth\auth');
+		$auth = $this->getMockBuilder('\phpbb\auth\auth')
+			->disableOriginalConstructor()
+			->getMock();
 		$auth->expects($this->any())
 			->method('acl_get')
 			->with($this->stringContains('_'), $this->anything())

tests/ideas/ideas_base.php

@@ -46,7 +46,9 @@ public function setUp()
 
 		global $auth, $config, $db, $phpbb_dispatcher, $phpbb_root_path, $phpEx, $request;
 
-		$this->auth = $auth = $this->getMock('\phpbb\auth\auth');
+		$this->auth = $auth = $this->getMockBuilder('\phpbb\auth\auth')
+			->disableOriginalConstructor()
+			->getMock();
 		$this->config = $config = new \phpbb\config\config(array(
 			'posts_per_page' => 10,
 			'ideas_forum_id' => 2,
@@ -56,12 +58,16 @@ public function setUp()
 		$phpbb_dispatcher = new \phpbb_mock_event_dispatcher();
 		$lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx);
 		$this->lang = new \phpbb\language\language($lang_loader);
-		$this->user = $this->getMock('\phpbb\user', array(), array(
-			$this->lang,
-			'\phpbb\datetime'
-		));
+		$this->user = $this->getMockBuilder('\phpbb\user')
+			->setConstructorArgs(array(
+				$this->lang,
+				'\phpbb\datetime'
+			))
+			->getMock();
 		$this->php_ext = $phpEx;
-		$request = $this->getMock('\phpbb\request\request');
+		$request = $this->getMockBuilder('\phpbb\request\request')
+			->disableOriginalConstructor()
+			->getMock();
 	}
 
 	/**