Fix phpunit-5.4 wargning

* getMock is deprecated.
* \PDOStatement mocking fails hard on phpunit 4.8

3 files changed, 48 insertions, 18 deletions

diff --git a/tests/lib/AppFramework/Http/DispatcherTest.php b/tests/lib/AppFramework/Http/DispatcherTest.php
index 6df6f7fa7fe..c2d73adfd7b 100644
--- a/tests/lib/AppFramework/Http/DispatcherTest.php
+++ b/tests/lib/AppFramework/Http/DispatcherTest.php
@@ -105,9 +105,11 @@ class DispatcherTest extends \Test\TestCase {
 			'\OC\AppFramework\Middleware\MiddlewareDispatcher')
 			->disableOriginalConstructor()
 			->getMock();
-		$this->controller = $this->getMock(
-			'\OCP\AppFramework\Controller',
-			array($this->controllerMethod), array($app, $request));
+		$this->controller = $this->getMockBuilder(
+			'\OCP\AppFramework\Controller')
+			->setMethods([$this->controllerMethod])
+			->setConstructorArgs([$app, $request])
+			->getMock();
 
 		$this->request = $this->getMockBuilder(
 			'\OC\AppFramework\Http\Request')
@@ -296,8 +298,12 @@ class DispatcherTest extends \Test\TestCase {
 				],
 				'method' => 'POST'
 			],
-			$this->getMock('\OCP\Security\ISecureRandom'),
-			$this->getMock('\OCP\IConfig')
+			$this->getMockBuilder('\OCP\Security\ISecureRandom')
+				->disableOriginalConstructor()
+				->getMock(),
+			$this->getMockBuilder('\OCP\IConfig')
+				->disableOriginalConstructor()
+				->getMock()
 		);
 		$this->dispatcher = new Dispatcher(
 			$this->http, $this->middlewareDispatcher, $this->reflector,
@@ -323,8 +329,12 @@ class DispatcherTest extends \Test\TestCase {
 				],
 				'method' => 'POST',
 			],
-			$this->getMock('\OCP\Security\ISecureRandom'),
-			$this->getMock('\OCP\IConfig')
+			$this->getMockBuilder('\OCP\Security\ISecureRandom')
+				->disableOriginalConstructor()
+				->getMock(),
+			$this->getMockBuilder('\OCP\IConfig')
+				->disableOriginalConstructor()
+				->getMock()
 		);
 		$this->dispatcher = new Dispatcher(
 			$this->http, $this->middlewareDispatcher, $this->reflector,
@@ -353,8 +363,12 @@ class DispatcherTest extends \Test\TestCase {
 				],
 				'method' => 'GET'
 			],
-			$this->getMock('\OCP\Security\ISecureRandom'),
-			$this->getMock('\OCP\IConfig')
+			$this->getMockBuilder('\OCP\Security\ISecureRandom')
+				->disableOriginalConstructor()
+				->getMock(),
+			$this->getMockBuilder('\OCP\IConfig')
+				->disableOriginalConstructor()
+				->getMock()
 		);
 		$this->dispatcher = new Dispatcher(
 			$this->http, $this->middlewareDispatcher, $this->reflector,
@@ -382,8 +396,12 @@ class DispatcherTest extends \Test\TestCase {
 				],
 				'method' => 'GET'
 			],
-			$this->getMock('\OCP\Security\ISecureRandom'),
-			$this->getMock('\OCP\IConfig')
+			$this->getMockBuilder('\OCP\Security\ISecureRandom')
+				->disableOriginalConstructor()
+				->getMock(),
+			$this->getMockBuilder('\OCP\IConfig')
+				->disableOriginalConstructor()
+				->getMock()
 		);
 		$this->dispatcher = new Dispatcher(
 			$this->http, $this->middlewareDispatcher, $this->reflector,
@@ -412,8 +430,12 @@ class DispatcherTest extends \Test\TestCase {
 				],
 				'method' => 'PUT'
 			],
-			$this->getMock('\OCP\Security\ISecureRandom'),
-			$this->getMock('\OCP\IConfig')
+			$this->getMockBuilder('\OCP\Security\ISecureRandom')
+				->disableOriginalConstructor()
+				->getMock(),
+			$this->getMockBuilder('\OCP\IConfig')
+				->disableOriginalConstructor()
+				->getMock()
 		);
 		$this->dispatcher = new Dispatcher(
 			$this->http, $this->middlewareDispatcher, $this->reflector,
@@ -444,8 +466,12 @@ class DispatcherTest extends \Test\TestCase {
 				],
 				'method' => 'POST'
 			],
-			$this->getMock('\OCP\Security\ISecureRandom'),
-			$this->getMock('\OCP\IConfig')
+			$this->getMockBuilder('\OCP\Security\ISecureRandom')
+				->disableOriginalConstructor()
+				->getMock(),
+			$this->getMockBuilder('\OCP\IConfig')
+				->disableOriginalConstructor()
+				->getMock()
 		);
 		$this->dispatcher = new Dispatcher(
 			$this->http, $this->middlewareDispatcher, $this->reflector,
diff --git a/tests/lib/AppFramework/Http/StreamResponseTest.php b/tests/lib/AppFramework/Http/StreamResponseTest.php
index 1f761d6b89c..c082b36e0ac 100644
--- a/tests/lib/AppFramework/Http/StreamResponseTest.php
+++ b/tests/lib/AppFramework/Http/StreamResponseTest.php
@@ -37,7 +37,9 @@ class StreamResponseTest extends \Test\TestCase {
 
 	protected function setUp() {
 		parent::setUp();
-		$this->output = $this->getMock('OCP\\AppFramework\\Http\\IOutput');
+		$this->output = $this->getMockBuilder('OCP\\AppFramework\\Http\\IOutput')
+			->disableOriginalConstructor()
+			->getMock();
 	}
 
 	public function testOutputNotModified(){
diff --git a/tests/lib/AppFramework/Http/TemplateResponseTest.php b/tests/lib/AppFramework/Http/TemplateResponseTest.php
index 87fb6864f78..4f779e8c697 100644
--- a/tests/lib/AppFramework/Http/TemplateResponseTest.php
+++ b/tests/lib/AppFramework/Http/TemplateResponseTest.php
@@ -43,8 +43,10 @@ class TemplateResponseTest extends \Test\TestCase {
 	protected function setUp() {
 		parent::setUp();
 
-		$this->api = $this->getMock('OC\AppFramework\Core\API',
-								array('getAppName'), array('test'));
+		$this->api = $this->getMockBuilder('OC\AppFramework\Core\API')
+			->setMethods(['getAppName'])
+			->setConstructorArgs(['test'])
+			->getMock();
 		$this->api->expects($this->any())
 				->method('getAppName')
 				->will($this->returnValue('app'));