Merge pull request #50058 from nextcloud/backport/50035/stable30

nextcloud · Jan 7, 2025 · 32c7261 · 32c7261
2 parents ef5dc1e + 8b322ff
commit 32c7261
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/build/psalm-baseline.xml b/build/psalm-baseline.xml
@@ -902,11 +902,6 @@
       <code><![CDATA[$cacheData]]></code>
     </MoreSpecificImplementedParamType>
   </file>
-  <file src="apps/files_sharing/lib/Middleware/SharingCheckMiddleware.php">
-    <InvalidArgument>
-      <code><![CDATA[$exception->getMessage()]]></code>
-    </InvalidArgument>
-  </file>
   <file src="apps/files_sharing/lib/MountProvider.php">
     <RedundantFunctionCall>
       <code><![CDATA[array_values]]></code>

diff --git a/lib/public/AppFramework/Http/JSONResponse.php b/lib/public/AppFramework/Http/JSONResponse.php
@@ -13,7 +13,7 @@
  * A renderer for JSON calls
  * @since 6.0.0
  * @template S of int
- * @template-covariant T of array|object|\stdClass|\JsonSerializable
+ * @template-covariant T of null|string|int|float|bool|array|\stdClass|\JsonSerializable
  * @template H of array<string, mixed>
  * @template-extends Response<int, array<string, mixed>>
  */