diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2021-11-04 11:48:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-04 11:48:51 +0100 |
| commit | c6429e6cd19c57582364338362e543580821cf99 (patch) | |
| tree | 77a25ef39fcb84a9b42be75127e3b8e710202e28 | |
| parent | 0dc51320e8bdbf0f4b14ced38b0a6fbaddf8b81a (diff) | |
| parent | 421d8ac4b3ede4b67ed7ffeecbf58f7d7ca6d0a6 (diff) | |
| download | nextcloud-server-c6429e6cd19c57582364338362e543580821cf99.tar.gz nextcloud-server-c6429e6cd19c57582364338362e543580821cf99.zip | |
Merge pull request #29547 from nextcloud/automated/noid/psalm-baseline-update
| -rw-r--r-- | .github/workflows/update-psalm-baseline.yml | 2 | ||||
| -rw-r--r-- | build/psalm-baseline.xml | 19 | ||||
| -rw-r--r-- | lib/private/Files/View.php | 4 |
3 files changed, 4 insertions, 21 deletions
diff --git a/.github/workflows/update-psalm-baseline.yml b/.github/workflows/update-psalm-baseline.yml index 3816fd4027d..b5b38cd888b 100644 --- a/.github/workflows/update-psalm-baseline.yml +++ b/.github/workflows/update-psalm-baseline.yml @@ -42,6 +42,8 @@ jobs: author: nextcloud-command <nextcloud-command@users.noreply.github.com> signoff: true branch: automated/noid/psalm-baseline-update + # Make sure we can open multiple PRs + branch-suffix: timestamp title: '[Automated] Update psalm-baseline.xml' body: | Auto-generated update psalm-baseline.xml with fixed psalm warnings diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml index 156599e8b41..bdcdeb5796a 100644 --- a/build/psalm-baseline.xml +++ b/build/psalm-baseline.xml @@ -4261,11 +4261,6 @@ <code>[]</code> </InvalidReturnStatement> </file> - <file src="lib/private/Preview/Bitmap.php"> - <ImplicitToStringCast occurrences="1"> - <code>$bp</code> - </ImplicitToStringCast> - </file> <file src="lib/private/Preview/Generator.php"> <InvalidArgument occurrences="2"> <code>$maxPreviewImage</code> @@ -4305,11 +4300,6 @@ <code>$provider->getThumbnail($file, $maxWidth, $maxHeight)</code> </NullableReturnStatement> </file> - <file src="lib/private/Preview/HEIC.php"> - <ImplicitToStringCast occurrences="1"> - <code>$bp</code> - </ImplicitToStringCast> - </file> <file src="lib/private/Preview/Movie.php"> <InvalidScalarArgument occurrences="2"> <code>$second</code> @@ -4332,11 +4322,6 @@ <code>string</code> </InvalidReturnType> </file> - <file src="lib/private/Preview/SVG.php"> - <ImplicitToStringCast occurrences="1"> - <code>$svg</code> - </ImplicitToStringCast> - </file> <file src="lib/private/RedisFactory.php"> <InvalidScalarArgument occurrences="1"> <code>\RedisCluster::OPT_SLAVE_FAILOVER</code> @@ -4982,10 +4967,6 @@ <RedundantCondition occurrences="1"> <code>$isWritable</code> </RedundantCondition> - <TypeDoesNotContainType occurrences="2"> - <code>get_class($resource) === 'GdImage'</code> - <code>get_class($this->resource) === 'GdImage'</code> - </TypeDoesNotContainType> </file> <file src="lib/private/legacy/OC_JSON.php"> <InvalidScalarArgument occurrences="1"> diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php index 113290e2686..f2d91065b9a 100644 --- a/lib/private/Files/View.php +++ b/lib/private/Files/View.php @@ -1082,7 +1082,7 @@ class View { * @param string $type * @param string $path * @param bool $raw - * @return bool|null|string + * @return bool|string */ public function hash($type, $path, $raw = false) { $postFix = (substr($path, -1) === '/') ? '/' : ''; @@ -1104,7 +1104,7 @@ class View { return $storage->hash($type, $internalPath, $raw); } } - return null; + return false; } /** |