diff options
author | dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> | 2024-02-04 00:40:24 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-04 00:40:24 +0000 |
commit | 7b69943859a2f184e32341a7f13423ce4e31b3b0 (patch) | |
tree | ebc1df889af268c573f0f570d2cf828fdae19f3d | |
parent | c43ac27dc442ad761349d294560a6ec5d250c175 (diff) | |
parent | bc32170e206fbfe985c41847b29f631667d26680 (diff) |
Merge pull request #2302 from nextcloud/dependabot/composer/nextcloud/coding-standard-1.2.1
-rw-r--r-- | composer.json | 2 | ||||
-rw-r--r-- | composer.lock | 26 | ||||
-rw-r--r-- | lib/Controller/PublicPreviewController.php | 2 |
3 files changed, 15 insertions, 15 deletions
diff --git a/composer.json b/composer.json index ee873f98..cf8cad5b 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8", - "nextcloud/coding-standard": "1.1.1", + "nextcloud/coding-standard": "1.2.1", "nextcloud/ocp": "dev-master", "phpunit/phpunit": "^9", "psalm/phar": "^5.17", diff --git a/composer.lock b/composer.lock index a097585a..5a7deffa 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "27c397b0650e3172eeeefcf78f8646f7", + "content-hash": "7a6bdbf07747b8f44caa478f4b3b4e99", "packages": [ { "name": "hexogen/kdtree", @@ -257,16 +257,16 @@ }, { "name": "nextcloud/coding-standard", - "version": "v1.1.1", + "version": "v1.2.1", "source": { "type": "git", "url": "https://github.com/nextcloud/coding-standard.git", - "reference": "55def702fb9a37a219511e1d8c6fe8e37164c1fb" + "reference": "cf5f18d989ec62fb4cdc7fc92a36baf34b3d829e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/55def702fb9a37a219511e1d8c6fe8e37164c1fb", - "reference": "55def702fb9a37a219511e1d8c6fe8e37164c1fb", + "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/cf5f18d989ec62fb4cdc7fc92a36baf34b3d829e", + "reference": "cf5f18d989ec62fb4cdc7fc92a36baf34b3d829e", "shasum": "" }, "require": { @@ -292,9 +292,9 @@ "description": "Nextcloud coding standards for the php cs fixer", "support": { "issues": "https://github.com/nextcloud/coding-standard/issues", - "source": "https://github.com/nextcloud/coding-standard/tree/v1.1.1" + "source": "https://github.com/nextcloud/coding-standard/tree/v1.2.1" }, - "time": "2023-06-01T12:05:01+00:00" + "time": "2024-02-01T14:54:37+00:00" }, { "name": "nextcloud/ocp", @@ -512,16 +512,16 @@ }, { "name": "php-cs-fixer/shim", - "version": "v3.17.0", + "version": "v3.49.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/shim.git", - "reference": "f51b4aed90565c447136f1d015798f6f7c82490f" + "reference": "f7d3219cac46632f12362c9aa7c2ac0d2fe92c52" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/f51b4aed90565c447136f1d015798f6f7c82490f", - "reference": "f51b4aed90565c447136f1d015798f6f7c82490f", + "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/f7d3219cac46632f12362c9aa7c2ac0d2fe92c52", + "reference": "f7d3219cac46632f12362c9aa7c2ac0d2fe92c52", "shasum": "" }, "require": { @@ -558,9 +558,9 @@ "description": "A tool to automatically fix PHP code style", "support": { "issues": "https://github.com/PHP-CS-Fixer/shim/issues", - "source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.17.0" + "source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.49.0" }, - "time": "2023-05-22T20:00:38+00:00" + "time": "2024-02-02T00:42:09+00:00" }, { "name": "phpunit/php-code-coverage", diff --git a/lib/Controller/PublicPreviewController.php b/lib/Controller/PublicPreviewController.php index f18811dd..39f7fb7e 100644 --- a/lib/Controller/PublicPreviewController.php +++ b/lib/Controller/PublicPreviewController.php @@ -43,7 +43,7 @@ class PublicPreviewController extends PreviewController { int $fileId = -1, int $x = 32, int $y = 32, - string $token = null + ?string $token = null ) { if ($fileId === -1 || $x === 0 || $y === 0) { return new DataResponse([], Http::STATUS_BAD_REQUEST); |