Skip to content

Commit

Permalink
Fix psalm not running
Browse files Browse the repository at this point in the history
The issue was that we were using psalm/phar instead of vimeo/psalm. This
caused issue with the custom psalm plugin in buildd/psalm.

This is using the opportunity to also update the psalm version from 3.8
to 3.17 and the php-cs-fixer too.

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
  • Loading branch information
CarlSchwan committed Jan 27, 2022
1 parent 0c63183 commit d69531a
Show file tree
Hide file tree
Showing 65 changed files with 990 additions and 705 deletions.
3 changes: 2 additions & 1 deletion .php_cs.dist → .php-cs-fixer.dist.php
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
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
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
2 changes: 1 addition & 1 deletion build/files-checker.php
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
2 changes: 1 addition & 1 deletion build/integration/features/bootstrap/WebDav.php
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ public function userUploadsBulkedFiles($user, $name1, $content1, $name2, $conten
$body .= $content3."\r\n";
$body .= '--'.$boundary."--\r\n";

$stream = fopen('php://temp','r+');
$stream = fopen('php://temp', 'r+');
fwrite($stream, $body);
rewind($stream);

Expand Down
Loading

0 comments on commit d69531a

Please sign in to comment.