This run took 13 seconds.
From e9f5aa0ee8de2c57f812ed57bd255e55f57157ba Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Sat, 2 Nov 2024 01:50:10 +0000
Subject: [PATCH] build: Updating mediawiki/mediawiki-codesniffer to 45.0.0
Change-Id: I255b7ffac72ae2afc1ae4996e1eb906b73d7e5f6
---
composer.json | 2 +-
includes/GlobalUserGroupMembership.php | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/composer.json b/composer.json
index 25415a8..64d8cd7 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
{
"require-dev": {
- "mediawiki/mediawiki-codesniffer": "44.0.0",
+ "mediawiki/mediawiki-codesniffer": "45.0.0",
"mediawiki/minus-x": "1.1.3",
"php-parallel-lint/php-console-highlighter": "1.0.0",
"php-parallel-lint/php-parallel-lint": "1.4.0"
diff --git a/includes/GlobalUserGroupMembership.php b/includes/GlobalUserGroupMembership.php
index 75c4bd4..0b57801 100644
--- a/includes/GlobalUserGroupMembership.php
+++ b/includes/GlobalUserGroupMembership.php
@@ -99,7 +99,7 @@ class GlobalUserGroupMembership extends UserGroupMembership {
];
}
- public function delete( IDatabase $dbw = null ) {
+ public function delete( ?IDatabase $dbw = null ) {
if ( MediaWikiServices::getInstance()->getReadOnlyMode()->isReadOnly() ) {
return false;
}
@@ -129,7 +129,7 @@ class GlobalUserGroupMembership extends UserGroupMembership {
* @param IDatabase|null $dbw If you have one available
* @return bool Whether or not anything was inserted
*/
- public function insert( $allowUpdate = false, IDatabase $dbw = null ) {
+ public function insert( $allowUpdate = false, ?IDatabase $dbw = null ) {
$dbw = $dbw ?: $dbw = MediaWikiServices::getInstance()->getDBLoadBalancer()->getConnection( DB_PRIMARY );
// Purge old, expired memberships from the DB
@@ -212,7 +212,7 @@ class GlobalUserGroupMembership extends UserGroupMembership {
*
* @param IDatabase|null $dbw
*/
- public static function purgeExpired( IDatabase $dbw = null ) {
+ public static function purgeExpired( ?IDatabase $dbw = null ) {
if ( MediaWikiServices::getInstance()->getReadOnlyMode()->isReadOnly() ) {
return;
}
@@ -241,7 +241,7 @@ class GlobalUserGroupMembership extends UserGroupMembership {
* @param IDatabase|null $db Optional database connection
* @return array Associative array of (group name => UserGroupMembership object)
*/
- public static function getMembershipsForUser( $userId, IDatabase $db = null ) {
+ public static function getMembershipsForUser( $userId, ?IDatabase $db = null ) {
if ( !$db ) {
$db = MediaWikiServices::getInstance()->getDBLoadBalancer()->getConnection( DB_PRIMARY );
}
@@ -272,7 +272,7 @@ class GlobalUserGroupMembership extends UserGroupMembership {
* @param IDatabase|null $db Optional database connection
* @return UserGroupMembership|false
*/
- public static function getMembership( $userId, $group, IDatabase $db = null ) {
+ public static function getMembership( $userId, $group, ?IDatabase $db = null ) {
if ( !$db ) {
$db = MediaWikiServices::getInstance()->getDBLoadBalancer()->getConnection( DB_REPLICA );
}
--
2.39.2
$ date
--- stdout ---
Sat Nov 2 01:50:00 UTC 2024
--- end ---
$ git clone file:///srv/git/mediawiki-extensions-GlobalUserrights.git repo --depth=1 -b master
--- stderr ---
Cloning into 'repo'...
--- stdout ---
--- end ---
$ git config user.name libraryupgrader
--- stdout ---
--- end ---
$ git config user.email tools.libraryupgrader@tools.wmflabs.org
--- stdout ---
--- end ---
$ git submodule update --init
--- stdout ---
--- end ---
$ grr init
--- stdout ---
Installed commit-msg hook.
--- end ---
$ git show-ref refs/heads/master
--- stdout ---
b5123c3d41f0fba3ad505522a8dd8106a55876ba refs/heads/master
--- end ---
$ /usr/bin/npm audit --json
--- stdout ---
{
"auditReportVersion": 2,
"vulnerabilities": {},
"metadata": {
"vulnerabilities": {
"info": 0,
"low": 0,
"moderate": 0,
"high": 0,
"critical": 0,
"total": 0
},
"dependencies": {
"prod": 1,
"dev": 315,
"optional": 0,
"peer": 1,
"peerOptional": 0,
"total": 315
}
}
}
--- end ---
$ /usr/bin/composer install
--- stderr ---
No composer.lock file present. Updating dependencies to latest instead of installing from lock file. See https://getcomposer.org/install for more information.
Loading composer repositories with package information
Updating dependencies
Lock file operations: 21 installs, 0 updates, 0 removals
- Locking composer/semver (3.4.2)
- Locking composer/spdx-licenses (1.5.8)
- Locking dealerdirect/phpcodesniffer-composer-installer (v1.0.0)
- Locking mediawiki/mediawiki-codesniffer (v44.0.0)
- Locking mediawiki/minus-x (1.1.3)
- Locking php-parallel-lint/php-console-color (v1.0.1)
- Locking php-parallel-lint/php-console-highlighter (v1.0.0)
- Locking php-parallel-lint/php-parallel-lint (v1.4.0)
- Locking phpcsstandards/phpcsextra (1.2.1)
- Locking phpcsstandards/phpcsutils (1.0.11)
- Locking psr/container (2.0.2)
- Locking squizlabs/php_codesniffer (3.9.0)
- Locking symfony/console (v7.1.6)
- Locking symfony/deprecation-contracts (v3.5.0)
- Locking symfony/polyfill-ctype (v1.31.0)
- Locking symfony/polyfill-intl-grapheme (v1.31.0)
- Locking symfony/polyfill-intl-normalizer (v1.31.0)
- Locking symfony/polyfill-mbstring (v1.31.0)
- Locking symfony/polyfill-php80 (v1.31.0)
- Locking symfony/service-contracts (v3.5.0)
- Locking symfony/string (v7.1.6)
Writing lock file
Installing dependencies from lock file (including require-dev)
Package operations: 21 installs, 0 updates, 0 removals
0 [>---------------------------] 0 [->--------------------------]
- Installing squizlabs/php_codesniffer (3.9.0): Extracting archive
- Installing dealerdirect/phpcodesniffer-composer-installer (v1.0.0): Extracting archive
- Installing symfony/polyfill-php80 (v1.31.0): Extracting archive
- Installing phpcsstandards/phpcsutils (1.0.11): Extracting archive
- Installing phpcsstandards/phpcsextra (1.2.1): Extracting archive
- Installing symfony/polyfill-mbstring (v1.31.0): Extracting archive
- Installing composer/spdx-licenses (1.5.8): Extracting archive
- Installing composer/semver (3.4.2): Extracting archive
- Installing mediawiki/mediawiki-codesniffer (v44.0.0): Extracting archive
- Installing symfony/polyfill-intl-normalizer (v1.31.0): Extracting archive
- Installing symfony/polyfill-intl-grapheme (v1.31.0): Extracting archive
- Installing symfony/polyfill-ctype (v1.31.0): Extracting archive
- Installing symfony/string (v7.1.6): Extracting archive
- Installing symfony/deprecation-contracts (v3.5.0): Extracting archive
- Installing psr/container (2.0.2): Extracting archive
- Installing symfony/service-contracts (v3.5.0): Extracting archive
- Installing symfony/console (v7.1.6): Extracting archive
- Installing mediawiki/minus-x (1.1.3): Extracting archive
- Installing php-parallel-lint/php-console-color (v1.0.1): Extracting archive
- Installing php-parallel-lint/php-console-highlighter (v1.0.0): Extracting archive
- Installing php-parallel-lint/php-parallel-lint (v1.4.0): Extracting archive
0/19 [>---------------------------] 0%
19/19 [============================] 100%
Generating autoload files
14 packages you are using are looking for funding.
Use the `composer fund` command to find out more!
--- stdout ---
PHP CodeSniffer Config installed_paths set to ../../mediawiki/mediawiki-codesniffer,../../phpcsstandards/phpcsextra,../../phpcsstandards/phpcsutils
--- end ---
Upgrading c:mediawiki/mediawiki-codesniffer from 44.0.0 -> 45.0.0
$ /usr/bin/composer update
--- stderr ---
Loading composer repositories with package information
Updating dependencies
Lock file operations: 0 installs, 4 updates, 0 removals
- Upgrading composer/semver (3.4.2 => 3.4.3)
- Upgrading mediawiki/mediawiki-codesniffer (v44.0.0 => v45.0.0)
- Upgrading phpcsstandards/phpcsutils (1.0.11 => 1.0.12)
- Upgrading squizlabs/php_codesniffer (3.9.0 => 3.10.3)
Writing lock file
Installing dependencies from lock file (including require-dev)
Package operations: 0 installs, 4 updates, 0 removals
0 [>---------------------------] 0 [->--------------------------]
- Upgrading squizlabs/php_codesniffer (3.9.0 => 3.10.3): Extracting archive
- Upgrading phpcsstandards/phpcsutils (1.0.11 => 1.0.12): Extracting archive
- Upgrading composer/semver (3.4.2 => 3.4.3): Extracting archive
- Upgrading mediawiki/mediawiki-codesniffer (v44.0.0 => v45.0.0): Extracting archive
0/4 [>---------------------------] 0%
3/4 [=====================>------] 75%
4/4 [============================] 100%
Generating autoload files
14 packages you are using are looking for funding.
Use the `composer fund` command to find out more!
No security vulnerability advisories found
--- stdout ---
PHP CodeSniffer Config installed_paths set to ../../mediawiki/mediawiki-codesniffer,../../phpcsstandards/phpcsextra,../../phpcsstandards/phpcsutils
--- end ---
Previously failing phpcs rules: {'MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected', 'Squiz.Scope.MethodScope.Missing', 'MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic', 'Generic.Files.LineLength.TooLong', 'MediaWiki.Commenting.FunctionComment.MissingDocumentationPrivate'}
$ vendor/bin/phpcs --report=json
--- stdout ---
{"totals":{"errors":14,"warnings":3,"fixable":5},"files":{"\/src\/repo\/GlobalUserrights.alias.php":{"errors":0,"warnings":2,"messages":[{"message":"Line exceeds 120 characters; contains 122 characters","source":"Generic.Files.LineLength.TooLong","severity":5,"fixable":false,"type":"WARNING","line":53,"column":122},{"message":"Line exceeds 120 characters; contains 157 characters","source":"Generic.Files.LineLength.TooLong","severity":5,"fixable":false,"type":"WARNING","line":133,"column":157}]},"\/src\/repo\/includes\/GlobalRightsLogFormatter.php":{"errors":2,"warnings":0,"messages":[{"message":"Missing function doc comment","source":"MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected","severity":5,"fixable":false,"type":"ERROR","line":32,"column":15},{"message":"Missing function doc comment","source":"MediaWiki.Commenting.FunctionComment.MissingDocumentationPrivate","severity":5,"fixable":false,"type":"ERROR","line":81,"column":13}]},"\/src\/repo\/includes\/GlobalUserrightsHooks.php":{"errors":0,"warnings":1,"messages":[{"message":"Line exceeds 120 characters; contains 137 characters","source":"Generic.Files.LineLength.TooLong","severity":5,"fixable":false,"type":"WARNING","line":119,"column":137}]},"\/src\/repo\/includes\/GlobalUserrights.php":{"errors":5,"warnings":0,"messages":[{"message":"Visibility must be declared on method \"doSaveUserGroups\"","source":"Squiz.Scope.MethodScope.Missing","severity":5,"fixable":false,"type":"ERROR","line":38,"column":5},{"message":"Visibility must be declared on method \"addGroup\"","source":"Squiz.Scope.MethodScope.Missing","severity":5,"fixable":false,"type":"ERROR","line":105,"column":5},{"message":"Visibility must be declared on method \"removeGroup\"","source":"Squiz.Scope.MethodScope.Missing","severity":5,"fixable":false,"type":"ERROR","line":125,"column":5},{"message":"Visibility must be declared on method \"changeableGroups\"","source":"Squiz.Scope.MethodScope.Missing","severity":5,"fixable":false,"type":"ERROR","line":194,"column":5},{"message":"Missing function doc comment","source":"MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected","severity":5,"fixable":false,"type":"ERROR","line":224,"column":15}]},"\/src\/repo\/includes\/GlobalUserGroupMembership.php":{"errors":7,"warnings":0,"messages":[{"message":"Missing function doc comment","source":"MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected","severity":5,"fixable":false,"type":"ERROR","line":69,"column":15},{"message":"Missing function doc comment","source":"MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic","severity":5,"fixable":false,"type":"ERROR","line":102,"column":12},{"message":"Use PHP 8.4 compatible syntax for explicit nullable types (\"?IDatabase $dbw = null\")","source":"MediaWiki.Usage.NullableType.ExplicitNullableTypes","severity":5,"fixable":true,"type":"ERROR","line":102,"column":29},{"message":"Use PHP 8.4 compatible syntax for explicit nullable types (\"?IDatabase $dbw = null\")","source":"MediaWiki.Usage.NullableType.ExplicitNullableTypes","severity":5,"fixable":true,"type":"ERROR","line":132,"column":51},{"message":"Use PHP 8.4 compatible syntax for explicit nullable types (\"?IDatabase $dbw = null\")","source":"MediaWiki.Usage.NullableType.ExplicitNullableTypes","severity":5,"fixable":true,"type":"ERROR","line":215,"column":42},{"message":"Use PHP 8.4 compatible syntax for explicit nullable types (\"?IDatabase $db = null\")","source":"MediaWiki.Usage.NullableType.ExplicitNullableTypes","severity":5,"fixable":true,"type":"ERROR","line":244,"column":60},{"message":"Use PHP 8.4 compatible syntax for explicit nullable types (\"?IDatabase $db = null\")","source":"MediaWiki.Usage.NullableType.ExplicitNullableTypes","severity":5,"fixable":true,"type":"ERROR","line":275,"column":60}]}}}
--- end ---
PHPCS run failed
$ vendor/bin/phpcbf
--- stdout ---
PHPCBF RESULT SUMMARY
----------------------------------------------------------------------
FILE FIXED REMAINING
----------------------------------------------------------------------
/src/repo/includes/GlobalUserGroupMembership.php 5 2
----------------------------------------------------------------------
A TOTAL OF 5 ERRORS WERE FIXED IN 1 FILE
----------------------------------------------------------------------
Time: 323ms; Memory: 8MB
--- end ---
$ vendor/bin/phpcs --report=json
--- stdout ---
{"totals":{"errors":9,"warnings":3,"fixable":0},"files":{"\/src\/repo\/GlobalUserrights.alias.php":{"errors":0,"warnings":2,"messages":[{"message":"Line exceeds 120 characters; contains 122 characters","source":"Generic.Files.LineLength.TooLong","severity":5,"fixable":false,"type":"WARNING","line":53,"column":122},{"message":"Line exceeds 120 characters; contains 157 characters","source":"Generic.Files.LineLength.TooLong","severity":5,"fixable":false,"type":"WARNING","line":133,"column":157}]},"\/src\/repo\/includes\/GlobalRightsLogFormatter.php":{"errors":2,"warnings":0,"messages":[{"message":"Missing function doc comment","source":"MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected","severity":5,"fixable":false,"type":"ERROR","line":32,"column":15},{"message":"Missing function doc comment","source":"MediaWiki.Commenting.FunctionComment.MissingDocumentationPrivate","severity":5,"fixable":false,"type":"ERROR","line":81,"column":13}]},"\/src\/repo\/includes\/GlobalUserrightsHooks.php":{"errors":0,"warnings":1,"messages":[{"message":"Line exceeds 120 characters; contains 137 characters","source":"Generic.Files.LineLength.TooLong","severity":5,"fixable":false,"type":"WARNING","line":119,"column":137}]},"\/src\/repo\/includes\/GlobalUserGroupMembership.php":{"errors":2,"warnings":0,"messages":[{"message":"Missing function doc comment","source":"MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected","severity":5,"fixable":false,"type":"ERROR","line":69,"column":15},{"message":"Missing function doc comment","source":"MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic","severity":5,"fixable":false,"type":"ERROR","line":102,"column":12}]},"\/src\/repo\/includes\/GlobalUserrights.php":{"errors":5,"warnings":0,"messages":[{"message":"Visibility must be declared on method \"doSaveUserGroups\"","source":"Squiz.Scope.MethodScope.Missing","severity":5,"fixable":false,"type":"ERROR","line":38,"column":5},{"message":"Visibility must be declared on method \"addGroup\"","source":"Squiz.Scope.MethodScope.Missing","severity":5,"fixable":false,"type":"ERROR","line":105,"column":5},{"message":"Visibility must be declared on method \"removeGroup\"","source":"Squiz.Scope.MethodScope.Missing","severity":5,"fixable":false,"type":"ERROR","line":125,"column":5},{"message":"Visibility must be declared on method \"changeableGroups\"","source":"Squiz.Scope.MethodScope.Missing","severity":5,"fixable":false,"type":"ERROR","line":194,"column":5},{"message":"Missing function doc comment","source":"MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected","severity":5,"fixable":false,"type":"ERROR","line":224,"column":15}]}}}
--- end ---
$ git checkout .phpcs.xml
--- stderr ---
Updated 1 path from the index
--- stdout ---
--- end ---
$ /usr/bin/composer install
--- stderr ---
Installing dependencies from lock file (including require-dev)
Verifying lock file contents can be installed on current platform.
Nothing to install, update or remove
Generating autoload files
14 packages you are using are looking for funding.
Use the `composer fund` command to find out more!
--- stdout ---
--- end ---
$ /usr/bin/composer test
--- stderr ---
> parallel-lint . --exclude vendor --exclude node_modules
> minus-x check .
> phpcs -sp --cache
--- stdout ---
PHP 8.2.20 | 10 parallel jobs
..... 5/5 (100%)
Checked 5 files in 0.1 seconds
No syntax error found
MinusX
======
Processing /src/repo...
.............................................................
..............................................
All good!
..... 5 / 5 (100%)
Time: 94ms; Memory: 8MB
--- end ---
$ /usr/bin/npm audit --json
--- stdout ---
{
"auditReportVersion": 2,
"vulnerabilities": {},
"metadata": {
"vulnerabilities": {
"info": 0,
"low": 0,
"moderate": 0,
"high": 0,
"critical": 0,
"total": 0
},
"dependencies": {
"prod": 1,
"dev": 315,
"optional": 0,
"peer": 1,
"peerOptional": 0,
"total": 315
}
}
}
--- end ---
$ package-lock-lint package-lock.json
--- stdout ---
Checking package-lock.json
--- end ---
build: Updating mediawiki/mediawiki-codesniffer to 45.0.0
$ git add .
--- stdout ---
--- end ---
$ git commit -F /tmp/tmpi8ugmwo9
--- stdout ---
[master e9f5aa0] build: Updating mediawiki/mediawiki-codesniffer to 45.0.0
2 files changed, 6 insertions(+), 6 deletions(-)
--- end ---
$ git format-patch HEAD~1 --stdout
--- stdout ---
From e9f5aa0ee8de2c57f812ed57bd255e55f57157ba Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Sat, 2 Nov 2024 01:50:10 +0000
Subject: [PATCH] build: Updating mediawiki/mediawiki-codesniffer to 45.0.0
Change-Id: I255b7ffac72ae2afc1ae4996e1eb906b73d7e5f6
---
composer.json | 2 +-
includes/GlobalUserGroupMembership.php | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/composer.json b/composer.json
index 25415a8..64d8cd7 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
{
"require-dev": {
- "mediawiki/mediawiki-codesniffer": "44.0.0",
+ "mediawiki/mediawiki-codesniffer": "45.0.0",
"mediawiki/minus-x": "1.1.3",
"php-parallel-lint/php-console-highlighter": "1.0.0",
"php-parallel-lint/php-parallel-lint": "1.4.0"
diff --git a/includes/GlobalUserGroupMembership.php b/includes/GlobalUserGroupMembership.php
index 75c4bd4..0b57801 100644
--- a/includes/GlobalUserGroupMembership.php
+++ b/includes/GlobalUserGroupMembership.php
@@ -99,7 +99,7 @@ class GlobalUserGroupMembership extends UserGroupMembership {
];
}
- public function delete( IDatabase $dbw = null ) {
+ public function delete( ?IDatabase $dbw = null ) {
if ( MediaWikiServices::getInstance()->getReadOnlyMode()->isReadOnly() ) {
return false;
}
@@ -129,7 +129,7 @@ class GlobalUserGroupMembership extends UserGroupMembership {
* @param IDatabase|null $dbw If you have one available
* @return bool Whether or not anything was inserted
*/
- public function insert( $allowUpdate = false, IDatabase $dbw = null ) {
+ public function insert( $allowUpdate = false, ?IDatabase $dbw = null ) {
$dbw = $dbw ?: $dbw = MediaWikiServices::getInstance()->getDBLoadBalancer()->getConnection( DB_PRIMARY );
// Purge old, expired memberships from the DB
@@ -212,7 +212,7 @@ class GlobalUserGroupMembership extends UserGroupMembership {
*
* @param IDatabase|null $dbw
*/
- public static function purgeExpired( IDatabase $dbw = null ) {
+ public static function purgeExpired( ?IDatabase $dbw = null ) {
if ( MediaWikiServices::getInstance()->getReadOnlyMode()->isReadOnly() ) {
return;
}
@@ -241,7 +241,7 @@ class GlobalUserGroupMembership extends UserGroupMembership {
* @param IDatabase|null $db Optional database connection
* @return array Associative array of (group name => UserGroupMembership object)
*/
- public static function getMembershipsForUser( $userId, IDatabase $db = null ) {
+ public static function getMembershipsForUser( $userId, ?IDatabase $db = null ) {
if ( !$db ) {
$db = MediaWikiServices::getInstance()->getDBLoadBalancer()->getConnection( DB_PRIMARY );
}
@@ -272,7 +272,7 @@ class GlobalUserGroupMembership extends UserGroupMembership {
* @param IDatabase|null $db Optional database connection
* @return UserGroupMembership|false
*/
- public static function getMembership( $userId, $group, IDatabase $db = null ) {
+ public static function getMembership( $userId, $group, ?IDatabase $db = null ) {
if ( !$db ) {
$db = MediaWikiServices::getInstance()->getDBLoadBalancer()->getConnection( DB_REPLICA );
}
--
2.39.2
--- end ---