wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #8797 from nextcloud/inject-public-igroupmanager-instead-of-private-groupmanager

Browse source 
Inject public IGroupManager instead of private GroupManager
This commit is contained in:
Morris Jobke 2018-03-13 10:42:10 +01:00 committed by GitHub
commit a827160cfa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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,