1 files changed, 14 insertions, 33 deletions

diff --git a/tests/lib/AppFramework/Middleware/MiddlewareTest.php b/tests/lib/AppFramework/Middleware/MiddlewareTest.php
index bd61aab4673..addd9683122 100644
--- a/tests/lib/AppFramework/Middleware/MiddlewareTest.php
+++ b/tests/lib/AppFramework/Middleware/MiddlewareTest.php
@@ -1,42 +1,26 @@
 <?php
 
 /**
- * ownCloud - App Framework
- *
- * @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt <dev@bernhard-posselt.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-FileCopyrightText: 2016 ownCloud, Inc.
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
 namespace Test\AppFramework\Middleware;
 
+use OC\AppFramework\DependencyInjection\DIContainer;
 use OC\AppFramework\Http\Request;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Middleware;
 use OCP\IConfig;
 use OCP\IRequestId;
-use OC\AppFramework\DependencyInjection\DIContainer;
 
 class ChildMiddleware extends Middleware {
 };
 
 
 class MiddlewareTest extends \Test\TestCase {
-
 	/**
 	 * @var Middleware
 	 */
@@ -52,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(
@@ -67,31 +48,31 @@ class MiddlewareTest extends \Test\TestCase {
 				)
 			])->getMock();
 		$this->exception = new \Exception();
-		$this->response = $this->getMockBuilder(Response::class)->getMock();
+		$this->response = $this->createMock(Response::class);
 	}
 
 
-	public function testBeforeController() {
-		$this->middleware->beforeController($this->controller, null);
+	public function testBeforeController(): void {
+		$this->middleware->beforeController($this->controller, '');
 		$this->assertNull(null);
 	}
 
 
-	public function testAfterExceptionRaiseAgainWhenUnhandled() {
+	public function testAfterExceptionRaiseAgainWhenUnhandled(): void {
 		$this->expectException(\Exception::class);
-		$this->middleware->afterException($this->controller, null, $this->exception);
+		$this->middleware->afterException($this->controller, '', $this->exception);
 	}
 
 
-	public function testAfterControllerReturnResponseWhenUnhandled() {
-		$response = $this->middleware->afterController($this->controller, null, $this->response);
+	public function testAfterControllerReturnResponseWhenUnhandled(): void {
+		$response = $this->middleware->afterController($this->controller, '', $this->response);
 
 		$this->assertEquals($this->response, $response);
 	}
 
 
-	public function testBeforeOutputReturnOutputhenUnhandled() {
-		$output = $this->middleware->beforeOutput($this->controller, null, 'test');
+	public function testBeforeOutputReturnOutputhenUnhandled(): void {
+		$output = $this->middleware->beforeOutput($this->controller, '', 'test');
 
 		$this->assertEquals('test', $output);
 	}