Skip to content

Inject public IGroupManager instead of private GroupManager #8797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 1 commit into from
Mar 13, 2018
Merged

Inject public IGroupManager instead of private GroupManager #8797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions settings/Controller/ChangePasswordController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
/**
*
*
Expand Down Expand Up @@ -27,12 +29,12 @@
*/
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;
Expand All @@ -50,7 +52,7 @@ class ChangePasswordController extends Controller {
/** @var IL10N */
private $l;

/** @var GroupManager */
/** @var IGroupManager */
private $groupManager;

/** @var Session */
Expand All @@ -64,7 +66,7 @@ public function __construct(string $appName,
string $userId,
IUserManager $userManager,
IUserSession $userSession,
GroupManager $groupManager,
IGroupManager $groupManager,
IAppManager $appManager,
IL10N $l) {
parent::__construct($appName, $request);
Expand Down
10 changes: 6 additions & 4 deletions settings/Controller/UsersController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
*
Expand Down Expand Up @@ -40,7 +42,6 @@
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;
Expand All @@ -52,6 +53,7 @@
use OCP\Encryption\IEncryptionModule;
use OCP\Encryption\IManager;
use OCP\IConfig;
use OCP\IGroupManager;
use OCP\IL10N;
use OCP\ILogger;
use OCP\IRequest;
Expand All @@ -77,7 +79,7 @@ class UsersController extends Controller {
private $isAdmin;
/** @var IUserManager */
private $userManager;
/** @var GroupManager */
/** @var IGroupManager */
private $groupManager;
/** @var IConfig */
private $config;
Expand Down Expand Up @@ -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,
Expand Down