This run took 39 seconds.
From ee3dfe1b31b4157783142e34d6fefdbd4df04fc3 Mon Sep 17 00:00:00 2001 From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org> Date: Sun, 10 Nov 2024 04:35:36 +0000 Subject: [PATCH] build: Updating mediawiki/mediawiki-codesniffer to 45.0.0 The following sniffs are failing and were disabled: * MediaWiki.Usage.NullableType.ExplicitNullableTypes Change-Id: Ife47cd55958e199b96b3d726be4c3444267d75d5 --- .phpcs.xml | 1 + composer.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.phpcs.xml b/.phpcs.xml index f5cbf91..88dde5f 100644 --- a/.phpcs.xml +++ b/.phpcs.xml @@ -3,6 +3,7 @@ <rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki"> <exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPrivate" /> <exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" /> + <exclude name="MediaWiki.Usage.NullableType.ExplicitNullableTypes" /> </rule> <file>.</file> <arg name="extensions" value="php"/> diff --git a/composer.json b/composer.json index 36399eb..719cda1 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "require-dev": { - "mediawiki/mediawiki-codesniffer": "44.0.0", + "mediawiki/mediawiki-codesniffer": "45.0.0", "mediawiki/mediawiki-phan-config": "0.14.0", "mediawiki/minus-x": "1.1.3", "php-parallel-lint/php-console-highlighter": "1.0.0", -- 2.39.2
$ date --- stdout --- Sun Nov 10 04:35:04 UTC 2024 --- end --- $ git clone file:///srv/git/mediawiki-extensions-EventBus.git repo --depth=1 -b REL1_43 --- 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/REL1_43 --- stdout --- df9cd6c24f54d6932a89309d24e3ae3b4b3c3f9d refs/heads/REL1_43 --- end --- $ /usr/bin/npm audit --json --- stdout --- { "auditReportVersion": 2, "vulnerabilities": { "debug": { "name": "debug", "severity": "low", "isDirect": false, "via": [ { "source": 1096793, "name": "debug", "dependency": "debug", "title": "Regular Expression Denial of Service in debug", "url": "https://github.com/advisories/GHSA-gxpj-cx7g-858c", "severity": "low", "cwe": [ "CWE-400" ], "cvss": { "score": 3.7, "vectorString": "CVSS:3.1/AV:N/AC:H/PR:N/UI:N/S:U/C:N/I:N/A:L" }, "range": ">=3.2.0 <3.2.7" } ], "effects": [ "mocha" ], "range": "3.2.0 - 3.2.6", "nodes": [ "node_modules/mocha/node_modules/debug" ], "fixAvailable": { "name": "mocha", "version": "10.8.2", "isSemVerMajor": true } }, "flat": { "name": "flat", "severity": "critical", "isDirect": false, "via": [ { "source": 1089152, "name": "flat", "dependency": "flat", "title": "flat vulnerable to Prototype Pollution", "url": "https://github.com/advisories/GHSA-2j2x-2gpw-g8fm", "severity": "critical", "cwe": [ "CWE-1321" ], "cvss": { "score": 9.8, "vectorString": "CVSS:3.1/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H" }, "range": "<5.0.1" } ], "effects": [ "yargs-unparser" ], "range": "<5.0.1", "nodes": [ "node_modules/flat" ], "fixAvailable": { "name": "mocha", "version": "10.8.2", "isSemVerMajor": true } }, "minimatch": { "name": "minimatch", "severity": "high", "isDirect": false, "via": [ { "source": 1096485, "name": "minimatch", "dependency": "minimatch", "title": "minimatch ReDoS vulnerability", "url": "https://github.com/advisories/GHSA-f8q6-p94x-37v3", "severity": "high", "cwe": [ "CWE-400", "CWE-1333" ], "cvss": { "score": 7.5, "vectorString": "CVSS:3.1/AV:N/AC:L/PR:N/UI:N/S:U/C:N/I:N/A:H" }, "range": "<3.0.5" } ], "effects": [ "mocha" ], "range": "<3.0.5", "nodes": [ "node_modules/minimatch" ], "fixAvailable": { "name": "mocha", "version": "10.8.2", "isSemVerMajor": true } }, "mocha": { "name": "mocha", "severity": "critical", "isDirect": true, "via": [ "debug", "minimatch", "yargs-unparser" ], "effects": [], "range": "5.1.0 - 9.2.1", "nodes": [ "node_modules/mocha" ], "fixAvailable": { "name": "mocha", "version": "10.8.2", "isSemVerMajor": true } }, "yargs-unparser": { "name": "yargs-unparser", "severity": "critical", "isDirect": false, "via": [ "flat" ], "effects": [ "mocha" ], "range": "<=1.6.3", "nodes": [ "node_modules/yargs-unparser" ], "fixAvailable": { "name": "mocha", "version": "10.8.2", "isSemVerMajor": true } } }, "metadata": { "vulnerabilities": { "info": 0, "low": 1, "moderate": 0, "high": 1, "critical": 3, "total": 5 }, "dependencies": { "prod": 1, "dev": 466, "optional": 1, "peer": 1, "peerOptional": 0, "total": 466 } } } --- 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: 38 installs, 0 updates, 0 removals - Locking composer/pcre (3.3.1) - Locking composer/semver (3.4.2) - Locking composer/spdx-licenses (1.5.8) - Locking composer/xdebug-handler (3.0.5) - Locking dealerdirect/phpcodesniffer-composer-installer (v1.0.0) - Locking doctrine/deprecations (1.1.3) - Locking felixfbecker/advanced-json-rpc (v3.2.1) - Locking mediawiki/mediawiki-codesniffer (v44.0.0) - Locking mediawiki/mediawiki-phan-config (0.14.0) - Locking mediawiki/minus-x (1.1.3) - Locking mediawiki/phan-taint-check-plugin (6.0.0) - Locking microsoft/tolerant-php-parser (v0.1.2) - Locking netresearch/jsonmapper (v4.5.0) - 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.4.0) - Locking phpcsstandards/phpcsextra (1.2.1) - Locking phpcsstandards/phpcsutils (1.0.11) - Locking phpdocumentor/reflection-common (2.2.0) - Locking phpdocumentor/reflection-docblock (5.5.1) - Locking phpdocumentor/type-resolver (1.10.0) - Locking phpstan/phpdoc-parser (1.33.0) - Locking psr/container (2.0.2) - Locking psr/log (3.0.2) - Locking sabre/event (5.1.7) - Locking squizlabs/php_codesniffer (3.9.0) - Locking symfony/console (v7.1.7) - Locking symfony/deprecation-contracts (v3.5.0) - Locking symfony/polyfill-ctype (v1.31.0) - Locking symfony/polyfill-intl-grapheme (v1.31.0) - Locking symfony/polyfill-intl-normalizer (v1.31.0) - Locking symfony/polyfill-mbstring (v1.31.0) - Locking symfony/polyfill-php80 (v1.31.0) - Locking symfony/service-contracts (v3.5.0) - Locking symfony/string (v7.1.6) - 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: 38 installs, 0 updates, 0 removals 0 [>---------------------------] 0 [->--------------------------] - Installing squizlabs/php_codesniffer (3.9.0): Extracting archive - Installing dealerdirect/phpcodesniffer-composer-installer (v1.0.0): Extracting archive - Installing composer/pcre (3.3.1): Extracting archive - Installing symfony/polyfill-php80 (v1.31.0): Extracting archive - Installing phpcsstandards/phpcsutils (1.0.11): Extracting archive - Installing phpcsstandards/phpcsextra (1.2.1): Extracting archive - Installing symfony/polyfill-mbstring (v1.31.0): Extracting archive - Installing composer/spdx-licenses (1.5.8): Extracting archive - Installing composer/semver (3.4.2): Extracting archive - Installing mediawiki/mediawiki-codesniffer (v44.0.0): Extracting archive - Installing tysonandre/var_representation_polyfill (0.1.3): Extracting archive - Installing symfony/polyfill-intl-normalizer (v1.31.0): Extracting archive - Installing symfony/polyfill-intl-grapheme (v1.31.0): Extracting archive - Installing symfony/polyfill-ctype (v1.31.0): Extracting archive - Installing symfony/string (v7.1.6): Extracting archive - Installing symfony/deprecation-contracts (v3.5.0): Extracting archive - Installing psr/container (2.0.2): Extracting archive - Installing symfony/service-contracts (v3.5.0): Extracting archive - Installing symfony/console (v7.1.7): Extracting archive - Installing sabre/event (5.1.7): Extracting archive - Installing netresearch/jsonmapper (v4.5.0): 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.33.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.10.0): Extracting archive - Installing phpdocumentor/reflection-docblock (5.5.1): Extracting archive - Installing felixfbecker/advanced-json-rpc (v3.2.1): Extracting archive - Installing psr/log (3.0.2): Extracting archive - Installing composer/xdebug-handler (3.0.5): 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.3): 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.4.0): Extracting archive 0/36 [>---------------------------] 0% 20/36 [===============>------------] 55% 35/36 [===========================>] 97% 36/36 [============================] 100% Generating autoload files 16 packages you are using are looking for funding. Use the `composer fund` command to find out more! --- stdout --- PHP CodeSniffer Config installed_paths set to ../../mediawiki/mediawiki-codesniffer,../../phpcsstandards/phpcsextra,../../phpcsstandards/phpcsutils --- end --- Upgrading c:mediawiki/mediawiki-codesniffer from 44.0.0 -> 45.0.0 $ /usr/bin/composer update --- stderr --- Loading composer repositories with package information Updating dependencies Lock file operations: 0 installs, 4 updates, 0 removals - Upgrading composer/semver (3.4.2 => 3.4.3) - Upgrading mediawiki/mediawiki-codesniffer (v44.0.0 => v45.0.0) - Upgrading phpcsstandards/phpcsutils (1.0.11 => 1.0.12) - Upgrading squizlabs/php_codesniffer (3.9.0 => 3.10.3) Writing lock file Installing dependencies from lock file (including require-dev) Package operations: 0 installs, 4 updates, 0 removals 0 [>---------------------------] 0 [->--------------------------] - Upgrading squizlabs/php_codesniffer (3.9.0 => 3.10.3): Extracting archive - Upgrading phpcsstandards/phpcsutils (1.0.11 => 1.0.12): Extracting archive - Upgrading composer/semver (3.4.2 => 3.4.3): Extracting archive - Upgrading mediawiki/mediawiki-codesniffer (v44.0.0 => v45.0.0): Extracting archive 0/4 [>---------------------------] 0% 3/4 [=====================>------] 75% 4/4 [============================] 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 --- Previously failing phpcs rules: {'MediaWiki.Commenting.FunctionComment.MissingDocumentationPrivate', 'MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic'} $ vendor/bin/phpcs --report=json --- stdout --- {"totals":{"errors":10,"warnings":0,"fixable":4},"files":{"\/src\/repo\/includes\/Adapters\/Monolog\/EventBusMonologHandler.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/StreamNameMapper.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Adapters\/EventRelayer\/CdnPurgeEventRelayer.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Adapters\/RCFeed\/EventBusRCFeedEngine.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Redirects\/RedirectTarget.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Adapters\/RCFeed\/EventBusRCFeedFormatter.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Serializers\/MediaWiki\/UserEntitySerializer.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Serializers\/MediaWiki\/RevisionEntitySerializer.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/StreamNameMapperTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Serializers\/MediaWiki\/RevisionSlotEntitySerializer.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Adapters\/JobQueue\/JobQueueEventBus.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/HookHandlers\/MediaWiki\/CampaignChangeHooks.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Serializers\/MediaWiki\/PageEntitySerializer.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Serializers\/EventSerializer.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Rest\/RunSingleJobHandler.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Redirects\/DBKeyLookupStub.php":{"errors":1,"warnings":0,"messages":[{"message":"Missing function doc comment","source":"MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic","severity":5,"fixable":false,"type":"ERROR","line":26,"column":12}]},"\/src\/repo\/tests\/phpunit\/unit\/EventBusFactoryTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Rest\/EventBodyValidator.php":{"errors":1,"warnings":0,"messages":[{"message":"Missing function doc comment","source":"MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic","severity":5,"fixable":false,"type":"ERROR","line":28,"column":12}]},"\/src\/repo\/tests\/phpunit\/unit\/Serializers\/MediaWiki\/RevisionSlotEntitySerializerTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/.phan\/config.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Serializers\/EventSerializerTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/adapters\/eventrelayer\/CdnPurgeEventRelayerIntegrationTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/Serializers\/MediaWiki\/RevisionEntitySerializerTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/EventBusFactory.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/ServiceWiring.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/JobExecutor.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/EventBusFactoryIntegrationTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/Serializers\/MediaWiki\/UserEntitySerializerTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/adapters\/rcfeed\/EventBusRCFeedIntegrationTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Redirects\/RedirectTargetLookupTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Serializers\/MediaWiki\/PageEntitySerializerTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/EventBusTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Serializers\/MediaWiki\/PageChangeEventSerializer.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/Serializers\/MediaWiki\/PageChangeEventSerializerTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/HookHandlers\/MediaWiki\/PageChangeHooks.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/EventBus.php":{"errors":2,"warnings":0,"messages":[{"message":"Use PHP 8.4 compatible syntax for explicit nullable types (\"?int $timeout = null\")","source":"MediaWiki.Usage.NullableType.ExplicitNullableTypes","severity":5,"fixable":true,"type":"ERROR","line":136,"column":9},{"message":"Missing function doc comment","source":"MediaWiki.Commenting.FunctionComment.MissingDocumentationPrivate","severity":5,"fixable":false,"type":"ERROR","line":679,"column":13}]},"\/src\/repo\/includes\/EventBusHooks.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/EventFactory.php":{"errors":6,"warnings":0,"messages":[{"message":"Use PHP 8.4 compatible syntax for explicit nullable types (\"?UserIdentity $performer = null\")","source":"MediaWiki.Usage.NullableType.ExplicitNullableTypes","severity":5,"fixable":true,"type":"ERROR","line":202,"column":9},{"message":"Use PHP 8.4 compatible syntax for explicit nullable types (\"?string $wiki = null\")","source":"MediaWiki.Usage.NullableType.ExplicitNullableTypes","severity":5,"fixable":true,"type":"ERROR","line":337,"column":9},{"message":"Use PHP 8.4 compatible syntax for explicit nullable types (\"?string $dt = null\")","source":"MediaWiki.Usage.NullableType.ExplicitNullableTypes","severity":5,"fixable":true,"type":"ERROR","line":338,"column":9},{"message":"Missing function doc comment","source":"MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic","severity":5,"fixable":false,"type":"ERROR","line":1158,"column":12},{"message":"Missing function doc comment","source":"MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic","severity":5,"fixable":false,"type":"ERROR","line":1177,"column":12},{"message":"Missing function doc comment","source":"MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic","severity":5,"fixable":false,"type":"ERROR","line":1200,"column":12}]},"\/src\/repo\/tests\/phpunit\/integration\/EventFactoryTest.php":{"errors":0,"warnings":0,"messages":[]}}} --- end --- PHPCS run failed $ vendor/bin/phpcs --report=json --- stdout --- {"totals":{"errors":10,"warnings":0,"fixable":4},"files":{"\/src\/repo\/includes\/Adapters\/Monolog\/EventBusMonologHandler.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/StreamNameMapper.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Serializers\/MediaWiki\/PageEntitySerializer.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Adapters\/EventRelayer\/CdnPurgeEventRelayer.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Redirects\/RedirectTarget.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Adapters\/RCFeed\/EventBusRCFeedEngine.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Serializers\/EventSerializerTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/StreamNameMapperTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Serializers\/MediaWiki\/UserEntitySerializer.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/EventBusFactoryTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Adapters\/RCFeed\/EventBusRCFeedFormatter.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/HookHandlers\/MediaWiki\/CampaignChangeHooks.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Serializers\/EventSerializer.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Serializers\/MediaWiki\/RevisionSlotEntitySerializer.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/JobExecutor.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Serializers\/MediaWiki\/RevisionEntitySerializer.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Adapters\/JobQueue\/JobQueueEventBus.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/EventBusFactory.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Rest\/RunSingleJobHandler.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Redirects\/DBKeyLookupStub.php":{"errors":1,"warnings":0,"messages":[{"message":"Missing function doc comment","source":"MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic","severity":5,"fixable":false,"type":"ERROR","line":26,"column":12}]},"\/src\/repo\/includes\/Rest\/EventBodyValidator.php":{"errors":1,"warnings":0,"messages":[{"message":"Missing function doc comment","source":"MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic","severity":5,"fixable":false,"type":"ERROR","line":28,"column":12}]},"\/src\/repo\/.phan\/config.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Serializers\/MediaWiki\/RevisionSlotEntitySerializerTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/Serializers\/MediaWiki\/UserEntitySerializerTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/adapters\/eventrelayer\/CdnPurgeEventRelayerIntegrationTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/ServiceWiring.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/Serializers\/MediaWiki\/RevisionEntitySerializerTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/adapters\/rcfeed\/EventBusRCFeedIntegrationTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/EventBusFactoryIntegrationTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Redirects\/RedirectTargetLookupTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Serializers\/MediaWiki\/PageEntitySerializerTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/EventBusTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/HookHandlers\/MediaWiki\/PageChangeHooks.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Serializers\/MediaWiki\/PageChangeEventSerializer.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/Serializers\/MediaWiki\/PageChangeEventSerializerTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/EventBusHooks.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/EventBus.php":{"errors":2,"warnings":0,"messages":[{"message":"Use PHP 8.4 compatible syntax for explicit nullable types (\"?int $timeout = null\")","source":"MediaWiki.Usage.NullableType.ExplicitNullableTypes","severity":5,"fixable":true,"type":"ERROR","line":136,"column":9},{"message":"Missing function doc comment","source":"MediaWiki.Commenting.FunctionComment.MissingDocumentationPrivate","severity":5,"fixable":false,"type":"ERROR","line":679,"column":13}]},"\/src\/repo\/includes\/EventFactory.php":{"errors":6,"warnings":0,"messages":[{"message":"Use PHP 8.4 compatible syntax for explicit nullable types (\"?UserIdentity $performer = null\")","source":"MediaWiki.Usage.NullableType.ExplicitNullableTypes","severity":5,"fixable":true,"type":"ERROR","line":202,"column":9},{"message":"Use PHP 8.4 compatible syntax for explicit nullable types (\"?string $wiki = null\")","source":"MediaWiki.Usage.NullableType.ExplicitNullableTypes","severity":5,"fixable":true,"type":"ERROR","line":337,"column":9},{"message":"Use PHP 8.4 compatible syntax for explicit nullable types (\"?string $dt = null\")","source":"MediaWiki.Usage.NullableType.ExplicitNullableTypes","severity":5,"fixable":true,"type":"ERROR","line":338,"column":9},{"message":"Missing function doc comment","source":"MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic","severity":5,"fixable":false,"type":"ERROR","line":1158,"column":12},{"message":"Missing function doc comment","source":"MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic","severity":5,"fixable":false,"type":"ERROR","line":1177,"column":12},{"message":"Missing function doc comment","source":"MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic","severity":5,"fixable":false,"type":"ERROR","line":1200,"column":12}]},"\/src\/repo\/tests\/phpunit\/integration\/EventFactoryTest.php":{"errors":0,"warnings":0,"messages":[]}}} --- end --- * sniff MediaWiki.Usage.NullableType.ExplicitNullableTypes is now failing $ 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 node_modules --exclude vendor > phpcs -sp --cache > minus-x check . --- stdout --- PHP 8.2.20 | 10 parallel jobs ....................................... 39/39 (100%) Checked 39 files in 0.2 seconds No syntax error found ....................................... 39 / 39 (100%) Time: 274ms; Memory: 8MB MinusX ====== Processing /src/repo... ............................................................. ..................................... All good! --- end --- $ /usr/bin/npm audit --json --- stdout --- { "auditReportVersion": 2, "vulnerabilities": { "debug": { "name": "debug", "severity": "low", "isDirect": false, "via": [ { "source": 1096793, "name": "debug", "dependency": "debug", "title": "Regular Expression Denial of Service in debug", "url": "https://github.com/advisories/GHSA-gxpj-cx7g-858c", "severity": "low", "cwe": [ "CWE-400" ], "cvss": { "score": 3.7, "vectorString": "CVSS:3.1/AV:N/AC:H/PR:N/UI:N/S:U/C:N/I:N/A:L" }, "range": ">=3.2.0 <3.2.7" } ], "effects": [ "mocha" ], "range": "3.2.0 - 3.2.6", "nodes": [ "node_modules/mocha/node_modules/debug" ], "fixAvailable": { "name": "mocha", "version": "10.8.2", "isSemVerMajor": true } }, "flat": { "name": "flat", "severity": "critical", "isDirect": false, "via": [ { "source": 1089152, "name": "flat", "dependency": "flat", "title": "flat vulnerable to Prototype Pollution", "url": "https://github.com/advisories/GHSA-2j2x-2gpw-g8fm", "severity": "critical", "cwe": [ "CWE-1321" ], "cvss": { "score": 9.8, "vectorString": "CVSS:3.1/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H" }, "range": "<5.0.1" } ], "effects": [ "yargs-unparser" ], "range": "<5.0.1", "nodes": [ "node_modules/flat" ], "fixAvailable": { "name": "mocha", "version": "10.8.2", "isSemVerMajor": true } }, "minimatch": { "name": "minimatch", "severity": "high", "isDirect": false, "via": [ { "source": 1096485, "name": "minimatch", "dependency": "minimatch", "title": "minimatch ReDoS vulnerability", "url": "https://github.com/advisories/GHSA-f8q6-p94x-37v3", "severity": "high", "cwe": [ "CWE-400", "CWE-1333" ], "cvss": { "score": 7.5, "vectorString": "CVSS:3.1/AV:N/AC:L/PR:N/UI:N/S:U/C:N/I:N/A:H" }, "range": "<3.0.5" } ], "effects": [ "mocha" ], "range": "<3.0.5", "nodes": [ "node_modules/minimatch" ], "fixAvailable": { "name": "mocha", "version": "10.8.2", "isSemVerMajor": true } }, "mocha": { "name": "mocha", "severity": "critical", "isDirect": true, "via": [ "debug", "minimatch", "yargs-unparser" ], "effects": [], "range": "5.1.0 - 9.2.1", "nodes": [ "node_modules/mocha" ], "fixAvailable": { "name": "mocha", "version": "10.8.2", "isSemVerMajor": true } }, "yargs-unparser": { "name": "yargs-unparser", "severity": "critical", "isDirect": false, "via": [ "flat" ], "effects": [ "mocha" ], "range": "<=1.6.3", "nodes": [ "node_modules/yargs-unparser" ], "fixAvailable": { "name": "mocha", "version": "10.8.2", "isSemVerMajor": true } } }, "metadata": { "vulnerabilities": { "info": 0, "low": 1, "moderate": 0, "high": 1, "critical": 3, "total": 5 }, "dependencies": { "prod": 1, "dev": 466, "optional": 1, "peer": 1, "peerOptional": 0, "total": 466 } } } --- end --- Attempting to npm audit fix $ /usr/bin/npm audit fix --dry-run --only=dev --json --- stderr --- npm WARN invalid config only="dev" set in command line options npm WARN invalid config Must be one of: null, prod, production --- stdout --- { "added": 466, "removed": 0, "changed": 0, "audited": 467, "funding": 58, "audit": { "auditReportVersion": 2, "vulnerabilities": { "debug": { "name": "debug", "severity": "low", "isDirect": false, "via": [ { "source": 1096793, "name": "debug", "dependency": "debug", "title": "Regular Expression Denial of Service in debug", "url": "https://github.com/advisories/GHSA-gxpj-cx7g-858c", "severity": "low", "cwe": [ "CWE-400" ], "cvss": { "score": 3.7, "vectorString": "CVSS:3.1/AV:N/AC:H/PR:N/UI:N/S:U/C:N/I:N/A:L" }, "range": ">=3.2.0 <3.2.7" } ], "effects": [ "mocha" ], "range": "3.2.0 - 3.2.6", "nodes": [ "node_modules/mocha/node_modules/debug" ], "fixAvailable": { "name": "mocha", "version": "10.8.2", "isSemVerMajor": true } }, "flat": { "name": "flat", "severity": "critical", "isDirect": false, "via": [ { "source": 1089152, "name": "flat", "dependency": "flat", "title": "flat vulnerable to Prototype Pollution", "url": "https://github.com/advisories/GHSA-2j2x-2gpw-g8fm", "severity": "critical", "cwe": [ "CWE-1321" ], "cvss": { "score": 9.8, "vectorString": "CVSS:3.1/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H" }, "range": "<5.0.1" } ], "effects": [ "yargs-unparser" ], "range": "<5.0.1", "nodes": [ "node_modules/flat" ], "fixAvailable": { "name": "mocha", "version": "10.8.2", "isSemVerMajor": true } }, "minimatch": { "name": "minimatch", "severity": "high", "isDirect": false, "via": [ { "source": 1096485, "name": "minimatch", "dependency": "minimatch", "title": "minimatch ReDoS vulnerability", "url": "https://github.com/advisories/GHSA-f8q6-p94x-37v3", "severity": "high", "cwe": [ "CWE-400", "CWE-1333" ], "cvss": { "score": 7.5, "vectorString": "CVSS:3.1/AV:N/AC:L/PR:N/UI:N/S:U/C:N/I:N/A:H" }, "range": "<3.0.5" } ], "effects": [ "mocha" ], "range": "<3.0.5", "nodes": [ "node_modules/minimatch" ], "fixAvailable": { "name": "mocha", "version": "10.8.2", "isSemVerMajor": true } }, "mocha": { "name": "mocha", "severity": "critical", "isDirect": true, "via": [ "debug", "minimatch", "yargs-unparser" ], "effects": [], "range": "5.1.0 - 9.2.1", "nodes": [ "node_modules/mocha" ], "fixAvailable": { "name": "mocha", "version": "10.8.2", "isSemVerMajor": true } }, "yargs-unparser": { "name": "yargs-unparser", "severity": "critical", "isDirect": false, "via": [ "flat" ], "effects": [ "mocha" ], "range": "<=1.6.3", "nodes": [ "node_modules/yargs-unparser" ], "fixAvailable": { "name": "mocha", "version": "10.8.2", "isSemVerMajor": true } } }, "metadata": { "vulnerabilities": { "info": 0, "low": 1, "moderate": 0, "high": 1, "critical": 3, "total": 5 }, "dependencies": { "prod": 1, "dev": 466, "optional": 1, "peer": 1, "peerOptional": 0, "total": 466 } } } } --- end --- {"added": 466, "removed": 0, "changed": 0, "audited": 467, "funding": 58, "audit": {"auditReportVersion": 2, "vulnerabilities": {"debug": {"name": "debug", "severity": "low", "isDirect": false, "via": [{"source": 1096793, "name": "debug", "dependency": "debug", "title": "Regular Expression Denial of Service in debug", "url": "https://github.com/advisories/GHSA-gxpj-cx7g-858c", "severity": "low", "cwe": ["CWE-400"], "cvss": {"score": 3.7, "vectorString": "CVSS:3.1/AV:N/AC:H/PR:N/UI:N/S:U/C:N/I:N/A:L"}, "range": ">=3.2.0 <3.2.7"}], "effects": ["mocha"], "range": "3.2.0 - 3.2.6", "nodes": ["node_modules/mocha/node_modules/debug"], "fixAvailable": {"name": "mocha", "version": "10.8.2", "isSemVerMajor": true}}, "flat": {"name": "flat", "severity": "critical", "isDirect": false, "via": [{"source": 1089152, "name": "flat", "dependency": "flat", "title": "flat vulnerable to Prototype Pollution", "url": "https://github.com/advisories/GHSA-2j2x-2gpw-g8fm", "severity": "critical", "cwe": ["CWE-1321"], "cvss": {"score": 9.8, "vectorString": "CVSS:3.1/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H"}, "range": "<5.0.1"}], "effects": ["yargs-unparser"], "range": "<5.0.1", "nodes": ["node_modules/flat"], "fixAvailable": {"name": "mocha", "version": "10.8.2", "isSemVerMajor": true}}, "minimatch": {"name": "minimatch", "severity": "high", "isDirect": false, "via": [{"source": 1096485, "name": "minimatch", "dependency": "minimatch", "title": "minimatch ReDoS vulnerability", "url": "https://github.com/advisories/GHSA-f8q6-p94x-37v3", "severity": "high", "cwe": ["CWE-400", "CWE-1333"], "cvss": {"score": 7.5, "vectorString": "CVSS:3.1/AV:N/AC:L/PR:N/UI:N/S:U/C:N/I:N/A:H"}, "range": "<3.0.5"}], "effects": ["mocha"], "range": "<3.0.5", "nodes": ["node_modules/minimatch"], "fixAvailable": {"name": "mocha", "version": "10.8.2", "isSemVerMajor": true}}, "mocha": {"name": "mocha", "severity": "critical", "isDirect": true, "via": ["debug", "minimatch", "yargs-unparser"], "effects": [], "range": "5.1.0 - 9.2.1", "nodes": ["node_modules/mocha"], "fixAvailable": {"name": "mocha", "version": "10.8.2", "isSemVerMajor": true}}, "yargs-unparser": {"name": "yargs-unparser", "severity": "critical", "isDirect": false, "via": ["flat"], "effects": ["mocha"], "range": "<=1.6.3", "nodes": ["node_modules/yargs-unparser"], "fixAvailable": {"name": "mocha", "version": "10.8.2", "isSemVerMajor": true}}}, "metadata": {"vulnerabilities": {"info": 0, "low": 1, "moderate": 0, "high": 1, "critical": 3, "total": 5}, "dependencies": {"prod": 1, "dev": 466, "optional": 1, "peer": 1, "peerOptional": 0, "total": 466}}}} $ /usr/bin/npm audit fix --only=dev --- stderr --- npm WARN invalid config only="dev" set in command line options npm WARN invalid config Must be one of: null, prod, production --- stdout --- added 465 packages, and audited 466 packages in 5s 58 packages are looking for funding run `npm fund` for details # npm audit report debug 3.2.0 - 3.2.6 Regular Expression Denial of Service in debug - https://github.com/advisories/GHSA-gxpj-cx7g-858c fix available via `npm audit fix --force` Will install mocha@10.8.2, which is a breaking change node_modules/mocha/node_modules/debug mocha 5.1.0 - 9.2.1 Depends on vulnerable versions of debug Depends on vulnerable versions of minimatch Depends on vulnerable versions of yargs-unparser node_modules/mocha flat <5.0.1 Severity: critical flat vulnerable to Prototype Pollution - https://github.com/advisories/GHSA-2j2x-2gpw-g8fm fix available via `npm audit fix --force` Will install mocha@10.8.2, which is a breaking change node_modules/flat yargs-unparser <=1.6.3 Depends on vulnerable versions of flat node_modules/yargs-unparser minimatch <3.0.5 Severity: high minimatch ReDoS vulnerability - https://github.com/advisories/GHSA-f8q6-p94x-37v3 fix available via `npm audit fix --force` Will install mocha@10.8.2, which is a breaking change node_modules/minimatch 5 vulnerabilities (1 low, 1 high, 3 critical) To address all issues (including breaking changes), run: npm audit fix --force --- end --- Verifying that tests still pass $ /usr/bin/npm ci --- stdout --- added 465 packages, and audited 466 packages in 5s 58 packages are looking for funding run `npm fund` for details 5 vulnerabilities (1 low, 1 high, 3 critical) To address all issues (including breaking changes), run: npm audit fix --force Run `npm audit` for details. --- end --- $ /usr/bin/npm test --- stdout --- > eventbus@0.0.0 test > grunt test Running "eslint:all" (eslint) task /src/repo/tests/api-testing/RunSingleJob.js 2:1 warning ES2015 block-scoped variables are forbidden es-x/no-block-scoped-variables 2:7 warning ES2015 destructuring is forbidden es-x/no-destructuring 3:1 warning ES2015 block-scoped variables are forbidden es-x/no-block-scoped-variables 4:1 warning ES2015 block-scoped variables are forbidden es-x/no-block-scoped-variables 6:29 warning Unexpected function expression prefer-arrow-callback 6:37 warning Missing space before function parentheses space-before-function-paren 7:2 warning ES2015 block-scoped variables are forbidden es-x/no-block-scoped-variables 8:2 warning ES2015 block-scoped variables are forbidden es-x/no-block-scoped-variables 9:2 warning ES2015 block-scoped variables are forbidden es-x/no-block-scoped-variables 11:2 warning ES2015 block-scoped variables are forbidden es-x/no-block-scoped-variables 12:3 warning ES2015 block-scoped variables are forbidden es-x/no-block-scoped-variables 36:3 warning ES2015 block-scoped variables are forbidden es-x/no-block-scoped-variables 37:3 warning ES2015 block-scoped variables are forbidden es-x/no-block-scoped-variables 42:10 warning ES2017 async function declarations are forbidden es-x/no-async-functions 42:10 warning Unexpected function expression prefer-arrow-callback 42:24 warning Missing space before function parentheses space-before-function-paren 48:44 warning ES2017 async function declarations are forbidden es-x/no-async-functions 48:44 warning Unexpected function expression prefer-arrow-callback 48:58 warning Missing space before function parentheses space-before-function-paren 49:3 warning ES2015 block-scoped variables are forbidden es-x/no-block-scoped-variables 50:3 warning ES2015 block-scoped variables are forbidden es-x/no-block-scoped-variables 50:9 warning ES2015 destructuring is forbidden es-x/no-destructuring 57:3 warning ES2015 block-scoped variables are forbidden es-x/no-block-scoped-variables 57:9 warning ES2015 destructuring is forbidden es-x/no-destructuring 61:54 warning ES2017 async function declarations are forbidden es-x/no-async-functions 61:54 warning Unexpected function expression prefer-arrow-callback 61:68 warning Missing space before function parentheses space-before-function-paren 62:3 warning ES2015 block-scoped variables are forbidden es-x/no-block-scoped-variables 64:3 warning ES2015 block-scoped variables are forbidden es-x/no-block-scoped-variables 64:9 warning ES2015 destructuring is forbidden es-x/no-destructuring 70:50 warning ES2017 async function declarations are forbidden es-x/no-async-functions 70:50 warning Unexpected function expression prefer-arrow-callback 70:64 warning Missing space before function parentheses space-before-function-paren 71:3 warning ES2015 block-scoped variables are forbidden es-x/no-block-scoped-variables 73:3 warning ES2015 block-scoped variables are forbidden es-x/no-block-scoped-variables 73:9 warning ES2015 destructuring is forbidden es-x/no-destructuring 79:52 warning ES2017 async function declarations are forbidden es-x/no-async-functions 79:52 warning Unexpected function expression prefer-arrow-callback 79:66 warning Missing space before function parentheses space-before-function-paren 80:3 warning ES2015 block-scoped variables are forbidden es-x/no-block-scoped-variables 82:3 warning ES2015 block-scoped variables are forbidden es-x/no-block-scoped-variables 82:9 warning ES2015 destructuring is forbidden es-x/no-destructuring 88:49 warning ES2017 async function declarations are forbidden es-x/no-async-functions 88:49 warning Unexpected function expression prefer-arrow-callback 88:63 warning Missing space before function parentheses space-before-function-paren 89:3 warning ES2015 block-scoped variables are forbidden es-x/no-block-scoped-variables 91:3 warning ES2015 block-scoped variables are forbidden es-x/no-block-scoped-variables 91:9 warning ES2015 destructuring is forbidden es-x/no-destructuring 98:49 warning ES2017 async function declarations are forbidden es-x/no-async-functions 98:49 warning Unexpected function expression prefer-arrow-callback 98:63 warning Missing space before function parentheses space-before-function-paren 99:3 warning ES2015 block-scoped variables are forbidden es-x/no-block-scoped-variables 101:3 warning ES2015 block-scoped variables are forbidden es-x/no-block-scoped-variables 101:9 warning ES2015 destructuring is forbidden es-x/no-destructuring 107:56 warning ES2017 async function declarations are forbidden es-x/no-async-functions 107:56 warning Unexpected function expression prefer-arrow-callback 107:70 warning Missing space before function parentheses space-before-function-paren 108:3 warning ES2015 block-scoped variables are forbidden es-x/no-block-scoped-variables 109:3 warning ES2015 block-scoped variables are forbidden es-x/no-block-scoped-variables 109:9 warning ES2015 destructuring is forbidden es-x/no-destructuring ✖ 60 problems (0 errors, 60 warnings) 0 errors and 18 warnings potentially fixable with the `--fix` option. Running "banana:EventBus" (banana) task >> 1 message directory checked. Done. --- end --- $ package-lock-lint package-lock.json --- stdout --- Checking package-lock.json --- end --- build: Updating mediawiki/mediawiki-codesniffer to 45.0.0 The following sniffs are failing and were disabled: * MediaWiki.Usage.NullableType.ExplicitNullableTypes $ git add . --- stdout --- --- end --- $ git commit -F /tmp/tmpegwyx1ma --- stdout --- [REL1_43 ee3dfe1] build: Updating mediawiki/mediawiki-codesniffer to 45.0.0 2 files changed, 2 insertions(+), 1 deletion(-) --- end --- $ git format-patch HEAD~1 --stdout --- stdout --- From ee3dfe1b31b4157783142e34d6fefdbd4df04fc3 Mon Sep 17 00:00:00 2001 From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org> Date: Sun, 10 Nov 2024 04:35:36 +0000 Subject: [PATCH] build: Updating mediawiki/mediawiki-codesniffer to 45.0.0 The following sniffs are failing and were disabled: * MediaWiki.Usage.NullableType.ExplicitNullableTypes Change-Id: Ife47cd55958e199b96b3d726be4c3444267d75d5 --- .phpcs.xml | 1 + composer.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.phpcs.xml b/.phpcs.xml index f5cbf91..88dde5f 100644 --- a/.phpcs.xml +++ b/.phpcs.xml @@ -3,6 +3,7 @@ <rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki"> <exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPrivate" /> <exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" /> + <exclude name="MediaWiki.Usage.NullableType.ExplicitNullableTypes" /> </rule> <file>.</file> <arg name="extensions" value="php"/> diff --git a/composer.json b/composer.json index 36399eb..719cda1 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "require-dev": { - "mediawiki/mediawiki-codesniffer": "44.0.0", + "mediawiki/mediawiki-codesniffer": "45.0.0", "mediawiki/mediawiki-phan-config": "0.14.0", "mediawiki/minus-x": "1.1.3", "php-parallel-lint/php-console-highlighter": "1.0.0", -- 2.39.2 --- end ---