test: Fix tests/lib/App*

Signed-off-by: Joas Schilling <coding@schilljs.com>

tests/lib/App/AppManagerTest.php

@@ -301,7 +301,7 @@ class AppManagerTest extends TestCase {
 		$this->assertEquals('["group1","group2"]', $this->appConfig->getValue('test', 'enabled', 'no'));
 	}
 
-	public function dataEnableAppForGroupsAllowedTypes() {
+	public static function dataEnableAppForGroupsAllowedTypes(): array {
 		return [
 			[[]],
 			[[
@@ -361,7 +361,7 @@ class AppManagerTest extends TestCase {
 		$this->assertEquals('["group1","group2"]', $this->appConfig->getValue('test', 'enabled', 'no'));
 	}
 
-	public function dataEnableAppForGroupsForbiddenTypes() {
+	public static function dataEnableAppForGroupsForbiddenTypes(): array {
 		return [
 			['filesystem'],
 			['prelogin'],

tests/lib/App/AppStore/Fetcher/AppDiscoverFetcherTest.php

@@ -104,7 +104,7 @@ class AppDiscoverFetcherTest extends FetcherBase {
 		}
 	}
 
-	public function dataGetETag(): array {
+	public static function dataGetETag(): array {
 		return [
 			'file not found' => [null, true],
 			'empty file' => [null, false, ''],

tests/lib/App/AppStore/Fetcher/AppFetcherTest.php

@@ -1840,7 +1840,7 @@ EJL3BaQAQaASSsvFrcozYxrQG4VzEg==
 		$this->registry = $this->createMock(IRegistry::class);
 
 		$this->fetcher = $this->getMockBuilder(AppFetcher::class)
-			->setMethods(['getChannel'])
+			->onlyMethods(['getChannel'])
 			->setConstructorArgs([
 				$factory,
 				$this->clientService,

tests/lib/App/AppStore/Version/VersionParserTest.php

@@ -22,7 +22,7 @@ class VersionParserTest extends TestCase {
 	/**
 	 * @return array
 	 */
-	public function versionProvider() {
+	public static function versionProvider(): array {
 		return [
 			[
 				'*',
@@ -66,7 +66,7 @@ class VersionParserTest extends TestCase {
 		$this->assertEquals($expected, $this->versionParser->getVersion($input));
 	}
 
-	
+
 	public function testGetVersionException(): void {
 		$this->expectException(\Exception::class);
 		$this->expectExceptionMessage('Version cannot be parsed: BogusVersion');
@@ -74,7 +74,7 @@ class VersionParserTest extends TestCase {
 		$this->versionParser->getVersion('BogusVersion');
 	}
 
-	
+
 	public function testGetVersionExceptionWithMultiple(): void {
 		$this->expectException(\Exception::class);
 		$this->expectExceptionMessage('Version cannot be parsed: >=8.2 <=9.1a');

tests/lib/App/CompareVersionTest.php

@@ -23,7 +23,7 @@ class CompareVersionTest extends TestCase {
 		$this->compare = new CompareVersion();
 	}
 
-	public function comparisonData() {
+	public static function comparisonData(): array {
 		return [
 			// Compatible versions
 			['13.0.0.3', '13.0.0', '>=', true],

tests/lib/App/DependencyAnalyzerTest.php

@@ -195,7 +195,7 @@ class DependencyAnalyzerTest extends TestCase {
 	/**
 	 * @return array
 	 */
-	public function providesOC() {
+	public static function providesOC(): array {
 		return [
 			// no version -> no missing dependency
 			[
@@ -423,7 +423,7 @@ class DependencyAnalyzerTest extends TestCase {
 	/**
 	 * @return array
 	 */
-	public function providesOS() {
+	public static function providesOS(): array {
 		return [
 			[[], null],
 			[[], []],
@@ -435,7 +435,7 @@ class DependencyAnalyzerTest extends TestCase {
 	/**
 	 * @return array
 	 */
-	public function providesLibs() {
+	public static function providesLibs(): array {
 		return [
 			// we expect curl to exist
 			[[], 'curl'],
@@ -465,7 +465,7 @@ class DependencyAnalyzerTest extends TestCase {
 	/**
 	 * @return array
 	 */
-	public function providesCommands() {
+	public static function providesCommands(): array {
 		return [
 			[[], null],
 			// grep is known on linux
@@ -483,7 +483,7 @@ class DependencyAnalyzerTest extends TestCase {
 	/**
 	 * @return array
 	 */
-	public function providesDatabases() {
+	public static function providesDatabases(): array {
 		return [
 			// non BC - in case on databases are defined -> all are supported
 			[[], null],
@@ -496,7 +496,7 @@ class DependencyAnalyzerTest extends TestCase {
 	/**
 	 * @return array
 	 */
-	public function providesPhpVersion() {
+	public static function providesPhpVersion(): array {
 		return [
 			[[], null, null, null],
 			[[], '5.4', null, null],

tests/lib/App/InfoParserTest.php

@@ -45,7 +45,7 @@ class InfoParserTest extends TestCase {
 		$this->parserTest($expectedJson, $xmlFile, self::$cache);
 	}
 
-	public function providesInfoXml(): array {
+	public static function providesInfoXml(): array {
 		return [
 			['expected-info.json', 'valid-info.xml'],
 			[null, 'invalid-info.xml'],

tests/lib/App/PlatformRepositoryTest.php

@@ -20,7 +20,7 @@ class PlatformRepositoryTest extends \Test\TestCase {
 		$this->assertEquals($expected, $normalizedVersion);
 	}
 
-	public function providesVersions() {
+	public static function providesVersions(): array {
 		return [
 			'none' => ['1.0.0', '1.0.0.0'],
 			'none/2' => ['1.2.3.4', '1.2.3.4'],

tests/lib/AppFramework/AppTest.php

@@ -124,7 +124,7 @@ class AppTest extends \Test\TestCase {
 		App::main($this->controllerName, $this->controllerMethod, $this->container, []);
 	}
 
-	public function dataNoOutput() {
+	public static function dataNoOutput(): array {
 		return [
 			['HTTP/2.0 204 No content'],
 			['HTTP/2.0 304 Not modified'],

tests/lib/AppFramework/Bootstrap/RegistrationContextTest.php

@@ -156,7 +156,7 @@ class RegistrationContextTest extends TestCase {
 		);
 	}
 
-	public function dataProvider_TrueFalse() {
+	public static function dataProvider_TrueFalse(): array {
 		return[
 			[true],
 			[false]

tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php

@@ -38,7 +38,7 @@ class AuthPublicShareControllerTest extends \Test\TestCase {
 				$this->request,
 				$this->session,
 				$this->urlGenerator
-			])->setMethods([
+			])->onlyMethods([
 				'authFailed',
 				'getPasswordHash',
 				'isAuthenticated',
@@ -64,7 +64,9 @@ class AuthPublicShareControllerTest extends \Test\TestCase {
 		$this->controller->setToken('myToken');
 
 		$this->session->method('get')
-			->willReturnMap(['public_link_authenticate_redirect', ['foo' => 'bar']]);
+			->willReturnMap([
+				['public_link_authenticate_redirect', json_encode(['foo' => 'bar'])],
+			]);
 
 		$this->urlGenerator->method('linkToRoute')
 			->willReturn('myLink!');
@@ -107,7 +109,9 @@ class AuthPublicShareControllerTest extends \Test\TestCase {
 		$this->session->expects($this->once())
 			->method('regenerateId');
 		$this->session->method('get')
-			->willReturnMap(['public_link_authenticate_redirect', ['foo' => 'bar']]);
+			->willReturnMap([
+				['public_link_authenticate_redirect', json_encode(['foo' => 'bar'])],
+			]);
 
 		$tokenSet = false;
 		$hashSet = false;

tests/lib/AppFramework/Controller/ControllerTest.php

@@ -66,7 +66,7 @@ class ControllerTest extends \Test\TestCase {
 		);
 
 		$this->app = $this->getMockBuilder(DIContainer::class)
-			->setMethods(['getAppName'])
+			->onlyMethods(['getAppName'])
 			->setConstructorArgs(['test'])
 			->getMock();
 		$this->app->expects($this->any())

tests/lib/AppFramework/Controller/PublicShareControllerTest.php

@@ -57,7 +57,7 @@ class PublicShareControllerTest extends \Test\TestCase {
 		$this->assertEquals('test', $controller->getToken());
 	}
 
-	public function dataIsAuthenticated() {
+	public static function dataIsAuthenticated(): array {
 		return [
 			[false, 'token1', 'token1', 'hash1', 'hash1',  true],
 			[false, 'token1', 'token1', 'hash1', 'hash2',  true],

tests/lib/AppFramework/Db/EntityTest.php

@@ -211,7 +211,7 @@ class EntityTest extends \Test\TestCase {
 	}
 
 
-	public function dataSetterCasts(): array {
+	public static function dataSetterCasts(): array {
 		return [
 			['Id', '3', 3],
 			['smallInt', '3', 3],

tests/lib/AppFramework/DependencyInjection/DIContainerTest.php

@@ -29,7 +29,7 @@ class DIContainerTest extends \Test\TestCase {
 	protected function setUp(): void {
 		parent::setUp();
 		$this->container = $this->getMockBuilder(DIContainer::class)
-			->setMethods(['isAdminUser'])
+			->onlyMethods(['isAdminUser'])
 			->setConstructorArgs(['name'])
 			->getMock();
 	}

tests/lib/AppFramework/Http/DispatcherTest.php

@@ -20,11 +20,13 @@ use OCP\AppFramework\Http\ParameterOutOfRangeException;
 use OCP\AppFramework\Http\Response;
 use OCP\Diagnostics\IEventLogger;
 use OCP\IConfig;
+use OCP\IDBConnection;
 use OCP\IRequest;
 use OCP\IRequestId;
 use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
+use OC\AppFramework\DependencyInjection\DIContainer;
 
 class TestController extends Controller {
 	/**
@@ -63,6 +65,10 @@ class TestController extends Controller {
 			'text' => [$int, $bool, $test, $test2]
 		]);
 	}
+
+	public function test(): Response {
+		return new DataResponse();
+	}
 }
 
 /**
@@ -104,33 +110,17 @@ class DispatcherTest extends \Test\TestCase {
 		$this->logger = $this->createMock(LoggerInterface::class);
 		$this->eventLogger = $this->createMock(IEventLogger::class);
 		$this->container = $this->createMock(ContainerInterface::class);
-		$app = $this->getMockBuilder(
-			'OC\AppFramework\DependencyInjection\DIContainer')
-			->disableOriginalConstructor()
-			->getMock();
-		$request = $this->getMockBuilder(
-			'\OC\AppFramework\Http\Request')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->http = $this->getMockBuilder(
-			\OC\AppFramework\Http::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$app = $this->createMock(DIContainer::class);
+		$request = $this->createMock(Request::class);
+		$this->http = $this->createMock(\OC\AppFramework\Http::class);
 
-		$this->middlewareDispatcher = $this->getMockBuilder(
-			'\OC\AppFramework\Middleware\MiddlewareDispatcher')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->controller = $this->getMockBuilder(
-			'\OCP\AppFramework\Controller')
-			->setMethods([$this->controllerMethod])
+		$this->middlewareDispatcher = $this->createMock(MiddlewareDispatcher::class);
+		$this->controller = $this->getMockBuilder(TestController::class)
+			->onlyMethods([$this->controllerMethod])
 			->setConstructorArgs([$app, $request])
 			->getMock();
 
-		$this->request = $this->getMockBuilder(
-			'\OC\AppFramework\Http\Request')
-			->disableOriginalConstructor()
-			->getMock();
+		$this->request = $this->createMock(Request::class);
 
 		$this->reflector = new ControllerMethodReflector();
 
@@ -140,7 +130,7 @@ class DispatcherTest extends \Test\TestCase {
 			$this->reflector,
 			$this->request,
 			$this->config,
-			\OC::$server->getDatabaseConnection(),
+			\OCP\Server::get(IDBConnection::class),
 			$this->logger,
 			$this->eventLogger,
 			$this->container,
@@ -545,7 +535,7 @@ class DispatcherTest extends \Test\TestCase {
 	}
 
 
-	public function rangeDataProvider(): array {
+	public static function rangeDataProvider(): array {
 		return [
 			[PHP_INT_MIN, PHP_INT_MAX, 42, false],
 			[0, 12, -5, true],

tests/lib/AppFramework/Http/DownloadResponseTest.php

@@ -37,7 +37,7 @@ class DownloadResponseTest extends \Test\TestCase {
 		$this->assertEquals('attachment; filename="' . $expected . '"', $headers['Content-Disposition']);
 	}
 
-	public function filenameEncodingProvider() : array {
+	public static function filenameEncodingProvider() : array {
 		return [
 			['TestName.txt', 'TestName.txt'],
 			['A "Quoted" Filename.txt', 'A \\"Quoted\\" Filename.txt'],

tests/lib/AppFramework/Http/JSONResponseTest.php

@@ -46,10 +46,7 @@ class JSONResponseTest extends \Test\TestCase {
 		$this->assertEquals($expected, $this->json->render());
 	}
 
-	/**
-	 * @return array
-	 */
-	public function renderDataProvider() {
+	public static function renderDataProvider(): array {
 		return [
 			[
 				['test' => 'hi'], '{"test":"hi"}',

tests/lib/AppFramework/Middleware/MiddlewareDispatcherTest.php

@@ -10,6 +10,7 @@ namespace Test\AppFramework\Middleware;
 
 use OC\AppFramework\Http\Request;
 use OC\AppFramework\Middleware\MiddlewareDispatcher;
+use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Middleware;
 use OCP\IConfig;
@@ -84,6 +85,9 @@ class TestMiddleware extends Middleware {
 	}
 }
 
+class TestController extends Controller {
+	public function method(): void {}
+}
 
 class MiddlewareDispatcherTest extends \Test\TestCase {
 	public $exception;
@@ -110,8 +114,8 @@ class MiddlewareDispatcherTest extends \Test\TestCase {
 
 
 	private function getControllerMock() {
-		return $this->getMockBuilder('OCP\AppFramework\Controller')
-			->setMethods(['method'])
+		return $this->getMockBuilder(TestController::class)
+			->onlyMethods(['method'])
 			->setConstructorArgs(['app',
 				new Request(
 					['method' => 'GET'],
@@ -131,14 +135,14 @@ class MiddlewareDispatcherTest extends \Test\TestCase {
 
 	public function testAfterExceptionShouldReturnResponseOfMiddleware(): void {
 		$response = new Response();
-		$m1 = $this->getMockBuilder('\OCP\AppFramework\Middleware')
-			->setMethods(['afterException', 'beforeController'])
+		$m1 = $this->getMockBuilder(\OCP\AppFramework\Middleware::class)
+			->onlyMethods(['afterException', 'beforeController'])
 			->getMock();
 		$m1->expects($this->never())
 			->method('afterException');
 
-		$m2 = $this->getMockBuilder('OCP\AppFramework\Middleware')
-			->setMethods(['afterException', 'beforeController'])
+		$m2 = $this->getMockBuilder(\OCP\AppFramework\Middleware::class)
+			->onlyMethods(['afterException', 'beforeController'])
 			->getMock();
 		$m2->expects($this->once())
 			->method('afterException')

tests/lib/AppFramework/Middleware/MiddlewareTest.php

@@ -36,12 +36,9 @@ class MiddlewareTest extends \Test\TestCase {
 
 		$this->middleware = new ChildMiddleware();
 
-		$this->api = $this->getMockBuilder(DIContainer::class)
-			->disableOriginalConstructor()
-			->getMock();
+		$this->api = $this->createMock(DIContainer::class);
 
 		$this->controller = $this->getMockBuilder(Controller::class)
-			->setMethods([])
 			->setConstructorArgs([
 				$this->api,
 				new Request(
@@ -51,7 +48,7 @@ class MiddlewareTest extends \Test\TestCase {
 				)
 			])->getMock();
 		$this->exception = new \Exception();
-		$this->response = $this->getMockBuilder(Response::class)->getMock();
+		$this->response = $this->createMock(Response::class);
 	}
 
 

tests/lib/AppFramework/Middleware/NotModifiedMiddlewareTest.php

@@ -32,7 +32,7 @@ class NotModifiedMiddlewareTest extends \Test\TestCase {
 		$this->controller = $this->createMock(Controller::class);
 	}
 
-	public function dataModified(): array {
+	public static function dataModified(): array {
 		$now = new \DateTime();
 
 		return [

tests/lib/AppFramework/Middleware/OCSMiddlewareTest.php

@@ -12,6 +12,7 @@ use OC\AppFramework\OCS\V1Response;
 use OC\AppFramework\OCS\V2Response;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\OCS\OCSBadRequestException;
 use OCP\AppFramework\OCS\OCSException;
 use OCP\AppFramework\OCS\OCSForbiddenException;
@@ -32,49 +33,37 @@ class OCSMiddlewareTest extends \Test\TestCase {
 			->getMock();
 	}
 
-	public function dataAfterException() {
-		$OCSController = $this->getMockBuilder(OCSController::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$controller = $this->getMockBuilder(Controller::class)
-			->disableOriginalConstructor()
-			->getMock();
-
+	public static function dataAfterException(): array {
 		return [
-			[$OCSController, new \Exception(), true],
-			[$OCSController, new OCSException(), false, '', Http::STATUS_INTERNAL_SERVER_ERROR],
-			[$OCSController, new OCSException('foo'), false, 'foo', Http::STATUS_INTERNAL_SERVER_ERROR],
-			[$OCSController, new OCSException('foo', Http::STATUS_IM_A_TEAPOT), false, 'foo', Http::STATUS_IM_A_TEAPOT],
-			[$OCSController, new OCSBadRequestException(), false, '', Http::STATUS_BAD_REQUEST],
-			[$OCSController, new OCSBadRequestException('foo'), false, 'foo', Http::STATUS_BAD_REQUEST],
-			[$OCSController, new OCSForbiddenException(), false, '', Http::STATUS_FORBIDDEN],
-			[$OCSController, new OCSForbiddenException('foo'), false, 'foo', Http::STATUS_FORBIDDEN],
-			[$OCSController, new OCSNotFoundException(), false, '', Http::STATUS_NOT_FOUND],
-			[$OCSController, new OCSNotFoundException('foo'), false, 'foo', Http::STATUS_NOT_FOUND],
-
-			[$controller, new \Exception(), true],
-			[$controller, new OCSException(), true],
-			[$controller, new OCSException('foo'), true],
-			[$controller, new OCSException('foo', Http::STATUS_IM_A_TEAPOT), true],
-			[$controller, new OCSBadRequestException(), true],
-			[$controller, new OCSBadRequestException('foo'), true],
-			[$controller, new OCSForbiddenException(), true],
-			[$controller, new OCSForbiddenException('foo'), true],
-			[$controller, new OCSNotFoundException(), true],
-			[$controller, new OCSNotFoundException('foo'), true],
+			[OCSController::class, new \Exception(), true],
+			[OCSController::class, new OCSException(), false, '', Http::STATUS_INTERNAL_SERVER_ERROR],
+			[OCSController::class, new OCSException('foo'), false, 'foo', Http::STATUS_INTERNAL_SERVER_ERROR],
+			[OCSController::class, new OCSException('foo', Http::STATUS_IM_A_TEAPOT), false, 'foo', Http::STATUS_IM_A_TEAPOT],
+			[OCSController::class, new OCSBadRequestException(), false, '', Http::STATUS_BAD_REQUEST],
+			[OCSController::class, new OCSBadRequestException('foo'), false, 'foo', Http::STATUS_BAD_REQUEST],
+			[OCSController::class, new OCSForbiddenException(), false, '', Http::STATUS_FORBIDDEN],
+			[OCSController::class, new OCSForbiddenException('foo'), false, 'foo', Http::STATUS_FORBIDDEN],
+			[OCSController::class, new OCSNotFoundException(), false, '', Http::STATUS_NOT_FOUND],
+			[OCSController::class, new OCSNotFoundException('foo'), false, 'foo', Http::STATUS_NOT_FOUND],
+
+			[Controller::class, new \Exception(), true],
+			[Controller::class, new OCSException(), true],
+			[Controller::class, new OCSException('foo'), true],
+			[Controller::class, new OCSException('foo', Http::STATUS_IM_A_TEAPOT), true],
+			[Controller::class, new OCSBadRequestException(), true],
+			[Controller::class, new OCSBadRequestException('foo'), true],
+			[Controller::class, new OCSForbiddenException(), true],
+			[Controller::class, new OCSForbiddenException('foo'), true],
+			[Controller::class, new OCSNotFoundException(), true],
+			[Controller::class, new OCSNotFoundException('foo'), true],
 		];
 	}
 
 	/**
 	 * @dataProvider dataAfterException
-	 *
-	 * @param Controller $controller
-	 * @param \Exception $exception
-	 * @param bool $forward
-	 * @param string $message
-	 * @param int $code
 	 */
-	public function testAfterExceptionOCSv1($controller, $exception, $forward, $message = '', $code = 0): void {
+	public function testAfterExceptionOCSv1(string $controller, \Exception $exception, bool $forward, string $message = '', int $code = 0): void {
+		$controller = $this->createMock($controller);
 		$this->request
 			->method('getScriptName')
 			->willReturn('/ocs/v1.php');
@@ -103,14 +92,9 @@ class OCSMiddlewareTest extends \Test\TestCase {
 
 	/**
 	 * @dataProvider dataAfterException
-	 *
-	 * @param Controller $controller
-	 * @param \Exception $exception
-	 * @param bool $forward
-	 * @param string $message
-	 * @param int $code
 	 */
-	public function testAfterExceptionOCSv2($controller, $exception, $forward, $message = '', $code = 0): void {
+	public function testAfterExceptionOCSv2(string $controller, \Exception $exception, bool $forward, string $message = '', int $code = 0): void {
+		$controller = $this->createMock($controller);
 		$this->request
 			->method('getScriptName')
 			->willReturn('/ocs/v2.php');
@@ -137,14 +121,9 @@ class OCSMiddlewareTest extends \Test\TestCase {
 
 	/**
 	 * @dataProvider dataAfterException
-	 *
-	 * @param Controller $controller
-	 * @param \Exception $exception
-	 * @param bool $forward
-	 * @param string $message
-	 * @param int $code
 	 */
-	public function testAfterExceptionOCSv2SubFolder($controller, $exception, $forward, $message = '', $code = 0): void {
+	public function testAfterExceptionOCSv2SubFolder(string $controller, \Exception $exception, bool $forward, string $message = '', int $code = 0): void {
+		$controller = $this->createMock($controller);
 		$this->request
 			->method('getScriptName')
 			->willReturn('/mysubfolder/ocs/v2.php');
@@ -152,7 +131,7 @@ class OCSMiddlewareTest extends \Test\TestCase {
 		$OCSMiddleware->beforeController($controller, 'method');
 
 		if ($forward) {
-			$this->expectException(get_class($exception));
+			$this->expectException($exception::class);
 			$this->expectExceptionMessage($exception->getMessage());
 		}
 
@@ -169,39 +148,28 @@ class OCSMiddlewareTest extends \Test\TestCase {
 		$this->assertSame($code, $result->getStatus());
 	}
 
-	public function dataAfterController() {
-		$OCSController = $this->getMockBuilder(OCSController::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$controller = $this->getMockBuilder(Controller::class)
-			->disableOriginalConstructor()
-			->getMock();
-
+	public static function dataAfterController(): array {
 		return [
-			[$OCSController, new Http\Response(), false],
-			[$OCSController, new Http\JSONResponse(), false],
-			[$OCSController, new Http\JSONResponse(['message' => 'foo']), false],
-			[$OCSController, new Http\JSONResponse(['message' => 'foo'], Http::STATUS_UNAUTHORIZED), true, OCSController::RESPOND_UNAUTHORISED],
-			[$OCSController, new Http\JSONResponse(['message' => 'foo'], Http::STATUS_FORBIDDEN), true],
-
-			[$controller, new Http\Response(), false],
-			[$controller, new Http\JSONResponse(), false],
-			[$controller, new Http\JSONResponse(['message' => 'foo']), false],
-			[$controller, new Http\JSONResponse(['message' => 'foo'], Http::STATUS_UNAUTHORIZED), false],
-			[$controller, new Http\JSONResponse(['message' => 'foo'], Http::STATUS_FORBIDDEN), false],
+			[OCSController::class, new Response(), false],
+			[OCSController::class, new Http\JSONResponse(), false],
+			[OCSController::class, new Http\JSONResponse(['message' => 'foo']), false],
+			[OCSController::class, new Http\JSONResponse(['message' => 'foo'], Http::STATUS_UNAUTHORIZED), true, OCSController::RESPOND_UNAUTHORISED],
+			[OCSController::class, new Http\JSONResponse(['message' => 'foo'], Http::STATUS_FORBIDDEN), true],
+
+			[Controller::class, new Response(), false],
+			[Controller::class, new Http\JSONResponse(), false],
+			[Controller::class, new Http\JSONResponse(['message' => 'foo']), false],
+			[Controller::class, new Http\JSONResponse(['message' => 'foo'], Http::STATUS_UNAUTHORIZED), false],
+			[Controller::class, new Http\JSONResponse(['message' => 'foo'], Http::STATUS_FORBIDDEN), false],
 
 		];
 	}
 
 	/**
 	 * @dataProvider dataAfterController
-	 *
-	 * @param Controller $controller
-	 * @param Http\Response $response
-	 * @param bool $converted
-	 * @param int $convertedOCSStatus
 	 */
-	public function testAfterController($controller, $response, $converted, $convertedOCSStatus = 0): void {
+	public function testAfterController(string $controller, Response $response, bool $converted, int $convertedOCSStatus = 0): void {
+		$controller = $this->createMock($controller);
 		$OCSMiddleware = new OCSMiddleware($this->request);
 		$newResponse = $OCSMiddleware->afterController($controller, 'foo', $response);
 

tests/lib/AppFramework/Middleware/PublicShare/PublicShareMiddlewareTest.php

@@ -58,7 +58,7 @@ class PublicShareMiddlewareTest extends \Test\TestCase {
 		$this->assertTrue(true);
 	}
 
-	public function dataShareApi() {
+	public static function dataShareApi(): array {
 		return [
 			['no', 'no',],
 			['no', 'yes',],

tests/lib/AppFramework/Middleware/Security/CORSMiddlewareTest.php

@@ -44,7 +44,7 @@ class CORSMiddlewareTest extends \Test\TestCase {
 		);
 	}
 
-	public function dataSetCORSAPIHeader(): array {
+	public static function dataSetCORSAPIHeader(): array {
 		return [
 			['testSetCORSAPIHeader'],
 			['testSetCORSAPIHeaderAttribute'],
@@ -89,7 +89,7 @@ class CORSMiddlewareTest extends \Test\TestCase {
 		$this->assertFalse(array_key_exists('Access-Control-Allow-Origin', $headers));
 	}
 
-	public function dataNoOriginHeaderNoCORSHEADER(): array {
+	public static function dataNoOriginHeaderNoCORSHEADER(): array {
 		return [
 			['testNoOriginHeaderNoCORSHEADER'],
 			['testNoOriginHeaderNoCORSHEADERAttribute'],
@@ -113,7 +113,7 @@ class CORSMiddlewareTest extends \Test\TestCase {
 		$this->assertFalse(array_key_exists('Access-Control-Allow-Origin', $headers));
 	}
 
-	public function dataCorsIgnoredIfWithCredentialsHeaderPresent(): array {
+	public static function dataCorsIgnoredIfWithCredentialsHeaderPresent(): array {
 		return [
 			['testCorsIgnoredIfWithCredentialsHeaderPresent'],
 			['testCorsAttributeIgnoredIfWithCredentialsHeaderPresent'],
@@ -143,7 +143,7 @@ class CORSMiddlewareTest extends \Test\TestCase {
 		$middleware->afterController($this->controller, $method, $response);
 	}
 
-	public function dataNoCORSOnAnonymousPublicPage(): array {
+	public static function dataNoCORSOnAnonymousPublicPage(): array {
 		return [
 			['testNoCORSOnAnonymousPublicPage'],
 			['testNoCORSOnAnonymousPublicPageAttribute'],
@@ -177,7 +177,7 @@ class CORSMiddlewareTest extends \Test\TestCase {
 		$middleware->beforeController($this->controller, $method);
 	}
 
-	public function dataCORSShouldNeverAllowCookieAuth(): array {
+	public static function dataCORSShouldNeverAllowCookieAuth(): array {
 		return [
 			['testCORSShouldNeverAllowCookieAuth'],
 			['testCORSShouldNeverAllowCookieAuthAttribute'],
@@ -211,7 +211,7 @@ class CORSMiddlewareTest extends \Test\TestCase {
 		$middleware->beforeController($this->controller, $method);
 	}
 
-	public function dataCORSShouldRelogin(): array {
+	public static function dataCORSShouldRelogin(): array {
 		return [
 			['testCORSShouldRelogin'],
 			['testCORSAttributeShouldRelogin'],
@@ -242,7 +242,7 @@ class CORSMiddlewareTest extends \Test\TestCase {
 		$middleware->beforeController($this->controller, $method);
 	}
 
-	public function dataCORSShouldFailIfPasswordLoginIsForbidden(): array {
+	public static function dataCORSShouldFailIfPasswordLoginIsForbidden(): array {
 		return [
 			['testCORSShouldFailIfPasswordLoginIsForbidden'],
 			['testCORSAttributeShouldFailIfPasswordLoginIsForbidden'],
@@ -275,7 +275,7 @@ class CORSMiddlewareTest extends \Test\TestCase {
 		$middleware->beforeController($this->controller, $method);
 	}
 
-	public function dataCORSShouldNotAllowCookieAuth(): array {
+	public static function dataCORSShouldNotAllowCookieAuth(): array {
 		return [
 			['testCORSShouldNotAllowCookieAuth'],
 			['testCORSAttributeShouldNotAllowCookieAuth'],

tests/lib/AppFramework/Middleware/Security/PasswordConfirmationMiddlewareTest.php

@@ -162,7 +162,7 @@ class PasswordConfirmationMiddlewareTest extends TestCase {
 
 
 
-	public function dataProvider() {
+	public static function dataProvider(): array {
 		return [
 			['foo', 2000, 4000, true],
 			['foo', 2000, 3000, false],

tests/lib/AppFramework/Middleware/Security/SameSiteCookieMiddlewareTest.php

@@ -103,7 +103,7 @@ class SameSiteCookieMiddlewareTest extends TestCase {
 
 		$middleware = $this->getMockBuilder(SameSiteCookieMiddleware::class)
 			->setConstructorArgs([$this->request, $this->reflector])
-			->setMethods(['setSameSiteCookie'])
+			->onlyMethods(['setSameSiteCookie'])
 			->getMock();
 
 		$middleware->expects($this->once())

tests/lib/AppFramework/Middleware/Security/SecurityMiddlewareTest.php

@@ -125,7 +125,7 @@ class SecurityMiddlewareTest extends \Test\TestCase {
 		);
 	}
 
-	public function dataNoCSRFRequiredPublicPage(): array {
+	public static function dataNoCSRFRequiredPublicPage(): array {
 		return [
 			['testAnnotationNoCSRFRequiredPublicPage'],
 			['testAnnotationNoCSRFRequiredAttributePublicPage'],
@@ -134,21 +134,21 @@ class SecurityMiddlewareTest extends \Test\TestCase {
 		];
 	}
 
-	public function dataPublicPage(): array {
+	public static function dataPublicPage(): array {
 		return [
 			['testAnnotationPublicPage'],
 			['testAttributePublicPage'],
 		];
 	}
 
-	public function dataNoCSRFRequired(): array {
+	public static function dataNoCSRFRequired(): array {
 		return [
 			['testAnnotationNoCSRFRequired'],
 			['testAttributeNoCSRFRequired'],
 		];
 	}
 
-	public function dataPublicPageStrictCookieRequired(): array {
+	public static function dataPublicPageStrictCookieRequired(): array {
 		return [
 			['testAnnotationPublicPageStrictCookieRequired'],
 			['testAnnotationStrictCookieRequiredAttributePublicPage'],
@@ -157,28 +157,28 @@ class SecurityMiddlewareTest extends \Test\TestCase {
 		];
 	}
 
-	public function dataNoCSRFRequiredPublicPageStrictCookieRequired(): array {
+	public static function dataNoCSRFRequiredPublicPageStrictCookieRequired(): array {
 		return [
 			['testAnnotationNoCSRFRequiredPublicPageStrictCookieRequired'],
 			['testAttributeNoCSRFRequiredPublicPageStrictCookiesRequired'],
 		];
 	}
 
-	public function dataNoAdminRequiredNoCSRFRequired(): array {
+	public static function dataNoAdminRequiredNoCSRFRequired(): array {
 		return [
 			['testAnnotationNoAdminRequiredNoCSRFRequired'],
 			['testAttributeNoAdminRequiredNoCSRFRequired'],
 		];
 	}
 
-	public function dataNoAdminRequiredNoCSRFRequiredPublicPage(): array {
+	public static function dataNoAdminRequiredNoCSRFRequiredPublicPage(): array {
 		return [
 			['testAnnotationNoAdminRequiredNoCSRFRequiredPublicPage'],
 			['testAttributeNoAdminRequiredNoCSRFRequiredPublicPage'],
 		];
 	}
 
-	public function dataNoCSRFRequiredSubAdminRequired(): array {
+	public static function dataNoCSRFRequiredSubAdminRequired(): array {
 		return [
 			['testAnnotationNoCSRFRequiredSubAdminRequired'],
 			['testAnnotationNoCSRFRequiredAttributeSubAdminRequired'],
@@ -429,7 +429,7 @@ class SecurityMiddlewareTest extends \Test\TestCase {
 		$this->middleware->beforeController($this->controller, $method);
 	}
 
-	public function dataCsrfOcsController(): array {
+	public static function dataCsrfOcsController(): array {
 		return [
 			[NormalController::class, false, false, true],
 			[NormalController::class, false,  true, true],
@@ -659,7 +659,7 @@ class SecurityMiddlewareTest extends \Test\TestCase {
 	/**
 	 * @return array
 	 */
-	public function exceptionProvider() {
+	public static function exceptionProvider(): array {
 		return [
 			[
 				new AppNotEnabledException(),

tests/lib/AppFramework/OCS/V2ResponseTest.php

@@ -23,7 +23,7 @@ class V2ResponseTest extends \Test\TestCase {
 		$this->assertEquals($expected, $response->getStatus());
 	}
 
-	public function providesStatusCodes(): array {
+	public static function providesStatusCodes(): array {
 		return [
 			[Http::STATUS_OK, 200],
 			[Http::STATUS_BAD_REQUEST, 104],

tests/lib/AppFramework/Services/AppConfigTest.php

@@ -28,7 +28,7 @@ class AppConfigTest extends TestCase {
 		parent::setUp();
 		$this->config = $this->createMock(IConfig::class);
 		$this->appConfigCore = $this->createMock(AppConfigCore::class);
-		
+
 		$this->appConfig = new AppConfig($this->config, $this->appConfigCore, self::TEST_APPID);
 	}
 
@@ -46,7 +46,7 @@ class AppConfigTest extends TestCase {
 	 * @return array
 	 * @see testHasAppKey
 	 */
-	public function providerHasAppKey(): array {
+	public static function providerHasAppKey(): array {
 		return [
 			// lazy, expected
 			[false, true],
@@ -76,7 +76,7 @@ class AppConfigTest extends TestCase {
 	 * @return array
 	 * @see testIsSensitive
 	 */
-	public function providerIsSensitive(): array {
+	public static function providerIsSensitive(): array {
 		return [
 			// lazy, expected
 			[false, true],
@@ -123,7 +123,7 @@ class AppConfigTest extends TestCase {
 	 * @return array
 	 * @see testIsLazy
 	 */
-	public function providerIsLazy(): array {
+	public static function providerIsLazy(): array {
 		return [
 			// expected
 			[true],
@@ -161,7 +161,7 @@ class AppConfigTest extends TestCase {
 	 * @return array
 	 * @see testGetAllAppValues
 	 */
-	public function providerGetAllAppValues(): array {
+	public static function providerGetAllAppValues(): array {
 		return [
 			// key, filtered
 			['', false],
@@ -214,7 +214,7 @@ class AppConfigTest extends TestCase {
 	 * @see testSetAppValueArray
 	 * @see testSetAppValueArrayException
 	 */
-	public function providerSetAppValue(): array {
+	public static function providerSetAppValue(): array {
 		return [
 			// lazy, sensitive, expected
 			[false, false, true],
@@ -340,7 +340,7 @@ class AppConfigTest extends TestCase {
 	 * @return array
 	 * @see testSetAppValueBool
 	 */
-	public function providerSetAppValueBool(): array {
+	public static function providerSetAppValueBool(): array {
 		return [
 			// lazy, expected
 			[false, true],
@@ -456,7 +456,7 @@ class AppConfigTest extends TestCase {
 	 * @see testGetAppValueArray
 	 * @see testGetAppValueArrayException
 	 */
-	public function providerGetAppValue(): array {
+	public static function providerGetAppValue(): array {
 		return [
 			// lazy, exist
 			[false, false],

tests/lib/AppFramework/Utility/SimpleContainerTest.php

@@ -191,7 +191,7 @@ class SimpleContainerTest extends \Test\TestCase {
 			$this->container->query('test'), $this->container->query('test1'));
 	}
 
-	public function sanitizeNameProvider() {
+	public static function sanitizeNameProvider(): array {
 		return [
 			['ABC\\Foo', 'ABC\\Foo'],
 			['\\ABC\\Foo', '\\ABC\\Foo'],