From b1a4b239b84748091c11f94fea7255d96aea301b Mon Sep 17 00:00:00 2001
From: nextcloud-command <nextcloud-command@users.noreply.github.com>
Date: Thu, 4 Nov 2021 09:17:46 +0000
Subject: Update psalm baseline

Signed-off-by: GitHub <noreply@github.com>
---
 build/psalm-baseline.xml | 19 -------------------
 1 file changed, 19 deletions(-)

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-&gt;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-&gt;resource) === 'GdImage'</code>
-    </TypeDoesNotContainType>
   </file>
   <file src="lib/private/legacy/OC_JSON.php">
     <InvalidScalarArgument occurrences="1">
-- 
cgit v1.2.3


From d6152bf98d4a9c86b65536a8be99cf2f64fbde16 Mon Sep 17 00:00:00 2001
From: John Molakvoæ <skjnldsv@protonmail.com>
Date: Thu, 4 Nov 2021 10:24:13 +0100
Subject: Fix psalm
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
---
 lib/private/Files/View.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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;
 	}
 
 	/**
-- 
cgit v1.2.3


From 421d8ac4b3ede4b67ed7ffeecbf58f7d7ca6d0a6 Mon Sep 17 00:00:00 2001
From: John Molakvoæ <skjnldsv@protonmail.com>
Date: Thu, 4 Nov 2021 11:42:34 +0100
Subject: Add branch-suffix to update-psalm-baseline PR creation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
---
 .github/workflows/update-psalm-baseline.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/update-psalm-baseline.yml b/.github/workflows/update-psalm-baseline.yml
index f2b761aa602..181148a6c8b 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
-- 
cgit v1.2.3