1 files changed, 14 insertions, 27 deletions

diff --git a/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php b/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php
index c8adef80966..4efcac2dccf 100644
--- a/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php
+++ b/tests/lib/AppFramework/Controller/AuthPublicShareControllerTest.php
@@ -1,24 +1,8 @@
 <?php
+
 /**
- * @copyright 2018, Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @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: 2018 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
 namespace Test\AppFramework\Controller;
@@ -31,7 +15,6 @@ use OCP\ISession;
 use OCP\IURLGenerator;
 
 class AuthPublicShareControllerTest extends \Test\TestCase {
-
 	/** @var IRequest|\PHPUnit\Framework\MockObject\MockObject */
 	private $request;
 	/** @var ISession|\PHPUnit\Framework\MockObject\MockObject */
@@ -56,7 +39,7 @@ class AuthPublicShareControllerTest extends \Test\TestCase {
 				$this->request,
 				$this->session,
 				$this->urlGenerator
-			])->setMethods([
+			])->onlyMethods([
 				'authFailed',
 				'getPasswordHash',
 				'isAuthenticated',
@@ -69,20 +52,22 @@ class AuthPublicShareControllerTest extends \Test\TestCase {
 			])->getMock();
 	}
 
-	public function testShowAuthenticate() {
+	public function testShowAuthenticate(): void {
 		$expects = new TemplateResponse('core', 'publicshareauth', [], 'guest');
 
 		$this->assertEquals($expects, $this->controller->showAuthenticate());
 	}
 
-	public function testAuthenticateAuthenticated() {
+	public function testAuthenticateAuthenticated(): void {
 		$this->controller->method('isAuthenticated')
 			->willReturn(true);
 
 		$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!');
@@ -92,7 +77,7 @@ class AuthPublicShareControllerTest extends \Test\TestCase {
 		$this->assertSame('myLink!', $result->getRedirectURL());
 	}
 
-	public function testAuthenticateInvalidPassword() {
+	public function testAuthenticateInvalidPassword(): void {
 		$this->controller->setToken('token');
 		$this->controller->method('isPasswordProtected')
 			->willReturn(true);
@@ -112,7 +97,7 @@ class AuthPublicShareControllerTest extends \Test\TestCase {
 		$this->assertEquals($expects, $result);
 	}
 
-	public function testAuthenticateValidPassword() {
+	public function testAuthenticateValidPassword(): void {
 		$this->controller->setToken('token');
 		$this->controller->method('isPasswordProtected')
 			->willReturn(true);
@@ -125,7 +110,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;