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

Inject public IGroupManager instead of private GroupManager 

The public "IGroupManager" service returned by the dependency injection
system is automatically initialized with an "OC\Group\Database" backend.
However, no backend is automatically set in private "GroupManager"
instances. Therefore, a private "GroupManager" instance does not work as
expected when initialized through the dependency injection system.

Due to that this commit reverts a previous change in which the public
"IGroupManager" was replaced by a private "GroupManager" instance. That
change was needed when strict types were set, as "getSubAdmin()" is not
part of "IGroupManager" API, so the type had to be changed to
"GroupManager". Until a better solution is found strict types are
disabled again to be able to inject "IGroupManager" and also use
"getSubAdmin()".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
This commit is contained in:
Daniel Calviño Sánchez 2018-03-13 07:29:12 +01:00
parent 3cae276149
commit 044d5a8d01
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
settings/Controller/ChangePasswordController.php
View File

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
// FIXME: disabled for now to be able to inject IGroupManager and also use
// getSubAdmin()
//declare(strict_types=1);
/**
*
*
@ -27,12 +29,12 @@ declare(strict_types=1);
*/
namespace OC\Settings\Controller;
use OC\Group\Manager as GroupManager;
use OC\HintException;
use OC\User\Session;
use OCP\App\IAppManager;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\JSONResponse;
use OCP\IGroupManager;
use OCP\IL10N;
use OCP\IRequest;
use OCP\IUser;
@ -50,7 +52,7 @@ class ChangePasswordController extends Controller {
/** @var IL10N */
private $l;
/** @var GroupManager */
/** @var IGroupManager */
private $groupManager;
/** @var Session */
@ -64,7 +66,7 @@ class ChangePasswordController extends Controller {
string $userId,
IUserManager $userManager,
IUserSession $userSession,
GroupManager $groupManager,
IGroupManager $groupManager,
IAppManager $appManager,
IL10N $l) {
parent::__construct($appName, $request);

10
settings/Controller/UsersController.php
View File

@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
// FIXME: disabled for now to be able to inject IGroupManager and also use
// getSubAdmin()
//declare(strict_types=1);
/**
* @copyright Copyright (c) 2016, ownCloud, Inc.
*
@ -40,7 +42,6 @@ namespace OC\Settings\Controller;
use OC\Accounts\AccountManager;
use OC\AppFramework\Http;
use OC\ForbiddenException;
use OC\Group\Manager as GroupManager;
use OC\HintException;
use OC\Settings\Mailer\NewUserMailHelper;
use OC\Security\IdentityProof\Manager;
@ -52,6 +53,7 @@ use OCP\Files\Config\IUserMountCache;
use OCP\Encryption\IEncryptionModule;
use OCP\Encryption\IManager;
use OCP\IConfig;
use OCP\IGroupManager;
use OCP\IL10N;
use OCP\ILogger;
use OCP\IRequest;
@ -77,7 +79,7 @@ class UsersController extends Controller {
private $isAdmin;
/** @var IUserManager */
private $userManager;
/** @var GroupManager */
/** @var IGroupManager */
private $groupManager;
/** @var IConfig */
private $config;
@ -113,7 +115,7 @@ class UsersController extends Controller {
public function __construct(string $appName,
IRequest $request,
IUserManager $userManager,
GroupManager $groupManager,
IGroupManager $groupManager,
IUserSession $userSession,
IConfig $config,
bool $isAdmin,