mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make ChangePasswordController strict 

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2018-03-09 08:52:14 +01:00
parent d2a8dbeac6
commit 5ad89371ed
No known key found for this signature in database
GPG Key ID: F941078878347C0C
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
settings/Controller/ChangePasswordController.php
View File

@ -1,4 +1,5 @@
<?php <?php
declare(strict_types=1);
/** /**
* *
* *
@ -26,12 +27,12 @@
*/ */
namespace OC\Settings\Controller; namespace OC\Settings\Controller;
use OC\Group\Manager as GroupManager;
use OC\HintException; use OC\HintException;
use OC\User\Session; use OC\User\Session;
use OCP\App\IAppManager; use OCP\App\IAppManager;
use OCP\AppFramework\Controller; use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\JSONResponse;
use OCP\IGroupManager;
use OCP\IL10N; use OCP\IL10N;
use OCP\IRequest; use OCP\IRequest;
use OCP\IUser; use OCP\IUser;
@ -49,7 +50,7 @@ class ChangePasswordController extends Controller {
/** @var IL10N */ /** @var IL10N */
private $l; private $l;
/** @var IGroupManager */ /** @var GroupManager */
private $groupManager; private $groupManager;
/** @var Session */ /** @var Session */
@ -58,24 +59,12 @@ class ChangePasswordController extends Controller {
/** @var IAppManager */ /** @var IAppManager */
private $appManager; private $appManager;
/** public function __construct(string $appName,
* ChangePasswordController constructor.
*
* @param string $appName
* @param IRequest $request
* @param $userId
* @param IUserManager $userManager
* @param IUserSession $userSession
* @param IGroupManager $groupManager
* @param IAppManager $appManager
* @param IL10N $l
*/
public function __construct($appName,
IRequest $request, IRequest $request,
$userId, string $userId,
IUserManager $userManager, IUserManager $userManager,
IUserSession $userSession, IUserSession $userSession,
IGroupManager $groupManager, GroupManager $groupManager,
IAppManager $appManager, IAppManager $appManager,
IL10N $l) { IL10N $l) {
parent::__construct($appName, $request); parent::__construct($appName, $request);
@ -98,7 +87,7 @@ class ChangePasswordController extends Controller {
* *
* @return JSONResponse * @return JSONResponse
*/ */
public function changePersonalPassword($oldpassword = '', $newpassword = null) { public function changePersonalPassword(string $oldpassword = '', string $newpassword = null): JSONResponse {
/** @var IUser $user */ /** @var IUser $user */
$user = $this->userManager->checkPassword($this->userId, $oldpassword); $user = $this->userManager->checkPassword($this->userId, $oldpassword);
if ($user === false) { if ($user === false) {
@ -148,7 +137,7 @@ class ChangePasswordController extends Controller {
* *
* @return JSONResponse * @return JSONResponse
*/ */
public function changeUserPassword($username = null, $password = null, $recoveryPassword = null) { public function changeUserPassword(string $username = null, string $password = null, string $recoveryPassword = null): JSONResponse {
if ($username === null) { if ($username === null) {
return new JSONResponse([ return new JSONResponse([
'status' => 'error', 'status' => 'error',