Fix phpunit-5.4 wargning

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

1 files changed, 26 insertions, 22 deletions

diff --git a/tests/lib/AppFramework/Controller/ApiControllerTest.php b/tests/lib/AppFramework/Controller/ApiControllerTest.php
index 783eecf93e5..74231b8d6ac 100644
--- a/tests/lib/AppFramework/Controller/ApiControllerTest.php
+++ b/tests/lib/AppFramework/Controller/ApiControllerTest.php
@@ -32,27 +32,31 @@ class ChildApiController extends ApiController {};
 
 
 class ApiControllerTest extends \Test\TestCase {
-    /** @var ChildApiController */
-    protected $controller;
-
-    public function testCors() {
-        $request = new Request(
-            ['server' => ['HTTP_ORIGIN' => 'test']],
-            $this->getMock('\OCP\Security\ISecureRandom'),
-            $this->getMock('\OCP\IConfig')
-        );
-        $this->controller = new ChildApiController('app', $request, 'verbs',
-            'headers', 100);
-
-        $response = $this->controller->preflightedCors();
-
-        $headers = $response->getHeaders();
-
-        $this->assertEquals('test', $headers['Access-Control-Allow-Origin']);
-        $this->assertEquals('verbs', $headers['Access-Control-Allow-Methods']);
-        $this->assertEquals('headers', $headers['Access-Control-Allow-Headers']);
-        $this->assertEquals('false', $headers['Access-Control-Allow-Credentials']);
-        $this->assertEquals(100, $headers['Access-Control-Max-Age']);
-    }
+	/** @var ChildApiController */
+	protected $controller;
+
+	public function testCors() {
+		$request = new Request(
+			['server' => ['HTTP_ORIGIN' => 'test']],
+			$this->getMockBuilder('\OCP\Security\ISecureRandom')
+				->disableOriginalConstructor()
+				->getMock(),
+			$this->getMockBuilder('\OCP\IConfig')
+				->disableOriginalConstructor()
+				->getMock()
+		);
+		$this->controller = new ChildApiController('app', $request, 'verbs',
+			'headers', 100);
+
+		$response = $this->controller->preflightedCors();
+
+		$headers = $response->getHeaders();
+
+		$this->assertEquals('test', $headers['Access-Control-Allow-Origin']);
+		$this->assertEquals('verbs', $headers['Access-Control-Allow-Methods']);
+		$this->assertEquals('headers', $headers['Access-Control-Allow-Headers']);
+		$this->assertEquals('false', $headers['Access-Control-Allow-Credentials']);
+		$this->assertEquals(100, $headers['Access-Control-Max-Age']);
+	}
 
 }