This run took 15 seconds.
From 815e554a539b329a5978a7678acc6bbec07f2c0f Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Sun, 17 Mar 2024 17:42:33 +0000
Subject: [PATCH] build: Updating mediawiki/mediawiki-codesniffer to 43.0.0
The following sniffs are failing and were disabled:
* Generic.CodeAnalysis.AssignmentInCondition.Found
* Generic.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition
Change-Id: I3d0a5cbea7ac1340c75abf005f4c0bf908a88afd
---
.phpcs.xml | 2 ++
composer.json | 5 +++--
includes/connectors/EDConnectorOdbc.php | 4 ++--
tests/phpunit/unit/connectors/EDConnectorBaseTest.php | 2 +-
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/.phpcs.xml b/.phpcs.xml
index be46b5d..e93ba77 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<ruleset>
<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+ <exclude name="Generic.CodeAnalysis.AssignmentInCondition.Found" />
+ <exclude name="Generic.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition" />
<!-- Until PHPCS sorts itself out -->
<properties>
<property name="allowedPrefixes" type="array">
diff --git a/composer.json b/composer.json
index f63705b..03d59f8 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
"symfony/css-selector": "~5.1"
},
"require-dev": {
- "mediawiki/mediawiki-codesniffer": "41.0.0",
+ "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",
@@ -46,7 +46,8 @@
"optimize-autoloader": true,
"prepend-autoloader": false,
"allow-plugins": {
- "composer/installers": true
+ "composer/installers": true,
+ "dealerdirect/phpcodesniffer-composer-installer": true
}
}
}
diff --git a/includes/connectors/EDConnectorOdbc.php b/includes/connectors/EDConnectorOdbc.php
index 945e4a2..af4f490 100644
--- a/includes/connectors/EDConnectorOdbc.php
+++ b/includes/connectors/EDConnectorOdbc.php
@@ -216,8 +216,8 @@ class EDConnectorOdbc extends EDConnectorComposed {
*/
protected function getQuery() {
return strtr( static::TEMPLATE /* late binding */, [
- '$columns' => static::listColumns( $this->columns ), // late binding
- '$from' => static::from( $this->tables, $this->joins ), // late binding
+ '$columns' => static::listColumns( $this->columns ), // late binding
+ '$from' => static::from( $this->tables, $this->joins ), // late binding
'$where' => $this->conditions ? "\nWHERE {$this->conditions}" : '',
'$group' => $this->sqlOptions['GROUP BY'] ? "\nGROUP BY {$this->sqlOptions['GROUP BY']}" : '',
'$having' => $this->sqlOptions['HAVING'] ? "\nHAVING {$this->sqlOptions['HAVING']}" : '',
diff --git a/tests/phpunit/unit/connectors/EDConnectorBaseTest.php b/tests/phpunit/unit/connectors/EDConnectorBaseTest.php
index 3b768b5..723098f 100644
--- a/tests/phpunit/unit/connectors/EDConnectorBaseTest.php
+++ b/tests/phpunit/unit/connectors/EDConnectorBaseTest.php
@@ -197,7 +197,7 @@ class EDConnectorBaseTest extends EDTestBase {
$cases['Lua table'] = [
[
- 'data' => [ 'name' => 'Name' , 'time' => '__time' ],
+ 'data' => [ 'name' => 'Name', 'time' => '__time' ],
'filters' => [ 'name' => 'Alexander Mashin' ],
'source' => 'some source'
],
--
2.39.2
$ date
--- stdout ---
Sun Mar 17 17:42:21 UTC 2024
--- end ---
$ git clone file:///srv/git/mediawiki-extensions-ExternalData.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 ---
20a6b7f4c45fa4a4bd3912f8be88b90c8d0c2bd5 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": 313,
"optional": 0,
"peer": 1,
"peerOptional": 0,
"total": 313
}
}
}
--- 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: 39 installs, 0 updates, 0 removals
- Locking composer/installers (v2.2.0)
- Locking composer/pcre (3.1.2)
- Locking composer/semver (3.3.2)
- Locking composer/spdx-licenses (1.5.8)
- Locking composer/xdebug-handler (3.0.3)
- 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.14.0)
- Locking mediawiki/minus-x (1.1.1)
- Locking mediawiki/phan-taint-check-plugin (6.0.0)
- Locking microsoft/tolerant-php-parser (v0.1.2)
- Locking netresearch/jsonmapper (v4.4.1)
- Locking phan/phan (5.4.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.3.2)
- Locking phpdocumentor/reflection-common (2.2.0)
- Locking phpdocumentor/reflection-docblock (5.3.0)
- Locking phpdocumentor/type-resolver (1.8.2)
- Locking phpstan/phpdoc-parser (1.26.0)
- Locking psr/container (2.0.2)
- Locking psr/log (2.0.0)
- Locking roave/security-advisories (dev-latest eedc674)
- Locking sabre/event (5.1.4)
- Locking squizlabs/php_codesniffer (3.7.2)
- Locking symfony/console (v5.4.36)
- Locking symfony/css-selector (v5.4.35)
- 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)
- Locking tysonandre/var_representation_polyfill (0.1.3)
- Locking webmozart/assert (1.11.0)
Writing lock file
Installing dependencies from lock file (including require-dev)
Package operations: 39 installs, 0 updates, 0 removals
0 [>---------------------------] 0 [->--------------------------]
- Installing composer/installers (v2.2.0): Extracting archive
- Installing composer/pcre (3.1.2): 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.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 sabre/event (5.1.4): Extracting archive
- Installing netresearch/jsonmapper (v4.4.1): Extracting archive
- Installing microsoft/tolerant-php-parser (v0.1.2): Extracting archive
- Installing webmozart/assert (1.11.0): Extracting archive
- Installing phpstan/phpdoc-parser (1.26.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.3.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.3): Extracting archive
- Installing phan/phan (5.4.3): Extracting archive
- Installing mediawiki/phan-taint-check-plugin (6.0.0): Extracting archive
- Installing mediawiki/mediawiki-phan-config (0.14.0): 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 roave/security-advisories (dev-latest eedc674)
- Installing symfony/css-selector (v5.4.35): Extracting archive
0/37 [>---------------------------] 0%
18/37 [=============>--------------] 48%
36/37 [===========================>] 97%
37/37 [============================] 100%
9 package suggestions were added by new dependencies, use `composer suggest` to see details.
Generating optimized autoload files
18 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 optimized autoload files
19 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/connectors/EDConnectorOdbc.php 2 10
.../repo/tests/phpunit/unit/connectors/EDConnectorBaseTest.php 1 0
--------------------------------------------------------------------------------
A TOTAL OF 3 ERRORS WERE FIXED IN 2 FILES
--------------------------------------------------------------------------------
Time: 660ms; 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 optimized autoload files
19 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 node_modules --exclude vendor
> phpcs -sp --cache
> minus-x check .
--- stdout ---
PHP 8.2.7 | 10 parallel jobs
............................................................ 60/71 (84 %)
........... 71/71 (100 %)
Checked 71 files in 0.3 seconds
No syntax error found
.................................... 36 / 36 (100%)
Time: 241ms; Memory: 10MB
MinusX
======
Processing /src/repo...
.............................................................
.............................................................
.............................................................
.........
All good!
--- 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": 313,
"optional": 0,
"peer": 1,
"peerOptional": 0,
"total": 313
}
}
}
--- 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 are failing and were disabled:
* Generic.CodeAnalysis.AssignmentInCondition.Found
* Generic.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition
$ git add .
--- stdout ---
--- end ---
$ git commit -F /tmp/tmp56b_xo6s
--- stdout ---
[master 815e554] build: Updating mediawiki/mediawiki-codesniffer to 43.0.0
4 files changed, 8 insertions(+), 5 deletions(-)
--- end ---
$ git format-patch HEAD~1 --stdout
--- stdout ---
From 815e554a539b329a5978a7678acc6bbec07f2c0f Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Sun, 17 Mar 2024 17:42:33 +0000
Subject: [PATCH] build: Updating mediawiki/mediawiki-codesniffer to 43.0.0
The following sniffs are failing and were disabled:
* Generic.CodeAnalysis.AssignmentInCondition.Found
* Generic.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition
Change-Id: I3d0a5cbea7ac1340c75abf005f4c0bf908a88afd
---
.phpcs.xml | 2 ++
composer.json | 5 +++--
includes/connectors/EDConnectorOdbc.php | 4 ++--
tests/phpunit/unit/connectors/EDConnectorBaseTest.php | 2 +-
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/.phpcs.xml b/.phpcs.xml
index be46b5d..e93ba77 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<ruleset>
<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+ <exclude name="Generic.CodeAnalysis.AssignmentInCondition.Found" />
+ <exclude name="Generic.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition" />
<!-- Until PHPCS sorts itself out -->
<properties>
<property name="allowedPrefixes" type="array">
diff --git a/composer.json b/composer.json
index f63705b..03d59f8 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
"symfony/css-selector": "~5.1"
},
"require-dev": {
- "mediawiki/mediawiki-codesniffer": "41.0.0",
+ "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",
@@ -46,7 +46,8 @@
"optimize-autoloader": true,
"prepend-autoloader": false,
"allow-plugins": {
- "composer/installers": true
+ "composer/installers": true,
+ "dealerdirect/phpcodesniffer-composer-installer": true
}
}
}
diff --git a/includes/connectors/EDConnectorOdbc.php b/includes/connectors/EDConnectorOdbc.php
index 945e4a2..af4f490 100644
--- a/includes/connectors/EDConnectorOdbc.php
+++ b/includes/connectors/EDConnectorOdbc.php
@@ -216,8 +216,8 @@ class EDConnectorOdbc extends EDConnectorComposed {
*/
protected function getQuery() {
return strtr( static::TEMPLATE /* late binding */, [
- '$columns' => static::listColumns( $this->columns ), // late binding
- '$from' => static::from( $this->tables, $this->joins ), // late binding
+ '$columns' => static::listColumns( $this->columns ), // late binding
+ '$from' => static::from( $this->tables, $this->joins ), // late binding
'$where' => $this->conditions ? "\nWHERE {$this->conditions}" : '',
'$group' => $this->sqlOptions['GROUP BY'] ? "\nGROUP BY {$this->sqlOptions['GROUP BY']}" : '',
'$having' => $this->sqlOptions['HAVING'] ? "\nHAVING {$this->sqlOptions['HAVING']}" : '',
diff --git a/tests/phpunit/unit/connectors/EDConnectorBaseTest.php b/tests/phpunit/unit/connectors/EDConnectorBaseTest.php
index 3b768b5..723098f 100644
--- a/tests/phpunit/unit/connectors/EDConnectorBaseTest.php
+++ b/tests/phpunit/unit/connectors/EDConnectorBaseTest.php
@@ -197,7 +197,7 @@ class EDConnectorBaseTest extends EDTestBase {
$cases['Lua table'] = [
[
- 'data' => [ 'name' => 'Name' , 'time' => '__time' ],
+ 'data' => [ 'name' => 'Name', 'time' => '__time' ],
'filters' => [ 'name' => 'Alexander Mashin' ],
'source' => 'some source'
],
--
2.39.2
--- end ---