From b3b74cd19f81d929c2e07e8530795d5136021e64 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 21 Sep 2024 02:11:58 +0000 Subject: [PATCH 1/3] chore(deps-dev): bump nextcloud/coding-standard from 1.2.3 to 1.3.1 --- updated-dependencies: - dependency-name: nextcloud/coding-standard dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- composer.lock | 71 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 59 insertions(+), 12 deletions(-) diff --git a/composer.lock b/composer.lock index 6a7ce9b7..8e45ad38 100644 --- a/composer.lock +++ b/composer.lock @@ -111,6 +111,52 @@ ], "time": "2022-12-30T00:15:36+00:00" }, + { + "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": "myclabs/deep-copy", "version": "1.11.1", @@ -172,19 +218,20 @@ }, { "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" }, @@ -207,9 +254,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.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": "nextcloud/ocp", @@ -434,16 +481,16 @@ }, { "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": { @@ -480,9 +527,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" }, { "name": "phpunit/php-code-coverage", From a5ce30c5eea2b16f9fbfbe9afff9485ec4971275 Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Sun, 22 Sep 2024 16:33:36 +0200 Subject: [PATCH 2/3] style: apply coding-standard 1.3.1 Signed-off-by: Daniel Kesselberg --- lib/Controller/PageController.php | 3 ++- lib/Resources/ThermalZone.php | 3 ++- lib/Settings/AdminSettings.php | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php index 696cc17f..b682b12c 100644 --- a/lib/Controller/PageController.php +++ b/lib/Controller/PageController.php @@ -19,7 +19,8 @@ use OCP\IRequest; class PageController extends Controller { - public function __construct(string $appName, + public function __construct( + string $appName, IRequest $request, private SystemStatistics $systemStatistics, private IConfig $config, diff --git a/lib/Resources/ThermalZone.php b/lib/Resources/ThermalZone.php index a1604a56..c6548823 100644 --- a/lib/Resources/ThermalZone.php +++ b/lib/Resources/ThermalZone.php @@ -12,7 +12,8 @@ class ThermalZone implements \JsonSerializable { public function __construct( private string $zone, private string $type, - private float $temp) { + private float $temp, + ) { } public function getZone(): string { diff --git a/lib/Settings/AdminSettings.php b/lib/Settings/AdminSettings.php index d4c57c4d..0eb9817a 100644 --- a/lib/Settings/AdminSettings.php +++ b/lib/Settings/AdminSettings.php @@ -34,7 +34,8 @@ class AdminSettings implements ISettings { private SessionStatistics $sessionStatistics; private SystemStatistics $systemStatistics; - public function __construct(Os $os, + public function __construct( + Os $os, IL10N $l, IURLGenerator $urlGenerator, StorageStatistics $storageStatistics, @@ -43,7 +44,7 @@ public function __construct(Os $os, ShareStatistics $shareStatistics, SessionStatistics $sessionStatistics, SystemStatistics $systemStatistics, - private IConfig $config + private IConfig $config, ) { $this->os = $os; $this->l = $l; From 32f69eb6006811ae29b51f4e909190e9bf79ba70 Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg Date: Sun, 22 Sep 2024 16:34:32 +0200 Subject: [PATCH 3/3] chore: ignore code style changes in git blame Signed-off-by: Daniel Kesselberg --- .git-blame-ignore-revs | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 00000000..056053d5 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,9 @@ +# .git-blame-ignore-revs + +# SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: AGPL-3.0-or-later + +# coding-standard 1.2.3 +1dad763e08f381e186ff68413ed298d76f6ffe17 +# coding-standard 1.3.1 +a5ce30c5eea2b16f9fbfbe9afff9485ec4971275