diff options
| author | Vincent Petry <vincent@nextcloud.com> | 2022-12-16 16:16:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-16 16:16:31 +0100 |
| commit | 6737deabbf77fc0b1747ae937f68c4797a600e60 (patch) | |
| tree | 1b8130b87dc11acd5901b368601e6ccfd5e2be78 | |
| parent | 2881a2f6dd19edf582ed2f2030af20bef6c25eab (diff) | |
| parent | 138deec333b0dbfbc44968f2192e1bf2c27e4ee8 (diff) | |
| download | nextcloud-server-6737deabbf77fc0b1747ae937f68c4797a600e60.tar.gz nextcloud-server-6737deabbf77fc0b1747ae937f68c4797a600e60.zip | |
Merge pull request #35784 from nextcloud/chore/strict-login-controller
Make the LoginController strict
| -rw-r--r-- | core/Controller/LoginController.php | 5 | ||||
| -rw-r--r-- | tests/Core/Controller/LoginControllerTest.php | 21 |
2 files changed, 21 insertions, 5 deletions
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php index 4ec6d5c38c4..4c4a12355d2 100644 --- a/core/Controller/LoginController.php +++ b/core/Controller/LoginController.php @@ -1,4 +1,7 @@ <?php + +declare(strict_types=1); + /** * @copyright Copyright (c) 2017, Sandro Lutz <sandro.lutz@temparus.ch> * @copyright Copyright (c) 2016 Joas Schilling <coding@schilljs.com> @@ -227,7 +230,7 @@ class LoginController extends Controller { $user = null; } - $passwordLink = $this->config->getSystemValue('lost_password_link', ''); + $passwordLink = $this->config->getSystemValueString('lost_password_link', ''); $this->initialStateService->provideInitialState( 'core', diff --git a/tests/Core/Controller/LoginControllerTest.php b/tests/Core/Controller/LoginControllerTest.php index b80fde008d5..fae20ae6b74 100644 --- a/tests/Core/Controller/LoginControllerTest.php +++ b/tests/Core/Controller/LoginControllerTest.php @@ -1,4 +1,7 @@ <?php + +declare(strict_types=1); + /** * @author Lukas Reschke <lukas@owncloud.com> * @@ -337,11 +340,16 @@ class LoginControllerTest extends TestCase { ->method('isLoggedIn') ->willReturn(false); $this->config - ->expects($this->exactly(2)) + ->expects(self::once()) ->method('getSystemValue') ->willReturnMap([ ['login_form_autocomplete', true, true], - ['lost_password_link', '', false], + ]); + $this->config + ->expects(self::once()) + ->method('getSystemValueString') + ->willReturnMap([ + ['lost_password_link', '', ''], ]); $user = $this->createMock(IUser::class); $user @@ -386,11 +394,16 @@ class LoginControllerTest extends TestCase { ->method('isLoggedIn') ->willReturn(false); $this->config - ->expects($this->exactly(2)) + ->expects(self::once()) ->method('getSystemValue') ->willReturnMap([ ['login_form_autocomplete', true, true], - ['lost_password_link', '', false], + ]); + $this->config + ->expects(self::once()) + ->method('getSystemValueString') + ->willReturnMap([ + ['lost_password_link', '', ''], ]); $user = $this->createMock(IUser::class); $user->expects($this->once()) |