Skip to content

[stable22] Fix psalm #30826

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
skjnldsv merged 2 commits into from
Jan 27, 2022
Merged

[stable22] Fix psalm #30826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0262cc3
Fix psalm
CarlSchwan Jan 24, 2022
57514e4
Psalm fixing
CarlSchwan Jan 26, 2022
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
3 changes: 2 additions & 1 deletion .php_cs.dist → .php-cs-fixer.dist.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@

declare(strict_types=1);

require_once './lib/composer/autoload.php';
require_once './vendor-bin/cs-fixer/vendor/autoload.php';

use Nextcloud\CodingStandard\Config;

$config = new Config();
$config
->getFinder()
->ignoreVCSIgnored(true)
->exclude('config')
->exclude('data')
->notPath('3rdparty')
Expand Down
2 changes: 1 addition & 1 deletion apps/user_ldap/lib/Access.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1753,7 +1753,7 @@ private function detectUuidAttribute($dn, $isUser = true, $force = false, array
}

$attribute = $this->connection->getFromCache($uuidAttr);
if (!$attribute === null) {
if ($attribute !== null) {
$this->connection->$uuidAttr = $attribute;
return true;
}
Expand Down
2 changes: 2 additions & 0 deletions apps/user_status/lib/Db/UserStatusMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
*
* @package OCA\UserStatus\Db
*
* @psalm-suppress MoreSpecificImplementedParamType
*
* @method UserStatus insert(UserStatus $entity)
* @method UserStatus update(UserStatus $entity)
* @method UserStatus insertOrUpdate(UserStatus $entity)
Expand Down
3 changes: 2 additions & 1 deletion build/files-checker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
'.jshintrc',
'.mailmap',
'.npmignore',
'.php_cs.dist',
'.php-cs-fixer.dist.php',
'.scrutinizer.yml',
'.tag',
'.tx',
Expand Down Expand Up @@ -85,6 +85,7 @@
'tests',
'themes',
'version.php',
'vendor-bin',
'webpack.common.js',
'webpack.dev.js',
'webpack.prod.js',
Expand Down
Loading