From e43fbc90c0ae0333e1a475eee7a0ca00b7bd8428 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Thu, 18 Apr 2024 23:38:21 +0000
Subject: [PATCH] build: Updating composer dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* mediawiki/mediawiki-codesniffer: 41.0.0 → 43.0.0
The following sniffs now pass and were enabled:
* MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment
* mediawiki/mediawiki-phan-config: 0.12.1 → 0.14.0
Change-Id: I6f0f23d624eb05f8f1bd25a93217a70a452c3439
---
.phpcs.xml | 1 -
composer.json | 9 ++++--
includes/ParameterReplacerFormatter.php | 38 ++++++++++++-------------
3 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/.phpcs.xml b/.phpcs.xml
index 2e1b08b..b7ea0fd 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
<ruleset>
<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
- <exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
</rule>
<file>.</file>
<arg name="extensions" value="php" />
diff --git a/composer.json b/composer.json
index 19c1820..412f9d0 100644
--- a/composer.json
+++ b/composer.json
@@ -5,8 +5,8 @@
"require": {},
"homepage": "https://mediawiki.org/wiki/Extension:HTMLTemplates",
"require-dev": {
- "mediawiki/mediawiki-codesniffer": "41.0.0",
- "mediawiki/mediawiki-phan-config": "0.12.1",
+ "mediawiki/mediawiki-codesniffer": "43.0.0",
+ "mediawiki/mediawiki-phan-config": "0.14.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",
@@ -24,5 +24,10 @@
],
"phan": "phan -d . --long-progress-bar",
"phpcs": "phpcs -sp --cache"
+ },
+ "config": {
+ "allow-plugins": {
+ "dealerdirect/phpcodesniffer-composer-installer": true
+ }
}
}
diff --git a/includes/ParameterReplacerFormatter.php b/includes/ParameterReplacerFormatter.php
index c979ea9..f5e21af 100644
--- a/includes/ParameterReplacerFormatter.php
+++ b/includes/ParameterReplacerFormatter.php
@@ -84,29 +84,29 @@ class ParameterReplacerFormatter extends HtmlFormatter {
public function element( SerializerNode $parent, SerializerNode $node, $contents ) {
$name = $node->name;
$s = "<$name";
- foreach ( $node->attrs->getValues() as $attrName => $attrValue ) {
- if ( $this->shouldReplace( $attrValue ) ) {
- $dom = $this->parser->preprocessToDom( $attrValue, Parser::PTD_FOR_INCLUSION );
- $expanded = substr( $attrName, 0, 2 ) === 'on' ?
- $this->expandUnquotedJS( $dom ) :
- $this->expandPlain( $dom );
- $attrValue = $this->postProcessAttr( $attrName, $expanded );
- }
- $encValue = strtr( $attrValue, $this->attributeEscapes );
- $s .= " $attrName=\"$encValue\"";
+ foreach ( $node->attrs->getValues() as $attrName => $attrValue ) {
+ if ( $this->shouldReplace( $attrValue ) ) {
+ $dom = $this->parser->preprocessToDom( $attrValue, Parser::PTD_FOR_INCLUSION );
+ $expanded = substr( $attrName, 0, 2 ) === 'on' ?
+ $this->expandUnquotedJS( $dom ) :
+ $this->expandPlain( $dom );
+ $attrValue = $this->postProcessAttr( $attrName, $expanded );
}
+ $encValue = strtr( $attrValue, $this->attributeEscapes );
+ $s .= " $attrName=\"$encValue\"";
+ }
$s .= '>';
- if ( $node->namespace === HTMLData::NS_HTML ) {
- if ( isset( $contents[0] ) && $contents[0] === "\n"
- && isset( $this->prefixLfElements[$name] )
- ) {
- $s .= "\n$contents</$name>";
- } elseif ( !isset( $this->voidElements[$name] ) ) {
- $s .= "$contents</$name>";
- }
- } else {
+ if ( $node->namespace === HTMLData::NS_HTML ) {
+ if ( isset( $contents[0] ) && $contents[0] === "\n"
+ && isset( $this->prefixLfElements[$name] )
+ ) {
+ $s .= "\n$contents</$name>";
+ } elseif ( !isset( $this->voidElements[$name] ) ) {
$s .= "$contents</$name>";
}
+ } else {
+ $s .= "$contents</$name>";
+ }
return $s;
}
--
2.39.2
$ date
--- stdout ---
Thu Apr 18 23:38:16 UTC 2024
--- end ---
$ git clone file:///srv/git/mediawiki-extensions-HTMLTemplates.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 ---
40fb19f635deecd3131f1226c0022c68119c63f0 refs/heads/master
--- 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: 37 installs, 0 updates, 0 removals
- Locking composer/pcre (3.1.3)
- Locking composer/semver (3.3.2)
- Locking composer/spdx-licenses (1.5.8)
- Locking composer/xdebug-handler (3.0.4)
- Locking doctrine/deprecations (1.1.3)
- Locking felixfbecker/advanced-json-rpc (v3.2.1)
- Locking mediawiki/mediawiki-codesniffer (v41.0.0)
- Locking mediawiki/mediawiki-phan-config (0.12.1)
- Locking mediawiki/minus-x (1.1.1)
- Locking mediawiki/phan-taint-check-plugin (4.0.0)
- Locking microsoft/tolerant-php-parser (v0.1.1)
- Locking netresearch/jsonmapper (v4.4.1)
- Locking phan/phan (5.4.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 phpdocumentor/reflection-common (2.2.0)
- Locking phpdocumentor/reflection-docblock (5.4.0)
- Locking phpdocumentor/type-resolver (1.8.2)
- Locking phpstan/phpdoc-parser (1.28.0)
- Locking psr/container (2.0.2)
- Locking psr/log (2.0.0)
- Locking sabre/event (5.1.4)
- 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.2)
- Locking symfony/string (v6.4.4)
- Locking tysonandre/var_representation_polyfill (0.1.3)
- Locking webmozart/assert (1.11.0)
- Locking wikimedia/testing-access-wrapper (1.0.0)
Writing lock file
Installing dependencies from lock file (including require-dev)
Package operations: 37 installs, 0 updates, 0 removals
0 [>---------------------------] 0 [->--------------------------]
- Installing composer/pcre (3.1.3): 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 tysonandre/var_representation_polyfill (0.1.3): 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.2): 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 sabre/event (5.1.4): Extracting archive
- Installing netresearch/jsonmapper (v4.4.1): Extracting archive
- Installing microsoft/tolerant-php-parser (v0.1.1): Extracting archive
- Installing webmozart/assert (1.11.0): Extracting archive
- Installing phpstan/phpdoc-parser (1.28.0): Extracting archive
- Installing phpdocumentor/reflection-common (2.2.0): Extracting archive
- Installing doctrine/deprecations (1.1.3): Extracting archive
- Installing phpdocumentor/type-resolver (1.8.2): Extracting archive
- Installing phpdocumentor/reflection-docblock (5.4.0): Extracting archive
- Installing felixfbecker/advanced-json-rpc (v3.2.1): Extracting archive
- Installing psr/log (2.0.0): Extracting archive
- Installing composer/xdebug-handler (3.0.4): Extracting archive
- Installing phan/phan (5.4.1): Extracting archive
- Installing mediawiki/phan-taint-check-plugin (4.0.0): Extracting archive
- Installing mediawiki/mediawiki-phan-config (0.12.1): 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
- Installing wikimedia/testing-access-wrapper (1.0.0): Extracting archive
0/37 [>---------------------------] 0%
21/37 [===============>------------] 56%
36/37 [===========================>] 97%
37/37 [============================] 100%
3 package suggestions were added by new dependencies, use `composer suggest` to see details.
Generating autoload files
15 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
Upgrading c:mediawiki/mediawiki-phan-config from 0.12.1 -> 0.14.0
$ /usr/bin/composer update
--- stderr ---
Loading composer repositories with package information
Updating dependencies
Lock file operations: 3 installs, 7 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)
- Upgrading mediawiki/mediawiki-phan-config (0.12.1 => 0.14.0)
- Upgrading mediawiki/phan-taint-check-plugin (4.0.0 => 6.0.0)
- Upgrading microsoft/tolerant-php-parser (v0.1.1 => v0.1.2)
- Upgrading phan/phan (5.4.1 => 5.4.3)
- 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, 7 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
- Upgrading microsoft/tolerant-php-parser (v0.1.1 => v0.1.2): Extracting archive
- Upgrading phan/phan (5.4.1 => 5.4.3): Extracting archive
- Upgrading mediawiki/phan-taint-check-plugin (4.0.0 => 6.0.0): Extracting archive
- Upgrading mediawiki/mediawiki-phan-config (0.12.1 => 0.14.0): Extracting archive
0/8 [>---------------------------] 0%
7/8 [========================>---] 87%
8/8 [============================] 100%
Generating autoload files
16 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.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment'}
Tests fail!
$ vendor/bin/phpcbf
--- stdout ---
PHPCBF RESULT SUMMARY
----------------------------------------------------------------------
FILE FIXED REMAINING
----------------------------------------------------------------------
/src/repo/includes/ParameterReplacerFormatter.php 10 0
----------------------------------------------------------------------
A TOTAL OF 10 ERRORS WERE FIXED IN 1 FILE
----------------------------------------------------------------------
Time: 312ms; Memory: 8MB
--- 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
16 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
> phpcs -sp --cache
> minus-x check .
--- stdout ---
PHP 8.2.7 | 10 parallel jobs
.......... 10/10 (100 %)
Checked 10 files in 0.1 seconds
No syntax error found
.......... 10 / 10 (100%)
Time: 108ms; Memory: 8MB
MinusX
======
Processing /src/repo...
...................................
All good!
--- end ---
build: Updating composer dependencies
* mediawiki/mediawiki-codesniffer: 41.0.0 → 43.0.0
The following sniffs now pass and were enabled:
* MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment
* mediawiki/mediawiki-phan-config: 0.12.1 → 0.14.0
$ git add .
--- stdout ---
--- end ---
$ git commit -F /tmp/tmpa2jjyn_9
--- stdout ---
[master e43fbc9] build: Updating composer dependencies
3 files changed, 26 insertions(+), 22 deletions(-)
--- end ---
$ git format-patch HEAD~1 --stdout
--- stdout ---
From e43fbc90c0ae0333e1a475eee7a0ca00b7bd8428 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Thu, 18 Apr 2024 23:38:21 +0000
Subject: [PATCH] build: Updating composer dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* mediawiki/mediawiki-codesniffer: 41.0.0 → 43.0.0
The following sniffs now pass and were enabled:
* MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment
* mediawiki/mediawiki-phan-config: 0.12.1 → 0.14.0
Change-Id: I6f0f23d624eb05f8f1bd25a93217a70a452c3439
---
.phpcs.xml | 1 -
composer.json | 9 ++++--
includes/ParameterReplacerFormatter.php | 38 ++++++++++++-------------
3 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/.phpcs.xml b/.phpcs.xml
index 2e1b08b..b7ea0fd 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
<ruleset>
<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
- <exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
</rule>
<file>.</file>
<arg name="extensions" value="php" />
diff --git a/composer.json b/composer.json
index 19c1820..412f9d0 100644
--- a/composer.json
+++ b/composer.json
@@ -5,8 +5,8 @@
"require": {},
"homepage": "https://mediawiki.org/wiki/Extension:HTMLTemplates",
"require-dev": {
- "mediawiki/mediawiki-codesniffer": "41.0.0",
- "mediawiki/mediawiki-phan-config": "0.12.1",
+ "mediawiki/mediawiki-codesniffer": "43.0.0",
+ "mediawiki/mediawiki-phan-config": "0.14.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",
@@ -24,5 +24,10 @@
],
"phan": "phan -d . --long-progress-bar",
"phpcs": "phpcs -sp --cache"
+ },
+ "config": {
+ "allow-plugins": {
+ "dealerdirect/phpcodesniffer-composer-installer": true
+ }
}
}
diff --git a/includes/ParameterReplacerFormatter.php b/includes/ParameterReplacerFormatter.php
index c979ea9..f5e21af 100644
--- a/includes/ParameterReplacerFormatter.php
+++ b/includes/ParameterReplacerFormatter.php
@@ -84,29 +84,29 @@ class ParameterReplacerFormatter extends HtmlFormatter {
public function element( SerializerNode $parent, SerializerNode $node, $contents ) {
$name = $node->name;
$s = "<$name";
- foreach ( $node->attrs->getValues() as $attrName => $attrValue ) {
- if ( $this->shouldReplace( $attrValue ) ) {
- $dom = $this->parser->preprocessToDom( $attrValue, Parser::PTD_FOR_INCLUSION );
- $expanded = substr( $attrName, 0, 2 ) === 'on' ?
- $this->expandUnquotedJS( $dom ) :
- $this->expandPlain( $dom );
- $attrValue = $this->postProcessAttr( $attrName, $expanded );
- }
- $encValue = strtr( $attrValue, $this->attributeEscapes );
- $s .= " $attrName=\"$encValue\"";
+ foreach ( $node->attrs->getValues() as $attrName => $attrValue ) {
+ if ( $this->shouldReplace( $attrValue ) ) {
+ $dom = $this->parser->preprocessToDom( $attrValue, Parser::PTD_FOR_INCLUSION );
+ $expanded = substr( $attrName, 0, 2 ) === 'on' ?
+ $this->expandUnquotedJS( $dom ) :
+ $this->expandPlain( $dom );
+ $attrValue = $this->postProcessAttr( $attrName, $expanded );
}
+ $encValue = strtr( $attrValue, $this->attributeEscapes );
+ $s .= " $attrName=\"$encValue\"";
+ }
$s .= '>';
- if ( $node->namespace === HTMLData::NS_HTML ) {
- if ( isset( $contents[0] ) && $contents[0] === "\n"
- && isset( $this->prefixLfElements[$name] )
- ) {
- $s .= "\n$contents</$name>";
- } elseif ( !isset( $this->voidElements[$name] ) ) {
- $s .= "$contents</$name>";
- }
- } else {
+ if ( $node->namespace === HTMLData::NS_HTML ) {
+ if ( isset( $contents[0] ) && $contents[0] === "\n"
+ && isset( $this->prefixLfElements[$name] )
+ ) {
+ $s .= "\n$contents</$name>";
+ } elseif ( !isset( $this->voidElements[$name] ) ) {
$s .= "$contents</$name>";
}
+ } else {
+ $s .= "$contents</$name>";
+ }
return $s;
}
--
2.39.2
--- end ---