From 565666a62944706420f41b4be75f2d9a8a5abc8c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 29 Sep 2024 22:47:55 +0000 Subject: [PATCH 1/3] fix(deps): bump nextcloud/coding-standard from 1.2.3 to ^1.3.1 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- vendor-bin/cs-fixer/composer.json | 2 +- vendor-bin/cs-fixer/composer.lock | 73 +++++++++++++++++++++++++------ 2 files changed, 61 insertions(+), 14 deletions(-) diff --git a/vendor-bin/cs-fixer/composer.json b/vendor-bin/cs-fixer/composer.json index 2b16b5dc..f7c408c9 100644 --- a/vendor-bin/cs-fixer/composer.json +++ b/vendor-bin/cs-fixer/composer.json @@ -1,6 +1,6 @@ { "require": { - "nextcloud/coding-standard": "^1.2.3" + "nextcloud/coding-standard": "^1.3.1" }, "config": { "optimize-autoloader": true, diff --git a/vendor-bin/cs-fixer/composer.lock b/vendor-bin/cs-fixer/composer.lock index 98cebb97..8b4f9dea 100644 --- a/vendor-bin/cs-fixer/composer.lock +++ b/vendor-bin/cs-fixer/composer.lock @@ -4,23 +4,70 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c57b7e207f186b8127c8db929877b53a", + "content-hash": "ac47295283145783214c21ed6f754594", "packages": [ + { + "name": "kubawerlos/php-cs-fixer-custom-fixers", + "version": "v3.22.0", + "source": { + "type": "git", + "url": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers.git", + "reference": "8701394f0c7cd450ac4fa577d24589122c1d5d5e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/kubawerlos/php-cs-fixer-custom-fixers/zipball/8701394f0c7cd450ac4fa577d24589122c1d5d5e", + "reference": "8701394f0c7cd450ac4fa577d24589122c1d5d5e", + "shasum": "" + }, + "require": { + "ext-filter": "*", + "ext-tokenizer": "*", + "friendsofphp/php-cs-fixer": "^3.61.1", + "php": "^7.4 || ^8.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.6.4 || ^10.5.29" + }, + "type": "library", + "autoload": { + "psr-4": { + "PhpCsFixerCustomFixers\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kuba Werłos", + "email": "werlos@gmail.com" + } + ], + "description": "A set of custom fixers for PHP CS Fixer", + "support": { + "issues": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/issues", + "source": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/tree/v3.22.0" + }, + "time": "2024-08-16T20:44:35+00:00" + }, { "name": "nextcloud/coding-standard", - "version": "v1.2.3", + "version": "v1.3.1", "source": { "type": "git", "url": "https://github.com/nextcloud/coding-standard.git", - "reference": "bc9c53a5306114b60c4363057aff9c2ed10a54da" + "reference": "e88acb0df6217b808d1632286ddfec9267a102e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/bc9c53a5306114b60c4363057aff9c2ed10a54da", - "reference": "bc9c53a5306114b60c4363057aff9c2ed10a54da", + "url": "https://api.github.com/repos/nextcloud/coding-standard/zipball/e88acb0df6217b808d1632286ddfec9267a102e4", + "reference": "e88acb0df6217b808d1632286ddfec9267a102e4", "shasum": "" }, "require": { + "kubawerlos/php-cs-fixer-custom-fixers": "^3.22", "php": "^7.3|^8.0", "php-cs-fixer/shim": "^3.17" }, @@ -43,22 +90,22 @@ "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.2.3" + "source": "https://github.com/nextcloud/coding-standard/tree/v1.3.1" }, - "time": "2024-08-23T14:32:32+00:00" + "time": "2024-09-19T09:07:10+00:00" }, { "name": "php-cs-fixer/shim", - "version": "v3.62.0", + "version": "v3.64.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/shim.git", - "reference": "7a91d5ce45c486f5b445d95901228507a02f60ae" + "reference": "81ccfd24baf3a10810dab1152c403981a790b837" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/7a91d5ce45c486f5b445d95901228507a02f60ae", - "reference": "7a91d5ce45c486f5b445d95901228507a02f60ae", + "url": "https://api.github.com/repos/PHP-CS-Fixer/shim/zipball/81ccfd24baf3a10810dab1152c403981a790b837", + "reference": "81ccfd24baf3a10810dab1152c403981a790b837", "shasum": "" }, "require": { @@ -95,9 +142,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.62.0" + "source": "https://github.com/PHP-CS-Fixer/shim/tree/v3.64.0" }, - "time": "2024-08-07T17:03:46+00:00" + "time": "2024-08-30T23:10:11+00:00" } ], "packages-dev": [], From 0a21189522498b47aa657834e259d2a6fbccb0a5 Mon Sep 17 00:00:00 2001 From: Richard Steinmetz Date: Mon, 30 Sep 2024 13:18:57 +0200 Subject: [PATCH 2/3] chore: run composer cs:fix Signed-off-by: Richard Steinmetz --- lib/Command/CleanUp.php | 2 +- lib/Service/WebAuthnManager.php | 2 +- tests/bootstrap.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Command/CleanUp.php b/lib/Command/CleanUp.php index 8b3d9d77..54d62a49 100644 --- a/lib/Command/CleanUp.php +++ b/lib/Command/CleanUp.php @@ -47,7 +47,7 @@ class CleanUp extends Command { public function __construct( IDBConnection $db, IUserManager $userManager, - PublicKeyCredentialEntityMapper $webauthnMapper + PublicKeyCredentialEntityMapper $webauthnMapper, ) { parent::__construct(); diff --git a/lib/Service/WebAuthnManager.php b/lib/Service/WebAuthnManager.php index 8756b6f1..a5499e35 100644 --- a/lib/Service/WebAuthnManager.php +++ b/lib/Service/WebAuthnManager.php @@ -94,7 +94,7 @@ public function __construct( WebauthnPublicKeyCredentialSourceRepository $repository, PublicKeyCredentialEntityMapper $mapper, IEventDispatcher $eventDispatcher, - LoggerInterface $logger + LoggerInterface $logger, ) { $this->session = $session; $this->repository = $repository; diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 6b7cc0e2..3e5c0e06 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -24,8 +24,8 @@ * along with this program. If not, see . */ -require_once __DIR__.'/../../../lib/base.php'; -require_once __DIR__.'/../vendor/autoload.php'; +require_once __DIR__ . '/../../../lib/base.php'; +require_once __DIR__ . '/../vendor/autoload.php'; OC::$loader->addValidRoot(OC::$SERVERROOT . '/tests'); OC_App::loadApp('twofactor_webauthn'); From 1985777e616814a83ae679202926cf9c3b9f1617 Mon Sep 17 00:00:00 2001 From: Richard Steinmetz Date: Mon, 30 Sep 2024 13:21:03 +0200 Subject: [PATCH 3/3] chore: ignore coding-standard update 1.3.1 in git blame Signed-off-by: Richard Steinmetz --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index ce4779ac..a81602e9 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -5,3 +5,6 @@ # Update to coding-standard 1.2.3 58601e8ebae5dd35ba2f97c343e8b4b03a810a57 + +# Update to coding-standard 1.3.1 +0a21189522498b47aa657834e259d2a6fbccb0a5