diff options
author | Daniel Kesselberg <mail@danielkesselberg.de> | 2020-07-08 14:49:11 +0300 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2020-09-16 17:37:17 +0300 |
commit | 096fe2061137805b4fcc4397a9efaf86e11fecbc (patch) | |
tree | f11d34167c14b50ff4e0184e3cbbb84dacb9ed6d | |
parent | a72edb0d0e79c1f82baa9a08d9e1b505a5e50165 (diff) |
Help static code analysis to understand code.
It adds proper type hints to private namespace to allow private namespace methods.
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
-rw-r--r-- | apps/admin_audit/lib/AppInfo/Application.php | 6 | ||||
-rw-r--r-- | apps/settings/lib/Controller/ChangePasswordController.php | 3 | ||||
-rw-r--r-- | apps/settings/lib/Controller/UsersController.php | 9 | ||||
-rw-r--r-- | lib/private/Group/MetaData.php | 3 |
4 files changed, 14 insertions, 7 deletions
diff --git a/apps/admin_audit/lib/AppInfo/Application.php b/apps/admin_audit/lib/AppInfo/Application.php index b63c361b51f..6803887a815 100644 --- a/apps/admin_audit/lib/AppInfo/Application.php +++ b/apps/admin_audit/lib/AppInfo/Application.php @@ -36,7 +36,8 @@ namespace OCA\AdminAudit\AppInfo; use Closure; use OC\Files\Filesystem; use OC\Files\Node\File; -use OC\Group\Manager; +use OC\Group\Manager as GroupManager; +use OC\User\Session as UserSession; use OCA\AdminAudit\Actions\AppManagement; use OCA\AdminAudit\Actions\Auth; use OCA\AdminAudit\Actions\Console; @@ -134,6 +135,7 @@ class Application extends App implements IBootstrap { Util::connectHook('OC_User', 'post_deleteUser', $userActions, 'delete'); Util::connectHook('OC_User', 'changeUser', $userActions, 'change'); + assert($userSession instanceof UserSession); $userSession->listen('\OC\User', 'postSetPassword', [$userActions, 'setPassword']); $userSession->listen('\OC\User', 'assignedUserId', [$userActions, 'assign']); $userSession->listen('\OC\User', 'postUnassignedUserId', [$userActions, 'unassign']); @@ -143,7 +145,7 @@ class Application extends App implements IBootstrap { IGroupManager $groupManager) { $groupActions = new GroupManagement($logger); - /** @var IGroupManager|Manager $groupManager */ + assert($groupManager instanceof GroupManager); $groupManager->listen('\OC\Group', 'postRemoveUser', [$groupActions, 'removeUser']); $groupManager->listen('\OC\Group', 'postAddUser', [$groupActions, 'addUser']); $groupManager->listen('\OC\Group', 'postDelete', [$groupActions, 'deleteGroup']); diff --git a/apps/settings/lib/Controller/ChangePasswordController.php b/apps/settings/lib/Controller/ChangePasswordController.php index 000c83ab79c..b0fb813b933 100644 --- a/apps/settings/lib/Controller/ChangePasswordController.php +++ b/apps/settings/lib/Controller/ChangePasswordController.php @@ -35,6 +35,7 @@ namespace OCA\Settings\Controller; +use OC\Group\Manager as GroupManager; use OC\HintException; use OC\User\Session; use OCP\App\IAppManager; @@ -58,7 +59,7 @@ class ChangePasswordController extends Controller { /** @var IL10N */ private $l; - /** @var IGroupManager */ + /** @var GroupManager */ private $groupManager; /** @var Session */ diff --git a/apps/settings/lib/Controller/UsersController.php b/apps/settings/lib/Controller/UsersController.php index e228ebd8811..a02ab3d11ae 100644 --- a/apps/settings/lib/Controller/UsersController.php +++ b/apps/settings/lib/Controller/UsersController.php @@ -38,7 +38,10 @@ use OC\Accounts\AccountManager; use OC\AppFramework\Http; use OC\Encryption\Exceptions\ModuleDoesNotExistsException; use OC\ForbiddenException; +use OC\Group\Manager as GroupManager; +use OC\L10N\Factory; use OC\Security\IdentityProof\Manager; +use OC\User\Manager as UserManager; use OCA\FederatedFileSharing\FederatedShareProvider; use OCA\Settings\BackgroundJobs\VerifyUserData; use OCA\Settings\Events\BeforeTemplateRenderedEvent; @@ -63,9 +66,9 @@ use OCP\Mail\IMailer; use function in_array; class UsersController extends Controller { - /** @var IUserManager */ + /** @var UserManager */ private $userManager; - /** @var IGroupManager */ + /** @var GroupManager */ private $groupManager; /** @var IUserSession */ private $userSession; @@ -77,7 +80,7 @@ class UsersController extends Controller { private $l10n; /** @var IMailer */ private $mailer; - /** @var IFactory */ + /** @var Factory */ private $l10nFactory; /** @var IAppManager */ private $appManager; diff --git a/lib/private/Group/MetaData.php b/lib/private/Group/MetaData.php index 21857b6c8f0..a04c631ad54 100644 --- a/lib/private/Group/MetaData.php +++ b/lib/private/Group/MetaData.php @@ -30,6 +30,7 @@ namespace OC\Group; +use OC\Group\Manager as GroupManager; use OCP\IGroupManager; use OCP\IUserSession; @@ -44,7 +45,7 @@ class MetaData { protected $isAdmin; /** @var array */ protected $metaData = []; - /** @var IGroupManager */ + /** @var GroupManager */ protected $groupManager; /** @var bool */ protected $sorting = false; |