fix(AppFramework): Adjust types so PHPStan understands them

provokateurin · provokateurin · commit c979a7dff507 · 2026-02-05T12:46:01.000+01:00
Signed-off-by: provokateurin &lt;kate@provokateurin.de&gt;
diff --git a/lib/private/AppFramework/OCS/BaseResponse.php b/lib/private/AppFramework/OCS/BaseResponse.php
@@ -11,10 +11,9 @@
 use OCP\AppFramework\Http\Response;
 
 /**
- * @psalm-import-type DataResponseType from DataResponse
  * @template S of Http::STATUS_*
- * @template-covariant T of DataResponseType
- * @template H of array<string, mixed>
+ * @template-covariant T of array|int|float|string|bool|object|null|\stdClass|\JsonSerializable
+ * @template-covariant H of array<string, mixed>
  * @template-extends Response<Http::STATUS_*, array<string, mixed>>
  */
 abstract class BaseResponse extends Response {
diff --git a/lib/private/AppFramework/OCS/V1Response.php b/lib/private/AppFramework/OCS/V1Response.php
@@ -7,15 +7,13 @@
 namespace OC\AppFramework\OCS;
 
 use OCP\AppFramework\Http;
-use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCSController;
 
 /**
- * @psalm-import-type DataResponseType from DataResponse
  * @template S of Http::STATUS_*
- * @template-covariant T of DataResponseType
- * @template H of array<string, mixed>
- * @template-extends BaseResponse<Http::STATUS_*, DataResponseType, array<string, mixed>>
+ * @template-covariant T of array|int|float|string|bool|object|null|\stdClass|\JsonSerializable
+ * @template-covariant H of array<string, mixed>
+ * @template-extends BaseResponse<Http::STATUS_*, array|int|float|string|bool|object|null|\stdClass|\JsonSerializable, array<string, mixed>>
  */
 class V1Response extends BaseResponse {
 	/**
diff --git a/lib/private/AppFramework/OCS/V2Response.php b/lib/private/AppFramework/OCS/V2Response.php
@@ -7,15 +7,13 @@
 namespace OC\AppFramework\OCS;
 
 use OCP\AppFramework\Http;
-use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCSController;
 
 /**
- * @psalm-import-type DataResponseType from DataResponse
  * @template S of Http::STATUS_*
- * @template-covariant T of DataResponseType
- * @template H of array<string, mixed>
- * @template-extends BaseResponse<Http::STATUS_*, DataResponseType, array<string, mixed>>
+ * @template-covariant T of array|int|float|string|bool|object|null|\stdClass|\JsonSerializable
+ * @template-covariant H of array<string, mixed>
+ * @template-extends BaseResponse<Http::STATUS_*, array|int|float|string|bool|object|null|\stdClass|\JsonSerializable, array<string, mixed>>
  */
 class V2Response extends BaseResponse {
 	/**
diff --git a/lib/public/AppFramework/Http/DataDisplayResponse.php b/lib/public/AppFramework/Http/DataDisplayResponse.php
@@ -14,7 +14,7 @@
  *
  * @since 8.1.0
  * @template S of Http::STATUS_*
- * @template H of array<string, mixed>
+ * @template-covariant H of array<string, mixed>
  * @template-extends Response<Http::STATUS_*, array<string, mixed>>
  */
 class DataDisplayResponse extends Response {
diff --git a/lib/public/AppFramework/Http/DataDownloadResponse.php b/lib/public/AppFramework/Http/DataDownloadResponse.php
@@ -15,7 +15,7 @@
  * @since 8.0.0
  * @template S of Http::STATUS_*
  * @template C of string
- * @template H of array<string, mixed>
+ * @template-covariant H of array<string, mixed>
  * @template-extends DownloadResponse<Http::STATUS_*, string, array<string, mixed>>
  */
 class DataDownloadResponse extends DownloadResponse {
diff --git a/lib/public/AppFramework/Http/DataResponse.php b/lib/public/AppFramework/Http/DataResponse.php
@@ -13,10 +13,9 @@
  * A generic DataResponse class that is used to return generic data responses
  * for responders to transform
  * @since 8.0.0
- * @psalm-type DataResponseType = array|int|float|string|bool|object|null|\stdClass|\JsonSerializable
  * @template S of Http::STATUS_*
- * @template-covariant T of DataResponseType
- * @template H of array<string, mixed>
+ * @template-covariant T of array|int|float|string|bool|object|null|\stdClass|\JsonSerializable
+ * @template-covariant H of array<string, mixed>
  * @template-extends Response<Http::STATUS_*, array<string, mixed>>
  */
 class DataResponse extends Response {
diff --git a/lib/public/AppFramework/Http/DownloadResponse.php b/lib/public/AppFramework/Http/DownloadResponse.php
@@ -14,7 +14,7 @@
  * @since 7.0.0
  * @template S of Http::STATUS_*
  * @template C of string
- * @template H of array<string, mixed>
+ * @template-covariant H of array<string, mixed>
  * @template-extends Response<Http::STATUS_*, array<string, mixed>>
  */
 class DownloadResponse extends Response {
diff --git a/lib/public/AppFramework/Http/FileDisplayResponse.php b/lib/public/AppFramework/Http/FileDisplayResponse.php
@@ -15,7 +15,7 @@
  *
  * @since 11.0.0
  * @template S of Http::STATUS_*
- * @template H of array<string, mixed>
+ * @template-covariant H of array<string, mixed>
  * @template-extends Response<Http::STATUS_*, array<string, mixed>>
  */
 class FileDisplayResponse extends Response implements ICallbackResponse {
diff --git a/lib/public/AppFramework/Http/JSONResponse.php b/lib/public/AppFramework/Http/JSONResponse.php
@@ -14,7 +14,7 @@
  * @since 6.0.0
  * @template S of Http::STATUS_*
  * @template-covariant T of null|string|int|float|bool|array|\stdClass|\JsonSerializable
- * @template H of array<string, mixed>
+ * @template-covariant H of array<string, mixed>
  * @template-extends Response<Http::STATUS_*, array<string, mixed>>
  */
 class JSONResponse extends Response {
diff --git a/lib/public/AppFramework/Http/NotFoundResponse.php b/lib/public/AppFramework/Http/NotFoundResponse.php
@@ -13,7 +13,7 @@
  * A generic 404 response showing an 404 error page as well to the end-user
  * @since 8.1.0
  * @template S of Http::STATUS_*
- * @template H of array<string, mixed>
+ * @template-covariant H of array<string, mixed>
  * @template-extends TemplateResponse<Http::STATUS_*, array<string, mixed>>
  */
 class NotFoundResponse extends TemplateResponse {
diff --git a/lib/public/AppFramework/Http/RedirectResponse.php b/lib/public/AppFramework/Http/RedirectResponse.php
@@ -13,7 +13,7 @@
  * Redirects to a different URL
  * @since 7.0.0
  * @template S of Http::STATUS_*
- * @template H of array<string, mixed>
+ * @template-covariant H of array<string, mixed>
  * @template-extends Response<Http::STATUS_*, array<string, mixed>>
  */
 class RedirectResponse extends Response {
diff --git a/lib/public/AppFramework/Http/RedirectToDefaultAppResponse.php b/lib/public/AppFramework/Http/RedirectToDefaultAppResponse.php
@@ -17,7 +17,7 @@
  * @since 16.0.0
  * @deprecated 23.0.0 Use RedirectResponse() with IURLGenerator::linkToDefaultPageUrl() instead
  * @template S of Http::STATUS_*
- * @template H of array<string, mixed>
+ * @template-covariant H of array<string, mixed>
  * @template-extends RedirectResponse<Http::STATUS_*, array<string, mixed>>
  */
 class RedirectToDefaultAppResponse extends RedirectResponse {
diff --git a/lib/public/AppFramework/Http/Response.php b/lib/public/AppFramework/Http/Response.php
@@ -21,7 +21,7 @@
  * It handles headers, HTTP status code, last modified and ETag.
  * @since 6.0.0
  * @template S of Http::STATUS_*
- * @template H of array<string, mixed>
+ * @template-covariant H of array<string, mixed>
  */
 class Response {
 	/**
diff --git a/lib/public/AppFramework/Http/StandaloneTemplateResponse.php b/lib/public/AppFramework/Http/StandaloneTemplateResponse.php
@@ -17,7 +17,7 @@
  *
  * @since 16.0.0
  * @template S of Http::STATUS_*
- * @template H of array<string, mixed>
+ * @template-covariant H of array<string, mixed>
  * @template-extends TemplateResponse<Http::STATUS_*, array<string, mixed>>
  */
 class StandaloneTemplateResponse extends TemplateResponse {
diff --git a/lib/public/AppFramework/Http/StreamResponse.php b/lib/public/AppFramework/Http/StreamResponse.php
@@ -14,7 +14,7 @@
  *
  * @since 8.1.0
  * @template S of Http::STATUS_*
- * @template H of array<string, mixed>
+ * @template-covariant H of array<string, mixed>
  * @template-extends Response<Http::STATUS_*, array<string, mixed>>
  */
 class StreamResponse extends Response implements ICallbackResponse {
diff --git a/lib/public/AppFramework/Http/StreamTraversableResponse.php b/lib/public/AppFramework/Http/StreamTraversableResponse.php
@@ -17,7 +17,7 @@
  *
  * @since 33.0.0
  * @template S of Http::STATUS_*
- * @template H of array<string, mixed>
+ * @template-covariant H of array<string, mixed>
  * @template-extends Response<Http::STATUS_*, array<string, mixed>>
  */
 class StreamTraversableResponse extends Response implements ICallbackResponse {
diff --git a/lib/public/AppFramework/Http/Template/PublicTemplateResponse.php b/lib/public/AppFramework/Http/Template/PublicTemplateResponse.php
@@ -15,7 +15,7 @@
  * Class PublicTemplateResponse
  *
  * @since 14.0.0
- * @template H of array<string, mixed>
+ * @template-covariant H of array<string, mixed>
  * @template S of Http::STATUS_*
  * @template-extends TemplateResponse<Http::STATUS_*, array<string, mixed>>
  */
diff --git a/lib/public/AppFramework/Http/TemplateResponse.php b/lib/public/AppFramework/Http/TemplateResponse.php
@@ -20,7 +20,7 @@
  * @since 6.0.0
  *
  * @template S of Http::STATUS_*
- * @template H of array<string, mixed>
+ * @template-covariant H of array<string, mixed>
  * @template-extends Response<Http::STATUS_*, array<string, mixed>>
  */
 class TemplateResponse extends Response {
diff --git a/lib/public/AppFramework/Http/TextPlainResponse.php b/lib/public/AppFramework/Http/TextPlainResponse.php
@@ -13,7 +13,7 @@
  * A renderer for text responses
  * @since 22.0.0
  * @template S of Http::STATUS_*
- * @template H of array<string, mixed>
+ * @template-covariant H of array<string, mixed>
  * @template-extends Response<Http::STATUS_*, array<string, mixed>>
  */
 class TextPlainResponse extends Response {
diff --git a/lib/public/AppFramework/Http/TooManyRequestsResponse.php b/lib/public/AppFramework/Http/TooManyRequestsResponse.php
@@ -15,7 +15,7 @@
  * A generic 429 response showing an 404 error page as well to the end-user
  * @since 19.0.0
  * @template S of Http::STATUS_*
- * @template H of array<string, mixed>
+ * @template-covariant H of array<string, mixed>
  * @template-extends Response<Http::STATUS_*, array<string, mixed>>
  */
 class TooManyRequestsResponse extends Response {
diff --git a/lib/public/AppFramework/Http/ZipResponse.php b/lib/public/AppFramework/Http/ZipResponse.php
@@ -17,7 +17,7 @@
  *
  * @since 15.0.0
  * @template S of Http::STATUS_*
- * @template H of array<string, mixed>
+ * @template-covariant H of array<string, mixed>
  * @template-extends Response<Http::STATUS_*, array<string, mixed>>
  */
 class ZipResponse extends Response implements ICallbackResponse {

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`*`
`15`	`15`	`* @since 8.1.0`
`16`	`16`	`* @template S of Http::STATUS_*`
`17`		`- * @template H of array<string, mixed>`
	`17`	`+ * @template-covariant H of array<string, mixed>`
`18`	`18`	`* @template-extends Response<Http::STATUS_*, array<string, mixed>>`
`19`	`19`	`*/`
`20`	`20`	`class DataDisplayResponse extends Response {`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*`
`16`	`16`	`* @since 11.0.0`
`17`	`17`	`* @template S of Http::STATUS_*`
`18`		`- * @template H of array<string, mixed>`
	`18`	`+ * @template-covariant H of array<string, mixed>`
`19`	`19`	`* @template-extends Response<Http::STATUS_*, array<string, mixed>>`
`20`	`20`	`*/`
`21`	`21`	`class FileDisplayResponse extends Response implements ICallbackResponse {`