1 files changed, 11 insertions, 27 deletions

diff --git a/apps/files_sharing/tests/Middleware/OCSShareAPIMiddlewareTest.php b/apps/files_sharing/tests/Middleware/OCSShareAPIMiddlewareTest.php
index c260a65725d..efc6b3f7f7f 100644
--- a/apps/files_sharing/tests/Middleware/OCSShareAPIMiddlewareTest.php
+++ b/apps/files_sharing/tests/Middleware/OCSShareAPIMiddlewareTest.php
@@ -1,25 +1,8 @@
 <?php
+
 /**
- *
- *
- * @author Morris Jobke <hey@morrisjobke.de>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program 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 program.  If not, see <http://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 namespace OCA\Files_Sharing\Tests\Middleware;
 
@@ -36,20 +19,20 @@ use OCP\Share\IManager;
  */
 class OCSShareAPIMiddlewareTest extends \Test\TestCase {
 
-	/** @var IManager|\PHPUnit_Framework_MockObject_MockObject */
+	/** @var IManager|\PHPUnit\Framework\MockObject\MockObject */
 	private $shareManager;
 	/** @var IL10N */
 	private $l;
 	/** @var OCSShareAPIMiddleware */
 	private $middleware;
 
-	public function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
 		$this->shareManager = $this->createMock(IManager::class);
 		$this->l = $this->createMock(IL10N::class);
 
-		$this->l->method('t')->will($this->returnArgument(0));
+		$this->l->method('t')->willReturnArgument(0);
 
 		$this->middleware = new OCSShareAPIMiddleware($this->shareManager, $this->l);
 	}
@@ -90,13 +73,13 @@ class OCSShareAPIMiddlewareTest extends \Test\TestCase {
 	}
 
 	/**
-	 * @dataProvider dataBeforeController
 	 *
 	 * @param Controller $controller
 	 * @param bool $enabled
 	 * @param bool $exception
 	 */
-	public function testBeforeController(Controller $controller, $enabled, $exception) {
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataBeforeController')]
+	public function testBeforeController(Controller $controller, $enabled, $exception): void {
 		$this->shareManager->method('shareApiEnabled')->willReturn($enabled);
 
 		try {
@@ -122,12 +105,12 @@ class OCSShareAPIMiddlewareTest extends \Test\TestCase {
 	}
 
 	/**
-	 * @dataProvider dataAfterController
 	 *
 	 * @param Controller $controller
 	 * @param bool $called
 	 */
-	public function testAfterController(Controller $controller) {
+	#[\PHPUnit\Framework\Attributes\DataProvider('dataAfterController')]
+	public function testAfterController(Controller $controller): void {
 		if ($controller instanceof ShareAPIController) {
 			$controller->expects($this->once())->method('cleanup');
 		}
@@ -136,5 +119,6 @@ class OCSShareAPIMiddlewareTest extends \Test\TestCase {
 			->disableOriginalConstructor()
 			->getMock();
 		$this->middleware->afterController($controller, 'foo', $response);
+		$this->addToAssertionCount(1);
 	}
 }