This run took 10 seconds.
From 1ca76ddc62caaa8d7a2bd490458b435021c827d6 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Mon, 18 Mar 2024 13:38:49 +0000
Subject: [PATCH] build: Updating mediawiki/mediawiki-codesniffer to 43.0.0
The following sniffs now pass and were enabled:
* MediaWiki.Commenting.FunctionComment.TypeTypeHintParam
Change-Id: I1b7917eddc2d221a3a6761fe7ba62371fa041ec7
---
.phpcs.xml | 1 -
composer.json | 5 +++--
includes/HTMLDiffEngine.class.php | 3 ++-
src/Hook/ArticleContentOnDiff/AddTabbedDiffEngines.php | 3 ++-
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/.phpcs.xml b/.phpcs.xml
index 31963ca..d088a63 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ruleset>
<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
- <exclude name="MediaWiki.Commenting.FunctionComment.TypeTypeHintParam" />
<exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
</rule>
<file>.</file>
diff --git a/composer.json b/composer.json
index 9978972..f37c00d 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
}
},
"require-dev": {
- "mediawiki/mediawiki-codesniffer": "41.0.0",
+ "mediawiki/mediawiki-codesniffer": "43.0.0",
"mediawiki/minus-x": "1.1.1",
"php-parallel-lint/php-console-highlighter": "1.0.0",
"php-parallel-lint/php-parallel-lint": "1.3.2"
@@ -34,7 +34,8 @@
},
"config": {
"allow-plugins": {
- "composer/installers": true
+ "composer/installers": true,
+ "dealerdirect/phpcodesniffer-composer-installer": true
}
}
}
diff --git a/includes/HTMLDiffEngine.class.php b/includes/HTMLDiffEngine.class.php
index 5043806..ae00a24 100644
--- a/includes/HTMLDiffEngine.class.php
+++ b/includes/HTMLDiffEngine.class.php
@@ -197,7 +197,8 @@ class HTMLDiffEngine extends DiffEngine {
// Let's build standard conformant attributes
$aModAttr = [ 'previous', 'next', 'changeid', 'changes', 'changetype' ];
foreach ( $aModAttr as $sAttr ) {
- if ( !$oElement->hasAttribute( $sAttr ) ) { continue;
+ if ( !$oElement->hasAttribute( $sAttr ) ) {
+ continue;
}
$oElement->setAttribute( 'data-' . $sAttr, $oElement->getAttribute( $sAttr ) );
$oElement->removeAttribute( $sAttr );
diff --git a/src/Hook/ArticleContentOnDiff/AddTabbedDiffEngines.php b/src/Hook/ArticleContentOnDiff/AddTabbedDiffEngines.php
index bb58a3f..18f0579 100644
--- a/src/Hook/ArticleContentOnDiff/AddTabbedDiffEngines.php
+++ b/src/Hook/ArticleContentOnDiff/AddTabbedDiffEngines.php
@@ -203,7 +203,8 @@ class AddTabbedDiffEngines extends ArticleContentOnDiff {
}
foreach ( $aFirstLevelNodes as $oNode ) {
- if ( $oNode instanceof DOMElement == false ) { continue;
+ if ( $oNode instanceof DOMElement == false ) {
+ continue;
}
$aNodeClasses = explode( ' ', $oNode->getAttribute( 'class' ) );
if ( $oNode->nodeName == 'table' && in_array( 'diff', $aNodeClasses ) ) {
--
2.39.2
$ date
--- stdout ---
Mon Mar 18 13:38:42 UTC 2024
--- end ---
$ git clone file:///srv/git/mediawiki-extensions-BlueSpiceVisualDiff.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 ---
5a6bf097c28483d5b68eda6cf7ca9fd1bb0d5310 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": 321,
"optional": 0,
"peer": 1,
"peerOptional": 0,
"total": 321
}
}
}
--- 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: 20 installs, 0 updates, 0 removals
- Locking composer/installers (v2.2.0)
- Locking composer/semver (3.3.2)
- Locking composer/spdx-licenses (1.5.8)
- Locking mediawiki/mediawiki-codesniffer (v41.0.0)
- Locking mediawiki/minus-x (1.1.1)
- 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.3.2)
- Locking psr/container (2.0.2)
- Locking squizlabs/php_codesniffer (3.7.2)
- Locking symfony/console (v5.4.36)
- Locking symfony/deprecation-contracts (v3.4.0)
- Locking symfony/polyfill-ctype (v1.29.0)
- Locking symfony/polyfill-intl-grapheme (v1.29.0)
- Locking symfony/polyfill-intl-normalizer (v1.29.0)
- Locking symfony/polyfill-mbstring (v1.29.0)
- Locking symfony/polyfill-php73 (v1.29.0)
- Locking symfony/polyfill-php80 (v1.29.0)
- Locking symfony/service-contracts (v3.4.1)
- Locking symfony/string (v6.4.4)
Writing lock file
Installing dependencies from lock file (including require-dev)
Package operations: 20 installs, 0 updates, 0 removals
0 [>---------------------------] 0 [->--------------------------]
- Installing composer/installers (v2.2.0): Extracting archive
- Installing symfony/polyfill-php80 (v1.29.0): Extracting archive
- Installing squizlabs/php_codesniffer (3.7.2): Extracting archive
- Installing symfony/polyfill-mbstring (v1.29.0): Extracting archive
- Installing composer/spdx-licenses (1.5.8): Extracting archive
- Installing composer/semver (3.3.2): Extracting archive
- Installing mediawiki/mediawiki-codesniffer (v41.0.0): Extracting archive
- Installing symfony/polyfill-intl-normalizer (v1.29.0): Extracting archive
- Installing symfony/polyfill-intl-grapheme (v1.29.0): Extracting archive
- Installing symfony/polyfill-ctype (v1.29.0): Extracting archive
- Installing symfony/string (v6.4.4): Extracting archive
- Installing psr/container (2.0.2): Extracting archive
- Installing symfony/service-contracts (v3.4.1): Extracting archive
- Installing symfony/polyfill-php73 (v1.29.0): Extracting archive
- Installing symfony/deprecation-contracts (v3.4.0): Extracting archive
- Installing symfony/console (v5.4.36): Extracting archive
- Installing mediawiki/minus-x (1.1.1): 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.3.2): Extracting archive
0/19 [>---------------------------] 0%
18/19 [==========================>-] 94%
19/19 [============================] 100%
4 package suggestions were added by new dependencies, use `composer suggest` to see details.
Generating autoload files
14 packages you are using are looking for funding.
Use the `composer fund` command to find out more!
--- stdout ---
--- end ---
Upgrading c:mediawiki/mediawiki-codesniffer from 41.0.0 -> 43.0.0
$ /usr/bin/composer update
--- stderr ---
Loading composer repositories with package information
Updating dependencies
Lock file operations: 3 installs, 3 updates, 0 removals
- Upgrading composer/semver (3.3.2 => 3.4.0)
- Locking dealerdirect/phpcodesniffer-composer-installer (v1.0.0)
- Upgrading mediawiki/mediawiki-codesniffer (v41.0.0 => v43.0.0)
- Locking phpcsstandards/phpcsextra (1.1.2)
- Locking phpcsstandards/phpcsutils (1.0.9)
- Upgrading squizlabs/php_codesniffer (3.7.2 => 3.8.1)
Writing lock file
Installing dependencies from lock file (including require-dev)
Package operations: 3 installs, 3 updates, 0 removals
0 [>---------------------------] 0 [->--------------------------]
- Upgrading squizlabs/php_codesniffer (3.7.2 => 3.8.1): Extracting archive
- Installing dealerdirect/phpcodesniffer-composer-installer (v1.0.0): Extracting archive
- Installing phpcsstandards/phpcsutils (1.0.9): Extracting archive
- Installing phpcsstandards/phpcsextra (1.1.2): Extracting archive
- Upgrading composer/semver (3.3.2 => 3.4.0): Extracting archive
- Upgrading mediawiki/mediawiki-codesniffer (v41.0.0 => v43.0.0): Extracting archive
0/4 [>---------------------------] 0%
4/4 [============================] 100%
Generating autoload files
15 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 ---
{'MediaWiki.Files.ClassMatchesFilename.NotMatch', 'MediaWiki.Commenting.FunctionComment.TypeTypeHintParam'}
Tests fail!
$ vendor/bin/phpcbf
--- stdout ---
PHPCBF RESULT SUMMARY
--------------------------------------------------------------------------------
FILE FIXED REMAINING
--------------------------------------------------------------------------------
/src/repo/includes/HTMLDiffEngine.class.php 1 1
...repo/src/Hook/ArticleContentOnDiff/AddTabbedDiffEngines.php 1 0
--------------------------------------------------------------------------------
A TOTAL OF 2 ERRORS WERE FIXED IN 2 FILES
--------------------------------------------------------------------------------
Time: 229ms; Memory: 6MB
--- 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
15 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.7 | 10 parallel jobs
........... 11/11 (100 %)
Checked 11 files in 0.1 seconds
No syntax error found
MinusX
======
Processing /src/repo...
.............................................................
..........
All good!
........... 11 / 11 (100%)
Time: 121ms; Memory: 10MB
--- 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": 321,
"optional": 0,
"peer": 1,
"peerOptional": 0,
"total": 321
}
}
}
--- end ---
$ package-lock-lint package-lock.json
--- stdout ---
Checking package-lock.json
--- end ---
build: Updating mediawiki/mediawiki-codesniffer to 43.0.0
The following sniffs now pass and were enabled:
* MediaWiki.Commenting.FunctionComment.TypeTypeHintParam
$ git add .
--- stdout ---
--- end ---
$ git commit -F /tmp/tmp0i7_qslj
--- stdout ---
[master 1ca76dd] build: Updating mediawiki/mediawiki-codesniffer to 43.0.0
4 files changed, 7 insertions(+), 5 deletions(-)
--- end ---
$ git format-patch HEAD~1 --stdout
--- stdout ---
From 1ca76ddc62caaa8d7a2bd490458b435021c827d6 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Mon, 18 Mar 2024 13:38:49 +0000
Subject: [PATCH] build: Updating mediawiki/mediawiki-codesniffer to 43.0.0
The following sniffs now pass and were enabled:
* MediaWiki.Commenting.FunctionComment.TypeTypeHintParam
Change-Id: I1b7917eddc2d221a3a6761fe7ba62371fa041ec7
---
.phpcs.xml | 1 -
composer.json | 5 +++--
includes/HTMLDiffEngine.class.php | 3 ++-
src/Hook/ArticleContentOnDiff/AddTabbedDiffEngines.php | 3 ++-
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/.phpcs.xml b/.phpcs.xml
index 31963ca..d088a63 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ruleset>
<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
- <exclude name="MediaWiki.Commenting.FunctionComment.TypeTypeHintParam" />
<exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
</rule>
<file>.</file>
diff --git a/composer.json b/composer.json
index 9978972..f37c00d 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
}
},
"require-dev": {
- "mediawiki/mediawiki-codesniffer": "41.0.0",
+ "mediawiki/mediawiki-codesniffer": "43.0.0",
"mediawiki/minus-x": "1.1.1",
"php-parallel-lint/php-console-highlighter": "1.0.0",
"php-parallel-lint/php-parallel-lint": "1.3.2"
@@ -34,7 +34,8 @@
},
"config": {
"allow-plugins": {
- "composer/installers": true
+ "composer/installers": true,
+ "dealerdirect/phpcodesniffer-composer-installer": true
}
}
}
diff --git a/includes/HTMLDiffEngine.class.php b/includes/HTMLDiffEngine.class.php
index 5043806..ae00a24 100644
--- a/includes/HTMLDiffEngine.class.php
+++ b/includes/HTMLDiffEngine.class.php
@@ -197,7 +197,8 @@ class HTMLDiffEngine extends DiffEngine {
// Let's build standard conformant attributes
$aModAttr = [ 'previous', 'next', 'changeid', 'changes', 'changetype' ];
foreach ( $aModAttr as $sAttr ) {
- if ( !$oElement->hasAttribute( $sAttr ) ) { continue;
+ if ( !$oElement->hasAttribute( $sAttr ) ) {
+ continue;
}
$oElement->setAttribute( 'data-' . $sAttr, $oElement->getAttribute( $sAttr ) );
$oElement->removeAttribute( $sAttr );
diff --git a/src/Hook/ArticleContentOnDiff/AddTabbedDiffEngines.php b/src/Hook/ArticleContentOnDiff/AddTabbedDiffEngines.php
index bb58a3f..18f0579 100644
--- a/src/Hook/ArticleContentOnDiff/AddTabbedDiffEngines.php
+++ b/src/Hook/ArticleContentOnDiff/AddTabbedDiffEngines.php
@@ -203,7 +203,8 @@ class AddTabbedDiffEngines extends ArticleContentOnDiff {
}
foreach ( $aFirstLevelNodes as $oNode ) {
- if ( $oNode instanceof DOMElement == false ) { continue;
+ if ( $oNode instanceof DOMElement == false ) {
+ continue;
}
$aNodeClasses = explode( ' ', $oNode->getAttribute( 'class' ) );
if ( $oNode->nodeName == 'table' && in_array( 'diff', $aNodeClasses ) ) {
--
2.39.2
--- end ---