This run took 13 seconds.
From 82cc81cf06be91e1d54fcfbe4a270ad96d0a6c6c Mon Sep 17 00:00:00 2001 From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org> Date: Sat, 27 Apr 2024 15:56:37 +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: 37.0.0 → 43.0.0 * ockcyp/covers-validator: 1.3.3 → 1.6.0 * php-parallel-lint/php-console-highlighter: 0.5.0 → 1.0.0 * php-parallel-lint/php-parallel-lint: 1.3.0 → 1.4.0 * phpunit/phpunit: ^8.5|^9.5 → 9.6.16 Additional changes: * Dropped default excluded folder(s) from .phpcs.xml (T274684). * Also sorted "composer fix" command to run phpcbf last. * composer.json: Updated phpcs command in composer test (T280592). * composer.json: Added phpcs command to scripts (T280592). Change-Id: I7adba072f61abdbd792084ef2399f1b680f057be --- .phpcs.xml | 2 -- composer.json | 24 +++++++++++++++--------- src/UpdateHistory.php | 16 ++++++++-------- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/.phpcs.xml b/.phpcs.xml index 97a00b4..efa31e1 100644 --- a/.phpcs.xml +++ b/.phpcs.xml @@ -4,7 +4,5 @@ <file>.</file> <arg name="encoding" value="UTF-8"/> <arg name="extensions" value="php"/> - <exclude-pattern>coverage</exclude-pattern> <exclude-pattern>doc/html</exclude-pattern> - <exclude-pattern>vendor</exclude-pattern> </ruleset> diff --git a/composer.json b/composer.json index b123385..2f697d0 100644 --- a/composer.json +++ b/composer.json @@ -23,13 +23,13 @@ "php": ">=7.2.9" }, "require-dev": { - "mediawiki/mediawiki-codesniffer": "37.0.0", + "mediawiki/mediawiki-codesniffer": "43.0.0", "mediawiki/mediawiki-phan-config": "0.14.0", "mediawiki/minus-x": "1.1.1", - "ockcyp/covers-validator": "1.3.3", - "php-parallel-lint/php-console-highlighter": "0.5.0", - "php-parallel-lint/php-parallel-lint": "1.3.0", - "phpunit/phpunit": "^8.5|^9.5" + "ockcyp/covers-validator": "1.6.0", + "php-parallel-lint/php-console-highlighter": "1.0.0", + "php-parallel-lint/php-parallel-lint": "1.4.0", + "phpunit/phpunit": "9.6.16" }, "bin": [ "bin/update-history" @@ -39,16 +39,22 @@ "parallel-lint . --exclude vendor", "phpunit", "covers-validator", - "phpcs -sp", + "@phpcs", "@phan", "minus-x check ." ], "phan": "phan --allow-polyfill-parser", "cover": "phpunit --coverage-html coverage", "fix": [ - "phpcbf", - "minus-x fix ." + "minus-x fix .", + "phpcbf" ], - "update-history": "bin/update-history patch" + "update-history": "bin/update-history patch", + "phpcs": "phpcs -sp" + }, + "config": { + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true + } } } diff --git a/src/UpdateHistory.php b/src/UpdateHistory.php index 83424a7..2fdd5df 100644 --- a/src/UpdateHistory.php +++ b/src/UpdateHistory.php @@ -29,15 +29,15 @@ class UpdateHistory { throw new \RuntimeException( "Last version not found!" ); } // Do a release! - list( $ignore,$major,$minor,$patch ) = $m2; + [ $ignore, $major, $minor, $patch ] = $m2; switch ( $which ) { - case 'patch': - case 'minor': - case 'major': - $$which = intval( $$which ) + 1; - break; - default: - throw new \RuntimeException( "Unknown version bump type: $which" ); + case 'patch': + case 'minor': + case 'major': + $$which = intval( $$which ) + 1; + break; + default: + throw new \RuntimeException( "Unknown version bump type: $which" ); } $nextVersion = "$major.$minor.$patch"; $date = date( 'Y-m-d' ); -- 2.39.2
$ date --- stdout --- Sat Apr 27 15:56:28 UTC 2024 --- end --- $ git clone file:///srv/git/mediawiki-libs-UpdateHistory.git repo --depth=1 -b main --- 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/main --- stdout --- 35ee2eb03cd3cf1a0085417bef8ef67e19d0e328 refs/heads/main --- 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: 60 installs, 0 updates, 0 removals - Locking composer/pcre (3.1.3) - Locking composer/semver (3.4.0) - Locking composer/spdx-licenses (1.5.8) - Locking composer/xdebug-handler (3.0.4) - Locking doctrine/deprecations (1.1.3) - Locking doctrine/instantiator (1.5.0) - Locking felixfbecker/advanced-json-rpc (v3.2.1) - Locking mediawiki/mediawiki-codesniffer (v37.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 myclabs/deep-copy (1.11.1) - Locking netresearch/jsonmapper (v4.4.1) - Locking ockcyp/covers-validator (v1.3.3) - Locking phan/phan (5.4.3) - Locking phar-io/manifest (2.0.4) - Locking phar-io/version (3.2.1) - Locking php-parallel-lint/php-console-color (v0.3) - Locking php-parallel-lint/php-console-highlighter (v0.5) - Locking php-parallel-lint/php-parallel-lint (v1.3.0) - 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 phpunit/php-code-coverage (7.0.17) - Locking phpunit/php-file-iterator (2.0.6) - Locking phpunit/php-text-template (1.2.1) - Locking phpunit/php-timer (2.1.4) - Locking phpunit/php-token-stream (4.0.4) - Locking phpunit/phpunit (8.5.38) - Locking psr/container (2.0.2) - Locking psr/log (2.0.0) - Locking sabre/event (5.1.4) - Locking sebastian/code-unit-reverse-lookup (1.0.3) - Locking sebastian/comparator (3.0.5) - Locking sebastian/diff (3.0.6) - Locking sebastian/environment (4.2.5) - Locking sebastian/exporter (3.1.6) - Locking sebastian/global-state (3.0.5) - Locking sebastian/object-enumerator (3.0.5) - Locking sebastian/object-reflector (1.1.3) - Locking sebastian/recursion-context (3.0.2) - Locking sebastian/resource-operations (2.0.3) - Locking sebastian/type (1.1.5) - Locking sebastian/version (2.0.1) - Locking squizlabs/php_codesniffer (3.6.0) - 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 theseer/tokenizer (1.2.3) - 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: 60 installs, 0 updates, 0 removals 0 [>---------------------------] 0 [->--------------------------] - Installing composer/pcre (3.1.3): Extracting archive - Installing squizlabs/php_codesniffer (3.6.0): Extracting archive - Installing sebastian/diff (3.0.6): Extracting archive - Installing symfony/polyfill-mbstring (v1.29.0): Extracting archive - Installing composer/spdx-licenses (1.5.8): Extracting archive - Installing composer/semver (3.4.0): Extracting archive - Installing mediawiki/mediawiki-codesniffer (v37.0.0): Extracting archive - Installing tysonandre/var_representation_polyfill (0.1.3): Extracting archive - Installing symfony/polyfill-php80 (v1.29.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.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.2): 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.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 sebastian/version (2.0.1): Extracting archive - Installing sebastian/type (1.1.5): Extracting archive - Installing sebastian/resource-operations (2.0.3): Extracting archive - Installing sebastian/recursion-context (3.0.2): Extracting archive - Installing sebastian/object-reflector (1.1.3): Extracting archive - Installing sebastian/object-enumerator (3.0.5): Extracting archive - Installing sebastian/global-state (3.0.5): Extracting archive - Installing sebastian/exporter (3.1.6): Extracting archive - Installing sebastian/environment (4.2.5): Extracting archive - Installing sebastian/comparator (3.0.5): Extracting archive - Installing phpunit/php-timer (2.1.4): Extracting archive - Installing phpunit/php-text-template (1.2.1): Extracting archive - Installing phpunit/php-file-iterator (2.0.6): Extracting archive - Installing theseer/tokenizer (1.2.3): Extracting archive - Installing sebastian/code-unit-reverse-lookup (1.0.3): Extracting archive - Installing phpunit/php-token-stream (4.0.4): Extracting archive - Installing phpunit/php-code-coverage (7.0.17): Extracting archive - Installing phar-io/version (3.2.1): Extracting archive - Installing phar-io/manifest (2.0.4): Extracting archive - Installing myclabs/deep-copy (1.11.1): Extracting archive - Installing doctrine/instantiator (1.5.0): Extracting archive - Installing phpunit/phpunit (8.5.38): Extracting archive - Installing ockcyp/covers-validator (v1.3.3): Extracting archive - Installing php-parallel-lint/php-console-color (v0.3): Extracting archive - Installing php-parallel-lint/php-console-highlighter (v0.5): Extracting archive - Installing php-parallel-lint/php-parallel-lint (v1.3.0): Extracting archive 0/60 [>---------------------------] 0% 19/60 [========>-------------------] 31% 34/60 [===============>------------] 56% 48/60 [======================>-----] 80% 60/60 [============================] 100% 8 package suggestions were added by new dependencies, use `composer suggest` to see details. Package phpunit/php-token-stream is abandoned, you should avoid using it. No replacement was suggested. Generating autoload files 35 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 37.0.0 -> 43.0.0 Upgrading c:ockcyp/covers-validator from 1.3.3 -> 1.6.0 Upgrading c:php-parallel-lint/php-console-highlighter from 0.5.0 -> 1.0.0 Upgrading c:php-parallel-lint/php-parallel-lint from 1.3.0 -> 1.4.0 Upgrading c:phpunit/phpunit from ^8.5|^9.5 -> 9.6.16 $ /usr/bin/composer update --- stderr --- Loading composer repositories with package information Updating dependencies Lock file operations: 9 installs, 24 updates, 1 removal - Removing phpunit/php-token-stream (4.0.4) - Locking dealerdirect/phpcodesniffer-composer-installer (v1.0.0) - Upgrading doctrine/instantiator (1.5.0 => 2.0.0) - Upgrading mediawiki/mediawiki-codesniffer (v37.0.0 => v43.0.0) - Locking nikic/php-parser (v5.0.2) - Upgrading ockcyp/covers-validator (v1.3.3 => v1.6.0) - Upgrading php-parallel-lint/php-console-color (v0.3 => v1.0.1) - Upgrading php-parallel-lint/php-console-highlighter (v0.5 => v1.0.0) - Upgrading php-parallel-lint/php-parallel-lint (v1.3.0 => v1.4.0) - Locking phpcsstandards/phpcsextra (1.1.2) - Locking phpcsstandards/phpcsutils (1.0.9) - Upgrading phpunit/php-code-coverage (7.0.17 => 9.2.31) - Upgrading phpunit/php-file-iterator (2.0.6 => 3.0.6) - Locking phpunit/php-invoker (3.1.1) - Upgrading phpunit/php-text-template (1.2.1 => 2.0.4) - Upgrading phpunit/php-timer (2.1.4 => 5.0.3) - Upgrading phpunit/phpunit (8.5.38 => 9.6.16) - Locking sebastian/cli-parser (1.0.2) - Locking sebastian/code-unit (1.0.8) - Upgrading sebastian/code-unit-reverse-lookup (1.0.3 => 2.0.3) - Upgrading sebastian/comparator (3.0.5 => 4.0.8) - Locking sebastian/complexity (2.0.3) - Upgrading sebastian/diff (3.0.6 => 4.0.6) - Upgrading sebastian/environment (4.2.5 => 5.1.5) - Upgrading sebastian/exporter (3.1.6 => 4.0.6) - Upgrading sebastian/global-state (3.0.5 => 5.0.7) - Locking sebastian/lines-of-code (1.0.4) - Upgrading sebastian/object-enumerator (3.0.5 => 4.0.4) - Upgrading sebastian/object-reflector (1.1.3 => 2.0.4) - Upgrading sebastian/recursion-context (3.0.2 => 4.0.5) - Upgrading sebastian/resource-operations (2.0.3 => 3.0.4) - Upgrading sebastian/type (1.1.5 => 3.2.1) - Upgrading sebastian/version (2.0.1 => 3.0.2) - Upgrading squizlabs/php_codesniffer (3.6.0 => 3.8.1) Writing lock file Installing dependencies from lock file (including require-dev) Package operations: 9 installs, 24 updates, 1 removal 0 [>---------------------------] 0 [->--------------------------] - Removing phpunit/php-token-stream (4.0.4) - Upgrading squizlabs/php_codesniffer (3.6.0 => 3.8.1): Extracting archive 0/2 [>---------------------------] 0% 1/2 [==============>-------------] 50% 2/2 [============================] 100% - 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 mediawiki/mediawiki-codesniffer (v37.0.0 => v43.0.0): Extracting archive - Upgrading sebastian/version (2.0.1 => 3.0.2): Extracting archive - Upgrading sebastian/type (1.1.5 => 3.2.1): Extracting archive - Upgrading sebastian/resource-operations (2.0.3 => 3.0.4): Extracting archive - Upgrading sebastian/recursion-context (3.0.2 => 4.0.5): Extracting archive - Upgrading sebastian/object-reflector (1.1.3 => 2.0.4): Extracting archive - Upgrading sebastian/object-enumerator (3.0.5 => 4.0.4): Extracting archive - Upgrading sebastian/global-state (3.0.5 => 5.0.7): Extracting archive - Upgrading sebastian/exporter (3.1.6 => 4.0.6): Extracting archive - Upgrading sebastian/environment (4.2.5 => 5.1.5): Extracting archive - Upgrading sebastian/diff (3.0.6 => 4.0.6): Extracting archive - Upgrading sebastian/comparator (3.0.5 => 4.0.8): Extracting archive - Installing sebastian/code-unit (1.0.8): Extracting archive - Installing sebastian/cli-parser (1.0.2): Extracting archive - Upgrading phpunit/php-timer (2.1.4 => 5.0.3): Extracting archive - Upgrading phpunit/php-text-template (1.2.1 => 2.0.4): Extracting archive - Installing phpunit/php-invoker (3.1.1): Extracting archive - Upgrading phpunit/php-file-iterator (2.0.6 => 3.0.6): Extracting archive - Installing nikic/php-parser (v5.0.2): Extracting archive - Installing sebastian/lines-of-code (1.0.4): Extracting archive - Installing sebastian/complexity (2.0.3): Extracting archive - Upgrading sebastian/code-unit-reverse-lookup (1.0.3 => 2.0.3): Extracting archive - Upgrading phpunit/php-code-coverage (7.0.17 => 9.2.31): Extracting archive - Upgrading doctrine/instantiator (1.5.0 => 2.0.0): Extracting archive - Upgrading phpunit/phpunit (8.5.38 => 9.6.16): Extracting archive - Upgrading ockcyp/covers-validator (v1.3.3 => v1.6.0): Extracting archive - Upgrading php-parallel-lint/php-console-color (v0.3 => v1.0.1): Extracting archive - Upgrading php-parallel-lint/php-console-highlighter (v0.5 => v1.0.0): Extracting archive - Upgrading php-parallel-lint/php-parallel-lint (v1.3.0 => v1.4.0): Extracting archive 0/31 [>---------------------------] 0% 13/31 [===========>----------------] 41% 23/31 [====================>-------] 74% 31/31 [============================] 100% Generating autoload files 42 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: set() $ vendor/bin/phpcs --report=json --- stdout --- {"totals":{"errors":9,"warnings":0,"fixable":9},"files":{"\/src\/repo\/.phan\/config.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/UpdateHistoryTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/src\/UpdateHistory.php":{"errors":9,"warnings":0,"messages":[{"message":"Long list syntax is not allowed","source":"Universal.Lists.DisallowLongListSyntax.Found","severity":5,"fixable":true,"type":"ERROR","line":32,"column":21},{"message":"Expected 1 space between the comma and \"$major\". Found: no spaces","source":"Universal.WhiteSpace.CommaSpacing.NoSpaceAfter","severity":5,"fixable":true,"type":"ERROR","line":32,"column":34},{"message":"Expected 1 space between the comma and \"$minor\". Found: no spaces","source":"Universal.WhiteSpace.CommaSpacing.NoSpaceAfter","severity":5,"fixable":true,"type":"ERROR","line":32,"column":41},{"message":"Expected 1 space between the comma and \"$patch\". Found: no spaces","source":"Universal.WhiteSpace.CommaSpacing.NoSpaceAfter","severity":5,"fixable":true,"type":"ERROR","line":32,"column":48},{"message":"Line indented incorrectly; expected 6 tabs, found 5","source":"Generic.WhiteSpace.ScopeIndent.IncorrectExact","severity":5,"fixable":true,"type":"ERROR","line":34,"column":21},{"message":"Line indented incorrectly; expected 6 tabs, found 5","source":"Generic.WhiteSpace.ScopeIndent.IncorrectExact","severity":5,"fixable":true,"type":"ERROR","line":35,"column":21},{"message":"Line indented incorrectly; expected 6 tabs, found 5","source":"Generic.WhiteSpace.ScopeIndent.IncorrectExact","severity":5,"fixable":true,"type":"ERROR","line":36,"column":21},{"message":"Line indented incorrectly; expected at least 7 tabs, found 6","source":"Generic.WhiteSpace.ScopeIndent.Incorrect","severity":5,"fixable":true,"type":"ERROR","line":37,"column":25},{"message":"Line indented incorrectly; expected 6 tabs, found 5","source":"Generic.WhiteSpace.ScopeIndent.IncorrectExact","severity":5,"fixable":true,"type":"ERROR","line":39,"column":21}]}}} --- end --- PHPCS run failed $ vendor/bin/phpcbf --- stdout --- PHPCBF RESULT SUMMARY ---------------------------------------------------------------------- FILE FIXED REMAINING ---------------------------------------------------------------------- /src/repo/src/UpdateHistory.php 9 0 ---------------------------------------------------------------------- A TOTAL OF 9 ERRORS WERE FIXED IN 1 FILE ---------------------------------------------------------------------- Time: 150ms; Memory: 8MB --- end --- $ vendor/bin/phpcs --report=json --- stdout --- {"totals":{"errors":0,"warnings":0,"fixable":0},"files":{"\/src\/repo\/tests\/UpdateHistoryTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/.phan\/config.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/src\/UpdateHistory.php":{"errors":0,"warnings":0,"messages":[]}}} --- 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 42 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 > phpunit > covers-validator > phpcs -sp > phan --allow-polyfill-parser Parsing files... ░░ 2 / 2 (100%) 15MB Analyzing classes... ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ 18MB Analyzing functions... ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ 18MB Analyzing methods... ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ 18MB Analyzing files... ░░ 2 / 2 (100%) 36MB > minus-x check . --- stdout --- PHP 8.2.7 | 10 parallel jobs ... 3/3 (100%) Checked 3 files in 0.1 seconds No syntax error found PHPUnit 9.6.16 by Sebastian Bergmann and contributors. Warning: Your XML configuration validates against a deprecated schema. Suggestion: Migrate your XML configuration using "--migrate-configuration"! No tests executed! CoversValidator 1.6.0 No tests found to validate. ... 3 / 3 (100%) Time: 96ms; Memory: 8MB MinusX ====== Processing /src/repo... .................. All good! --- end --- build: Updating composer dependencies * mediawiki/mediawiki-codesniffer: 37.0.0 → 43.0.0 * ockcyp/covers-validator: 1.3.3 → 1.6.0 * php-parallel-lint/php-console-highlighter: 0.5.0 → 1.0.0 * php-parallel-lint/php-parallel-lint: 1.3.0 → 1.4.0 * phpunit/phpunit: ^8.5|^9.5 → 9.6.16 Additional changes: * Dropped default excluded folder(s) from .phpcs.xml (T274684). * Also sorted "composer fix" command to run phpcbf last. * composer.json: Updated phpcs command in composer test (T280592). * composer.json: Added phpcs command to scripts (T280592). $ git add . --- stdout --- --- end --- $ git commit -F /tmp/tmplssvohji --- stdout --- [main 82cc81c] build: Updating composer dependencies 3 files changed, 23 insertions(+), 19 deletions(-) --- end --- $ git format-patch HEAD~1 --stdout --- stdout --- From 82cc81cf06be91e1d54fcfbe4a270ad96d0a6c6c Mon Sep 17 00:00:00 2001 From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org> Date: Sat, 27 Apr 2024 15:56:37 +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: 37.0.0 → 43.0.0 * ockcyp/covers-validator: 1.3.3 → 1.6.0 * php-parallel-lint/php-console-highlighter: 0.5.0 → 1.0.0 * php-parallel-lint/php-parallel-lint: 1.3.0 → 1.4.0 * phpunit/phpunit: ^8.5|^9.5 → 9.6.16 Additional changes: * Dropped default excluded folder(s) from .phpcs.xml (T274684). * Also sorted "composer fix" command to run phpcbf last. * composer.json: Updated phpcs command in composer test (T280592). * composer.json: Added phpcs command to scripts (T280592). Change-Id: I7adba072f61abdbd792084ef2399f1b680f057be --- .phpcs.xml | 2 -- composer.json | 24 +++++++++++++++--------- src/UpdateHistory.php | 16 ++++++++-------- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/.phpcs.xml b/.phpcs.xml index 97a00b4..efa31e1 100644 --- a/.phpcs.xml +++ b/.phpcs.xml @@ -4,7 +4,5 @@ <file>.</file> <arg name="encoding" value="UTF-8"/> <arg name="extensions" value="php"/> - <exclude-pattern>coverage</exclude-pattern> <exclude-pattern>doc/html</exclude-pattern> - <exclude-pattern>vendor</exclude-pattern> </ruleset> diff --git a/composer.json b/composer.json index b123385..2f697d0 100644 --- a/composer.json +++ b/composer.json @@ -23,13 +23,13 @@ "php": ">=7.2.9" }, "require-dev": { - "mediawiki/mediawiki-codesniffer": "37.0.0", + "mediawiki/mediawiki-codesniffer": "43.0.0", "mediawiki/mediawiki-phan-config": "0.14.0", "mediawiki/minus-x": "1.1.1", - "ockcyp/covers-validator": "1.3.3", - "php-parallel-lint/php-console-highlighter": "0.5.0", - "php-parallel-lint/php-parallel-lint": "1.3.0", - "phpunit/phpunit": "^8.5|^9.5" + "ockcyp/covers-validator": "1.6.0", + "php-parallel-lint/php-console-highlighter": "1.0.0", + "php-parallel-lint/php-parallel-lint": "1.4.0", + "phpunit/phpunit": "9.6.16" }, "bin": [ "bin/update-history" @@ -39,16 +39,22 @@ "parallel-lint . --exclude vendor", "phpunit", "covers-validator", - "phpcs -sp", + "@phpcs", "@phan", "minus-x check ." ], "phan": "phan --allow-polyfill-parser", "cover": "phpunit --coverage-html coverage", "fix": [ - "phpcbf", - "minus-x fix ." + "minus-x fix .", + "phpcbf" ], - "update-history": "bin/update-history patch" + "update-history": "bin/update-history patch", + "phpcs": "phpcs -sp" + }, + "config": { + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": true + } } } diff --git a/src/UpdateHistory.php b/src/UpdateHistory.php index 83424a7..2fdd5df 100644 --- a/src/UpdateHistory.php +++ b/src/UpdateHistory.php @@ -29,15 +29,15 @@ class UpdateHistory { throw new \RuntimeException( "Last version not found!" ); } // Do a release! - list( $ignore,$major,$minor,$patch ) = $m2; + [ $ignore, $major, $minor, $patch ] = $m2; switch ( $which ) { - case 'patch': - case 'minor': - case 'major': - $$which = intval( $$which ) + 1; - break; - default: - throw new \RuntimeException( "Unknown version bump type: $which" ); + case 'patch': + case 'minor': + case 'major': + $$which = intval( $$which ) + 1; + break; + default: + throw new \RuntimeException( "Unknown version bump type: $which" ); } $nextVersion = "$major.$minor.$patch"; $date = date( 'Y-m-d' ); -- 2.39.2 --- end ---