1 files changed, 12 insertions, 35 deletions

diff --git a/apps/settings/tests/Controller/DelegationControllerTest.php b/apps/settings/tests/Controller/DelegationControllerTest.php
index 64157427fa4..c4cbe67466b 100644
--- a/apps/settings/tests/Controller/DelegationControllerTest.php
+++ b/apps/settings/tests/Controller/DelegationControllerTest.php
@@ -1,56 +1,33 @@
 <?php
+
 /**
- * @copyright Copyright (c) 2021 Nextcloud GmbH
- *
- * @author Carl Schwan <carl@carlschwan.eu>
- *
- * @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 <https://www.gnu.org/licenses/>.
- *
+ * SPDX-FileCopyrightText: 2021 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-
-
 namespace OCA\Settings\Tests\Controller\Admin;
 
 use OC\Settings\AuthorizedGroup;
 use OCA\Settings\Controller\AuthorizedGroupController;
 use OCA\Settings\Service\AuthorizedGroupService;
 use OCP\IRequest;
+use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;
 
 class DelegationControllerTest extends TestCase {
-
-	/** @var AuthorizedGroupService */
-	private $service;
-
-	/** @var IRequest */
-	private $request;
-
-	/** @var AuthorizedGroupController */
-	private $controller;
+	private AuthorizedGroupService&MockObject $service;
+	private IRequest&MockObject $request;
+	private AuthorizedGroupController $controller;
 
 	protected function setUp(): void {
 		parent::setUp();
-		$this->request = $this->getMockBuilder(IRequest::class)->getMock();
-		$this->service = $this->getMockBuilder(AuthorizedGroupService::class)->disableOriginalConstructor()->getMock();
+		$this->request = $this->createMock(IRequest::class);
+		$this->service = $this->createMock(AuthorizedGroupService::class);
 		$this->controller = new AuthorizedGroupController(
 			'settings', $this->request, $this->service
 		);
 	}
 
-	public function testSaveSettings() {
+	public function testSaveSettings(): void {
 		$setting = 'MySecretSetting';
 		$oldGroups = [];
 		$oldGroups[] = AuthorizedGroup::fromParams(['groupId' => 'hello', 'class' => $setting]);
@@ -59,7 +36,7 @@ class DelegationControllerTest extends TestCase {
 		$this->service->expects($this->once())
 			->method('findExistingGroupsForClass')
 			->with('MySecretSetting')
-			->will($this->returnValue($oldGroups));
+			->willReturn($oldGroups);
 
 		$this->service->expects($this->once())
 			->method('delete')
@@ -68,7 +45,7 @@ class DelegationControllerTest extends TestCase {
 		$this->service->expects($this->once())
 			->method('create')
 			->with('world', 'MySecretSetting')
-			->will($this->returnValue(AuthorizedGroup::fromParams(['groupId' => 'world', 'class' => $setting])));
+			->willReturn(AuthorizedGroup::fromParams(['groupId' => 'world', 'class' => $setting]));
 
 		$result = $this->controller->saveSettings([['gid' => 'hello'], ['gid' => 'world']], 'MySecretSetting');