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

Merge pull request #22890 from nextcloud/techdebt/18680/help-static-code-analysis-understand-code 

Help static code analysis to understand code
This commit is contained in:
Roeland Jago Douma 2020-09-17 08:51:20 +02:00 committed by GitHub
parent d788299cbd c6948c2517
commit 05edd1e5d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/admin_audit/lib/AppInfo/Application.php
View File

@ -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']);

3
apps/settings/lib/Controller/ChangePasswordController.php
View File

@ -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 */

9
apps/settings/lib/Controller/UsersController.php
View File

@ -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;

22
build/psalm-baseline.xml
View File

@ -50,13 +50,6 @@
<code>$this-&gt;appRoot</code>
</UndefinedThisPropertyFetch>
</file>
<file src="apps/admin_audit/lib/AppInfo/Application.php">
<UndefinedInterfaceMethod occurrences="3">
<code>listen</code>
<code>listen</code>
<code>listen</code>
</UndefinedInterfaceMethod>
</file>
<file src="apps/cloud_federation_api/lib/Controller/RequestHandlerController.php">
<InvalidScalarArgument occurrences="1">
<code>$e-&gt;getCode()</code>
@ -2159,11 +2152,6 @@
<code>ignoreNextcloudRequirementForApp</code>
</UndefinedInterfaceMethod>
</file>
<file src="apps/settings/lib/Controller/ChangePasswordController.php">
<UndefinedInterfaceMethod occurrences="1">
<code>getSubAdmin</code>
</UndefinedInterfaceMethod>
</file>
<file src="apps/settings/lib/Controller/CheckSetupController.php">
<InvalidArgument occurrences="2">
<code>IDBConnection::CHECK_MISSING_INDEXES_EVENT</code>
@ -2195,13 +2183,6 @@
<code>$this-&gt;l10n-&gt;t('You need to set your user email before being able to send test emails.')</code>
</InvalidArgument>
</file>
<file src="apps/settings/lib/Controller/UsersController.php">
<UndefinedInterfaceMethod occurrences="3">
<code>countUsersOfGroups</code>
<code>countDisabledUsersOfGroups</code>
<code>getLanguages</code>
</UndefinedInterfaceMethod>
</file>
<file src="apps/settings/lib/Hooks.php">
<InvalidArgument occurrences="1">
<code>[$user-&gt;getEMailAddress() =&gt; $user-&gt;getDisplayName()]</code>
@ -5008,9 +4989,6 @@
<code>$sortMode</code>
<code>self::SORT_NONE</code>
</InvalidPropertyAssignmentValue>
<UndefinedInterfaceMethod occurrences="1">
<code>getSubAdmin</code>
</UndefinedInterfaceMethod>
</file>
<file src="lib/private/Http/Client/Response.php">
<InvalidNullableReturnType occurrences="1">

3
lib/private/Group/MetaData.php
View File

@ -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;