fix(AppFramework): Adjust types so PHPStan understands them #58098
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,15 +7,12 @@ | |
| namespace OC\AppFramework\OCS; | ||
|
|
||
| use OCP\AppFramework\Http; | ||
| use OCP\AppFramework\OCSController; | ||
|
|
||
| /** | ||
| * @template-covariant S of Http::STATUS_* | ||
| * @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 { | ||
| /** | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,8 +13,8 @@ | |
| * Class DataDisplayResponse | ||
| * | ||
| * @since 8.1.0 | ||
| * @template-covariant S of Http::STATUS_* | ||
| * @template-covariant H of array<string, mixed> | ||
| * @template-extends Response<Http::STATUS_*, array<string, mixed>> | ||
| */ | ||
| class DataDisplayResponse extends Response { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,9 +13,9 @@ | |
| * Class DataDownloadResponse | ||
| * | ||
| * @since 8.0.0 | ||
| * @template-covariant S of Http::STATUS_* | ||
| * @template C of string | ||
| * @template-covariant H of array<string, mixed> | ||
| * @template-extends DownloadResponse<Http::STATUS_*, string, array<string, mixed>> | ||
| */ | ||
| class DataDownloadResponse extends DownloadResponse { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,10 +13,9 @@ | |
| * A generic DataResponse class that is used to return generic data responses | ||
| * for responders to transform | ||
| * @since 8.0.0 | ||
| * @template-covariant S of Http::STATUS_* | ||
| * @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 { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,9 +12,9 @@ | |
| /** | ||
| * Prompts the user to download the a file | ||
| * @since 7.0.0 | ||
| * @template-covariant S of Http::STATUS_* | ||
| * @template C of string | ||
| * @template-covariant H of array<string, mixed> | ||
| * @template-extends Response<Http::STATUS_*, array<string, mixed>> | ||
| */ | ||
| class DownloadResponse extends Response { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,8 +14,8 @@ | |
| * Class FileDisplayResponse | ||
| * | ||
| * @since 11.0.0 | ||
| * @template-covariant S of Http::STATUS_* | ||
| * @template-covariant H of array<string, mixed> | ||
| * @template-extends Response<Http::STATUS_*, array<string, mixed>> | ||
| */ | ||
| class FileDisplayResponse extends Response implements ICallbackResponse { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,9 +12,9 @@ | |
| /** | ||
| * A renderer for JSON calls | ||
| * @since 6.0.0 | ||
| * @template-covariant S of Http::STATUS_* | ||
| * @template-covariant T of null|string|int|float|bool|array|\stdClass|\JsonSerializable | ||
| * @template-covariant H of array<string, mixed> | ||
| * @template-extends Response<Http::STATUS_*, array<string, mixed>> | ||
| */ | ||
| class JSONResponse extends Response { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,8 +12,8 @@ | |
| /** | ||
| * A generic 404 response showing an 404 error page as well to the end-user | ||
| * @since 8.1.0 | ||
| * @template-covariant S of Http::STATUS_* | ||
| * @template-covariant H of array<string, mixed> | ||
| * @template-extends TemplateResponse<Http::STATUS_*, array<string, mixed>> | ||
| */ | ||
| class NotFoundResponse extends TemplateResponse { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,8 +12,8 @@ | |
| /** | ||
| * Redirects to a different URL | ||
| * @since 7.0.0 | ||
| * @template-covariant S of Http::STATUS_* | ||
| * @template-covariant H of array<string, mixed> | ||
| * @template-extends Response<Http::STATUS_*, array<string, mixed>> | ||
| */ | ||
| class RedirectResponse extends Response { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,8 +16,8 @@ | |
| * | ||
| * @since 16.0.0 | ||
| * @deprecated 23.0.0 Use RedirectResponse() with IURLGenerator::linkToDefaultPageUrl() instead | ||
| * @template-covariant S of Http::STATUS_* | ||
| * @template-covariant H of array<string, mixed> | ||
| * @template-extends RedirectResponse<Http::STATUS_*, array<string, mixed>> | ||
| */ | ||
| class RedirectToDefaultAppResponse extends RedirectResponse { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,8 +20,8 @@ | |
| * | ||
| * It handles headers, HTTP status code, last modified and ETag. | ||
| * @since 6.0.0 | ||
| * @template-covariant S of Http::STATUS_* | ||
| * @template-covariant H of array<string, mixed> | ||
| */ | ||
| class Response { | ||
| /** | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,8 +16,8 @@ | |
| * full nextcloud UI. Like the 2FA page, or the grant page in the login flow. | ||
| * | ||
| * @since 16.0.0 | ||
| * @template-covariant S of Http::STATUS_* | ||
| * @template-covariant H of array<string, mixed> | ||
| * @template-extends TemplateResponse<Http::STATUS_*, array<string, mixed>> | ||
| */ | ||
| class StandaloneTemplateResponse extends TemplateResponse { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,8 +13,8 @@ | |
| * Class StreamResponse | ||
| * | ||
| * @since 8.1.0 | ||
| * @template-covariant S of Http::STATUS_* | ||
| * @template-covariant H of array<string, mixed> | ||
| * @template-extends Response<Http::STATUS_*, array<string, mixed>> | ||
| */ | ||
| class StreamResponse extends Response implements ICallbackResponse { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,8 +16,8 @@ | |
| * Class StreamResponse | ||
| * | ||
| * @since 33.0.0 | ||
| * @template-covariant S of Http::STATUS_* | ||
| * @template-covariant H of array<string, mixed> | ||
| * @template-extends Response<Http::STATUS_*, array<string, mixed>> | ||
| */ | ||
| class StreamTraversableResponse extends Response implements ICallbackResponse { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,8 +15,8 @@ | |
| * Class PublicTemplateResponse | ||
| * | ||
| * @since 14.0.0 | ||
| * @template-covariant H of array<string, mixed> | ||
| * @template-covariant S of Http::STATUS_* | ||
| * @template-extends TemplateResponse<Http::STATUS_*, array<string, mixed>> | ||
| */ | ||
| class PublicTemplateResponse extends TemplateResponse { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,8 +19,8 @@ | |
| * Response for a normal template | ||
| * @since 6.0.0 | ||
| * | ||
| * @template-covariant S of Http::STATUS_* | ||
| * @template-covariant H of array<string, mixed> | ||
| * @template-extends Response<Http::STATUS_*, array<string, mixed>> | ||
| */ | ||
| class TemplateResponse extends Response { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,8 +12,8 @@ | |
| /** | ||
| * A renderer for text responses | ||
| * @since 22.0.0 | ||
| * @template-covariant S of Http::STATUS_* | ||
| * @template-covariant H of array<string, mixed> | ||
| * @template-extends Response<Http::STATUS_*, array<string, mixed>> | ||
| */ | ||
| class TextPlainResponse extends Response { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,8 +14,8 @@ | |
| /** | ||
| * A generic 429 response showing an 404 error page as well to the end-user | ||
| * @since 19.0.0 | ||
| * @template-covariant S of Http::STATUS_* | ||
| * @template-covariant H of array<string, mixed> | ||
| * @template-extends Response<Http::STATUS_*, array<string, mixed>> | ||
| */ | ||
| class TooManyRequestsResponse extends Response { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,8 +16,8 @@ | |
| * Public library to send several files in one zip archive. | ||
| * | ||
| * @since 15.0.0 | ||
| * @template-covariant S of Http::STATUS_* | ||
| * @template-covariant H of array<string, mixed> | ||
| * @template-extends Response<Http::STATUS_*, array<string, mixed>> | ||
| */ | ||
| class ZipResponse extends Response implements ICallbackResponse { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is that not the same as
mixed🙃 ?Also,
\stdClass|\JsonSerializableis redundant withobject, no?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nope, this is the correct type. It only allows what can be serialized to JSON.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But how can a var be
\stdClasswithout beingobject? And same for JsonSerializable. For me eitherobjector\stdClass|\JsonSerializableshould be removed.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://www.php.net/manual/en/language.types.mixed.php The only thing refused in this union is resource.