1 files changed, 19 insertions, 57 deletions

diff --git a/apps/twofactor_backupcodes/tests/Unit/Controller/SettingsControllerTest.php b/apps/twofactor_backupcodes/tests/Unit/Controller/SettingsControllerTest.php
index 8427c10e839..02c42b65148 100644
--- a/apps/twofactor_backupcodes/tests/Unit/Controller/SettingsControllerTest.php
+++ b/apps/twofactor_backupcodes/tests/Unit/Controller/SettingsControllerTest.php
@@ -1,25 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 /**
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- *
- * @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\TwoFactorBackupCodes\Tests\Unit\Controller;
 
 use OCA\TwoFactorBackupCodes\Controller\SettingsController;
@@ -28,71 +14,47 @@ use OCP\AppFramework\Http\JSONResponse;
 use OCP\IRequest;
 use OCP\IUser;
 use OCP\IUserSession;
+use PHPUnit\Framework\MockObject\MockObject;
 use Test\TestCase;
 
 class SettingsControllerTest extends TestCase {
+	private IRequest&MockObject $request;
+	private BackupCodeStorage&MockObject $storage;
+	private IUserSession&MockObject $userSession;
+	private SettingsController $controller;
 
-	/** @var IRequest|PHPUnit_Framework_MockObject_MockObject */
-	private $request;
-
-	/** @var BackupCodeStorage|PHPUnit_Framework_MockObject_MockObject */
-	private $storage;
-
-	/** @var IUserSession|PHPUnit_Framework_MockObject_MockObject */
-	private $userSession;
-
-	/** @var SettingsController */
-	private $controller;
-
-	protected function setUp() {
+	protected function setUp(): void {
 		parent::setUp();
 
-		$this->request = $this->getMockBuilder(IRequest::class)->getMock();
-		$this->storage = $this->getMockBuilder(BackupCodeStorage::class)
-			->disableOriginalConstructor()
-			->getMock();
-		$this->userSession = $this->getMockBuilder(IUserSession::class)->getMock();
+		$this->request = $this->createMock(IRequest::class);
+		$this->storage = $this->createMock(BackupCodeStorage::class);
+		$this->userSession = $this->createMock(IUserSession::class);
 
 		$this->controller = new SettingsController('twofactor_backupcodes', $this->request, $this->storage, $this->userSession);
 	}
 
-	public function testState() {
-		$user = $this->getMockBuilder(IUser::class)->getMock();
-
-		$this->userSession->expects($this->once())
-			->method('getUser')
-			->will($this->returnValue($user));
-		$this->storage->expects($this->once())
-			->method('getBackupCodesState')
-			->with($user)
-			->will($this->returnValue('state'));
-
-		$this->assertEquals('state', $this->controller->state());
-	}
-
-	public function testCreateCodes() {
-		$user = $this->getMockBuilder(IUser::class)->getMock();
+	public function testCreateCodes(): void {
+		$user = $this->createMock(IUser::class);
 
 		$codes = ['a', 'b'];
 		$this->userSession->expects($this->once())
 			->method('getUser')
-			->will($this->returnValue($user));
+			->willReturn($user);
 		$this->storage->expects($this->once())
 			->method('createCodes')
 			->with($user)
-			->will($this->returnValue($codes));
+			->willReturn($codes);
 		$this->storage->expects($this->once())
 			->method('getBackupCodesState')
 			->with($user)
-			->will($this->returnValue('state'));
+			->willReturn(['state']);
 
 		$expected = [
 			'codes' => $codes,
-			'state' => 'state',
+			'state' => ['state'],
 		];
 		$response = $this->controller->createCodes();
 		$this->assertInstanceOf(JSONResponse::class, $response);
 		$this->assertEquals($expected, $response->getData());
 	}
-
 }