From 312a7eb7fae29c8c01b0d208d115a3f4effcfefa Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Thu, 28 Mar 2024 23:23:46 +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
* mediawiki/mediawiki-phan-config: 0.12.1 → 0.14.0
Change-Id: I394dc1e1d04c9973008e97b94b8a99ca1e1d4e49
---
composer.json | 9 +++++++--
src/MultiHttpClient.php | 2 +-
src/Repo.php | 14 +++++++-------
3 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/composer.json b/composer.json
index 89a1906..e7ae8d0 100644
--- a/composer.json
+++ b/composer.json
@@ -8,8 +8,8 @@
},
"homepage": "https://mediawiki.org/wiki/Extension:QuickInstantCommons",
"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",
@@ -27,5 +27,10 @@
],
"phan": "phan -d . --long-progress-bar",
"phpcs": "phpcs -sp --cache"
+ },
+ "config": {
+ "allow-plugins": {
+ "dealerdirect/phpcodesniffer-composer-installer": true
+ }
}
}
diff --git a/src/MultiHttpClient.php b/src/MultiHttpClient.php
index 7d617c4..851a38a 100644
--- a/src/MultiHttpClient.php
+++ b/src/MultiHttpClient.php
@@ -452,7 +452,7 @@ class MultiHttpClient implements LoggerAwareInterface {
if ( strpos( $header, ":" ) === false ) {
return $length;
}
- list( $name, $value ) = explode( ":", $header, 2 );
+ [ $name, $value ] = explode( ":", $header, 2 );
$name = strtolower( $name );
$value = trim( $value );
if ( isset( $req['response']['headers'][$name] ) ) {
diff --git a/src/Repo.php b/src/Repo.php
index 330e842..232d1b3 100644
--- a/src/Repo.php
+++ b/src/Repo.php
@@ -527,7 +527,7 @@ class Repo extends \FileRepo implements \IForeignRepoWithMWApi {
$res = $this->httpClient->runMulti( $arg );
$firstRes = $res[0]['response'];
- list( $code, , ,$body, $err ) = $firstRes;
+ [ $code, , , $body, $err ] = $firstRes;
if ( $code == 200 ) {
return $res;
@@ -734,11 +734,11 @@ class Repo extends \FileRepo implements \IForeignRepoWithMWApi {
$filesToCacheUrl[$img] = [ $url, $key ];
if ( $this->isTMHFile( $img ) ) {
- list( $viUrl, $viKey ) = $this->getVideoInfoUrlAndKey( $img );
+ [ $viUrl, $viKey ] = $this->getVideoInfoUrlAndKey( $img );
$filesToCacheKey[$viKey] = $img . '#videoinfo';
$filesToCacheUrl[$img . '#videoinfo'] = [ $viUrl, $viKey ];
- list( $ttUrl, $ttKey ) = $this->getTimedTextUrlAndKey( $img );
+ [ $ttUrl, $ttKey ] = $this->getTimedTextUrlAndKey( $img );
$filesToCacheKey[$ttKey] = $img . '#timedtext';
$filesToCacheUrl[$img . '#timedtext'] = [ $ttUrl, $ttKey ];
}
@@ -761,11 +761,11 @@ class Repo extends \FileRepo implements \IForeignRepoWithMWApi {
if ( $decision ) {
// Based on WanObjectCache::worthRefreshExpiring
if ( $decision ) {
- $this->logger->debug( "preemptively refreshing {file} [{key}] during prefetch. ttl={ttl}", [
+ $this->logger->debug( "preemptively refreshing {file} [{key}] during prefetch. ttl={ttl}", [
'file' => $imgName,
'key' => $key,
'ttl' => $ttls[$key]
- ] );
+ ] );
}
} else {
@@ -785,7 +785,7 @@ class Repo extends \FileRepo implements \IForeignRepoWithMWApi {
$reqs = [];
foreach ( $filesToCacheUrl as $imgName => $info ) {
- list( $url, $key ) = $info;
+ [ $url, $key ] = $info;
$reqs[] = [
'method' => 'GET',
'url' => $url,
@@ -806,7 +806,7 @@ class Repo extends \FileRepo implements \IForeignRepoWithMWApi {
$results = $this->httpClient->finishMultiAsync();
$this->logger->debug( "Got http prefetch for {count} files", [ 'count' => count( $results ) ] );
foreach ( $results as $res ) {
- list( $code, , ,$body, $err ) = $res['response'];
+ [ $code, , , $body, $err ] = $res['response'];
$imgName = $res['_imgName'];
$key = $res['_key'];
--
2.39.2
$ date
--- stdout ---
Thu Mar 28 23:23:38 UTC 2024
--- end ---
$ git clone file:///srv/git/mediawiki-extensions-QuickInstantCommons.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 ---
7448846b04fa5184d32ff1d0d6b8a9d5e7bcf233 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.3.0)
- Locking phpdocumentor/type-resolver (1.8.2)
- Locking phpstan/phpdoc-parser (1.27.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.1)
- 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.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.1): Extracting archive
- Installing webmozart/assert (1.11.0): Extracting archive
- Installing phpstan/phpdoc-parser (1.27.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.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%
18/37 [=============>--------------] 48%
34/37 [=========================>--] 91%
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', 'MediaWiki.Usage.ForbiddenFunctions.is_resource'}
Tests fail!
$ vendor/bin/phpcbf
--- stdout ---
PHPCBF RESULT SUMMARY
----------------------------------------------------------------------
FILE FIXED REMAINING
----------------------------------------------------------------------
/src/repo/src/MultiHttpClient.php 1 7
/src/repo/src/Repo.php 9 4
----------------------------------------------------------------------
A TOTAL OF 10 ERRORS WERE FIXED IN 2 FILES
----------------------------------------------------------------------
Time: 368ms; 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
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
...... 6/6 (100 %)
Checked 6 files in 0.1 seconds
No syntax error found
...... 6 / 6 (100%)
Time: 95ms; Memory: 8MB
MinusX
======
Processing /src/repo...
........................................
All good!
--- end ---
build: Updating composer dependencies
* mediawiki/mediawiki-codesniffer: 41.0.0 → 43.0.0
* mediawiki/mediawiki-phan-config: 0.12.1 → 0.14.0
$ git add .
--- stdout ---
--- end ---
$ git commit -F /tmp/tmpla5kxojh
--- stdout ---
[master 312a7eb] build: Updating composer dependencies
3 files changed, 15 insertions(+), 10 deletions(-)
--- end ---
$ git format-patch HEAD~1 --stdout
--- stdout ---
From 312a7eb7fae29c8c01b0d208d115a3f4effcfefa Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Thu, 28 Mar 2024 23:23:46 +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
* mediawiki/mediawiki-phan-config: 0.12.1 → 0.14.0
Change-Id: I394dc1e1d04c9973008e97b94b8a99ca1e1d4e49
---
composer.json | 9 +++++++--
src/MultiHttpClient.php | 2 +-
src/Repo.php | 14 +++++++-------
3 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/composer.json b/composer.json
index 89a1906..e7ae8d0 100644
--- a/composer.json
+++ b/composer.json
@@ -8,8 +8,8 @@
},
"homepage": "https://mediawiki.org/wiki/Extension:QuickInstantCommons",
"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",
@@ -27,5 +27,10 @@
],
"phan": "phan -d . --long-progress-bar",
"phpcs": "phpcs -sp --cache"
+ },
+ "config": {
+ "allow-plugins": {
+ "dealerdirect/phpcodesniffer-composer-installer": true
+ }
}
}
diff --git a/src/MultiHttpClient.php b/src/MultiHttpClient.php
index 7d617c4..851a38a 100644
--- a/src/MultiHttpClient.php
+++ b/src/MultiHttpClient.php
@@ -452,7 +452,7 @@ class MultiHttpClient implements LoggerAwareInterface {
if ( strpos( $header, ":" ) === false ) {
return $length;
}
- list( $name, $value ) = explode( ":", $header, 2 );
+ [ $name, $value ] = explode( ":", $header, 2 );
$name = strtolower( $name );
$value = trim( $value );
if ( isset( $req['response']['headers'][$name] ) ) {
diff --git a/src/Repo.php b/src/Repo.php
index 330e842..232d1b3 100644
--- a/src/Repo.php
+++ b/src/Repo.php
@@ -527,7 +527,7 @@ class Repo extends \FileRepo implements \IForeignRepoWithMWApi {
$res = $this->httpClient->runMulti( $arg );
$firstRes = $res[0]['response'];
- list( $code, , ,$body, $err ) = $firstRes;
+ [ $code, , , $body, $err ] = $firstRes;
if ( $code == 200 ) {
return $res;
@@ -734,11 +734,11 @@ class Repo extends \FileRepo implements \IForeignRepoWithMWApi {
$filesToCacheUrl[$img] = [ $url, $key ];
if ( $this->isTMHFile( $img ) ) {
- list( $viUrl, $viKey ) = $this->getVideoInfoUrlAndKey( $img );
+ [ $viUrl, $viKey ] = $this->getVideoInfoUrlAndKey( $img );
$filesToCacheKey[$viKey] = $img . '#videoinfo';
$filesToCacheUrl[$img . '#videoinfo'] = [ $viUrl, $viKey ];
- list( $ttUrl, $ttKey ) = $this->getTimedTextUrlAndKey( $img );
+ [ $ttUrl, $ttKey ] = $this->getTimedTextUrlAndKey( $img );
$filesToCacheKey[$ttKey] = $img . '#timedtext';
$filesToCacheUrl[$img . '#timedtext'] = [ $ttUrl, $ttKey ];
}
@@ -761,11 +761,11 @@ class Repo extends \FileRepo implements \IForeignRepoWithMWApi {
if ( $decision ) {
// Based on WanObjectCache::worthRefreshExpiring
if ( $decision ) {
- $this->logger->debug( "preemptively refreshing {file} [{key}] during prefetch. ttl={ttl}", [
+ $this->logger->debug( "preemptively refreshing {file} [{key}] during prefetch. ttl={ttl}", [
'file' => $imgName,
'key' => $key,
'ttl' => $ttls[$key]
- ] );
+ ] );
}
} else {
@@ -785,7 +785,7 @@ class Repo extends \FileRepo implements \IForeignRepoWithMWApi {
$reqs = [];
foreach ( $filesToCacheUrl as $imgName => $info ) {
- list( $url, $key ) = $info;
+ [ $url, $key ] = $info;
$reqs[] = [
'method' => 'GET',
'url' => $url,
@@ -806,7 +806,7 @@ class Repo extends \FileRepo implements \IForeignRepoWithMWApi {
$results = $this->httpClient->finishMultiAsync();
$this->logger->debug( "Got http prefetch for {count} files", [ 'count' => count( $results ) ] );
foreach ( $results as $res ) {
- list( $code, , ,$body, $err ) = $res['response'];
+ [ $code, , , $body, $err ] = $res['response'];
$imgName = $res['_imgName'];
$key = $res['_key'];
--
2.39.2
--- end ---