This run took 18 seconds.
From ac44a04ccd19afdd025ef434fc166cabba86a920 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Wed, 13 Nov 2024 01:53:39 +0000
Subject: [PATCH] build: Updating mediawiki/mediawiki-codesniffer to 45.0.0
Change-Id: I0d090cadb8429a25018212bd916eb869ec77bd35
---
composer.json | 2 +-
includes/Campaign/CampaignContent.php | 4 ++--
includes/Campaign/CampaignRecord.php | 4 ++--
includes/Config/ConfigParserFactory.php | 2 +-
includes/MediaUploaderServices.php | 14 +++++++-------
tests/phpunit/unit/Hooks/CampaignHooksTest.php | 4 ++--
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/composer.json b/composer.json
index 116928f..c7717d2 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
"ext-json": "*"
},
"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",
diff --git a/includes/Campaign/CampaignContent.php b/includes/Campaign/CampaignContent.php
index e818454..eb83791 100644
--- a/includes/Campaign/CampaignContent.php
+++ b/includes/Campaign/CampaignContent.php
@@ -103,7 +103,7 @@ class CampaignContent extends TextContent {
*
* @param Validator|null $validator
*/
- public function setServices( Validator $validator = null ) {
+ public function setServices( ?Validator $validator = null ) {
$this->validator = $validator;
$this->initializedServices = true;
}
@@ -196,7 +196,7 @@ class CampaignContent extends TextContent {
*
* @return CampaignRecord
*/
- public function newCampaignRecord( PageReference $page, int $pageId = null ): CampaignRecord {
+ public function newCampaignRecord( PageReference $page, ?int $pageId = null ): CampaignRecord {
$yamlParse = $this->realYamlParse ?: $this->getData();
if ( !$yamlParse->isGood() ) {
$validity = CampaignRecord::CONTENT_INVALID_FORMAT;
diff --git a/includes/Campaign/CampaignRecord.php b/includes/Campaign/CampaignRecord.php
index 409465e..b4feaa4 100644
--- a/includes/Campaign/CampaignRecord.php
+++ b/includes/Campaign/CampaignRecord.php
@@ -51,8 +51,8 @@ class CampaignRecord {
?int $pageId,
bool $enabled,
int $validity,
- array $content = null,
- PageReference $pageReference = null
+ ?array $content = null,
+ ?PageReference $pageReference = null
) {
$this->pageId = $pageId;
$this->enabled = $enabled;
diff --git a/includes/Config/ConfigParserFactory.php b/includes/Config/ConfigParserFactory.php
index 269a1e2..1fafad8 100644
--- a/includes/Config/ConfigParserFactory.php
+++ b/includes/Config/ConfigParserFactory.php
@@ -38,7 +38,7 @@ class ConfigParserFactory {
public function newConfigParser(
array $rawConfig,
ParserOptions $parserOptions,
- PageReference $pageRef = null
+ ?PageReference $pageRef = null
): ConfigParser {
if ( $pageRef === null ) {
$pageRef = PageReferenceValue::localReference( NS_SPECIAL, 'MediaUploader' );
diff --git a/includes/MediaUploaderServices.php b/includes/MediaUploaderServices.php
index 653fe34..f1bb40a 100644
--- a/includes/MediaUploaderServices.php
+++ b/includes/MediaUploaderServices.php
@@ -28,31 +28,31 @@ class MediaUploaderServices {
return $services->getService( 'MediaUploader' . $name );
}
- public static function getCampaignStore( MediaWikiServices $services = null ): CampaignStore {
+ public static function getCampaignStore( ?MediaWikiServices $services = null ): CampaignStore {
return self::getService( $services, 'CampaignStore' );
}
- public static function getCampaignStats( MediaWikiServices $services = null ): CampaignStats {
+ public static function getCampaignStats( ?MediaWikiServices $services = null ): CampaignStats {
return self::getService( $services, 'CampaignStats' );
}
- public static function getCampaignValidator( MediaWikiServices $services = null ): Validator {
+ public static function getCampaignValidator( ?MediaWikiServices $services = null ): Validator {
return self::getService( $services, 'CampaignValidator' );
}
- public static function getConfigFactory( MediaWikiServices $services = null ): ConfigFactory {
+ public static function getConfigFactory( ?MediaWikiServices $services = null ): ConfigFactory {
return self::getService( $services, 'ConfigFactory' );
}
- public static function getConfigParserFactory( MediaWikiServices $services = null ): ConfigParserFactory {
+ public static function getConfigParserFactory( ?MediaWikiServices $services = null ): ConfigParserFactory {
return self::getService( $services, 'ConfigParserFactory' );
}
- public static function getConfigCacheInvalidator( MediaWikiServices $services = null ): ConfigCacheInvalidator {
+ public static function getConfigCacheInvalidator( ?MediaWikiServices $services = null ): ConfigCacheInvalidator {
return self::getService( $services, 'ConfigCacheInvalidator' );
}
- public static function getRawConfig( MediaWikiServices $services = null ): RawConfig {
+ public static function getRawConfig( ?MediaWikiServices $services = null ): RawConfig {
return self::getService( $services, 'RawConfig' );
}
diff --git a/tests/phpunit/unit/Hooks/CampaignHooksTest.php b/tests/phpunit/unit/Hooks/CampaignHooksTest.php
index 9150fb1..749971d 100644
--- a/tests/phpunit/unit/Hooks/CampaignHooksTest.php
+++ b/tests/phpunit/unit/Hooks/CampaignHooksTest.php
@@ -332,8 +332,8 @@ class CampaignHooksTest extends MediaWikiUnitTestCase {
* @return CampaignHooks
*/
private function getCampaignHooks(
- CampaignStore $campaignStore = null,
- ConfigCacheInvalidator $cacheInvalidator = null
+ ?CampaignStore $campaignStore = null,
+ ?ConfigCacheInvalidator $cacheInvalidator = null
): CampaignHooks {
return new CampaignHooks(
$campaignStore ?:
--
2.39.2
$ date
--- stdout ---
Wed Nov 13 01:53:26 UTC 2024
--- end ---
$ git clone file:///srv/git/mediawiki-extensions-MediaUploader.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 ---
83cd09a5a24f1ffcd4e8cf0ea293466c73283f1f 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": 449,
"optional": 0,
"peer": 1,
"peerOptional": 0,
"total": 449
}
}
}
--- 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: 40 installs, 0 updates, 0 removals
- Locking composer/pcre (3.3.2)
- 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 justinrainbow/json-schema (5.3.0)
- 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.6.0)
- Locking phpdocumentor/type-resolver (1.10.0)
- Locking phpstan/phpdoc-parser (2.0.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 symfony/yaml (v5.4.45)
- 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: 40 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.2): Extracting archive
- Installing justinrainbow/json-schema (5.3.0): 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 (2.0.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.6.0): 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
- Installing symfony/yaml (v5.4.45): Extracting archive
0/38 [>---------------------------] 0%
20/38 [==============>-------------] 52%
32/38 [=======================>----] 84%
38/38 [============================] 100%
Generating autoload files
17 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
17 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.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment', 'MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic'}
$ vendor/bin/phpcs --report=json
--- stdout ---
{"totals":{"errors":17,"warnings":1,"fixable":14},"files":{"\/src\/repo\/MediaUploader.namespaces.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/defines.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Campaign\/Exception\/BaseCampaignException.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Campaign\/Exception\/InvalidFormatException.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Campaign\/Exception\/InvalidCampaignException.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/MediaUploaderResourceModuleFactory.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Campaign\/Exception\/IncompleteRecordException.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Config\/RawConfig.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Hooks\/RegistrationHooks.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Config\/ConfigUnitTestCase.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Config\/ConfigBase.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Config\/GlobalConfigAnchorUpdateJob.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Config\/ConfigCacheInvalidator.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/ServiceWiring.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/MediaUploaderResourceModule.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Hooks\/Hooks.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Config\/GlobalParsedConfig.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/MediaUploader.alias.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Config\/RequestConfig.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Config\/ConfigFactoryTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Config\/RequestConfigTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Campaign\/Validator.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Campaign\/Exception\/InvalidSchemaException.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/.phan\/config.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Campaign\/CampaignRecord.php":{"errors":2,"warnings":0,"messages":[{"message":"Use PHP 8.4 compatible syntax for explicit nullable types (\"?array $content = null\")","source":"MediaWiki.Usage.NullableType.ExplicitNullableTypes","severity":5,"fixable":true,"type":"ERROR","line":54,"column":9},{"message":"Use PHP 8.4 compatible syntax for explicit nullable types (\"?PageReference $pageReference = null\")","source":"MediaWiki.Usage.NullableType.ExplicitNullableTypes","severity":5,"fixable":true,"type":"ERROR","line":55,"column":9}]},"\/src\/repo\/tests\/phpunit\/unit\/Campaign\/InvalidCampaignExceptionTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Api\/QueryAllCampaigns.php":{"errors":3,"warnings":0,"messages":[{"message":"Missing function doc comment","source":"MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic","severity":5,"fixable":false,"type":"ERROR","line":159,"column":12},{"message":"Missing function doc comment","source":"MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic","severity":5,"fixable":false,"type":"ERROR","line":163,"column":12},{"message":"Missing function doc comment","source":"MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic","severity":5,"fixable":false,"type":"ERROR","line":189,"column":12}]},"\/src\/repo\/includes\/Hooks\/CampaignContentHooks.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Config\/ConfigBaseTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Campaign\/CampaignContent.php":{"errors":2,"warnings":0,"messages":[{"message":"Use PHP 8.4 compatible syntax for explicit nullable types (\"?Validator $validator = null\")","source":"MediaWiki.Usage.NullableType.ExplicitNullableTypes","severity":5,"fixable":true,"type":"ERROR","line":106,"column":34},{"message":"Use PHP 8.4 compatible syntax for explicit nullable types (\"?int $pageId = null\")","source":"MediaWiki.Usage.NullableType.ExplicitNullableTypes","severity":5,"fixable":true,"type":"ERROR","line":199,"column":61}]},"\/src\/repo\/includes\/MediaUploaderServices.php":{"errors":7,"warnings":0,"messages":[{"message":"Use PHP 8.4 compatible syntax for explicit nullable types (\"?MediaWikiServices $services = null\")","source":"MediaWiki.Usage.NullableType.ExplicitNullableTypes","severity":5,"fixable":true,"type":"ERROR","line":31,"column":46},{"message":"Use PHP 8.4 compatible syntax for explicit nullable types (\"?MediaWikiServices $services = null\")","source":"MediaWiki.Usage.NullableType.ExplicitNullableTypes","severity":5,"fixable":true,"type":"ERROR","line":35,"column":46},{"message":"Use PHP 8.4 compatible syntax for explicit nullable types (\"?MediaWikiServices $services = null\")","source":"MediaWiki.Usage.NullableType.ExplicitNullableTypes","severity":5,"fixable":true,"type":"ERROR","line":39,"column":50},{"message":"Use PHP 8.4 compatible syntax for explicit nullable types (\"?MediaWikiServices $services = null\")","source":"MediaWiki.Usage.NullableType.ExplicitNullableTypes","severity":5,"fixable":true,"type":"ERROR","line":43,"column":46},{"message":"Use PHP 8.4 compatible syntax for explicit nullable types (\"?MediaWikiServices $services = null\")","source":"MediaWiki.Usage.NullableType.ExplicitNullableTypes","severity":5,"fixable":true,"type":"ERROR","line":47,"column":52},{"message":"Use PHP 8.4 compatible syntax for explicit nullable types (\"?MediaWikiServices $services = null\")","source":"MediaWiki.Usage.NullableType.ExplicitNullableTypes","severity":5,"fixable":true,"type":"ERROR","line":51,"column":55},{"message":"Use PHP 8.4 compatible syntax for explicit nullable types (\"?MediaWikiServices $services = null\")","source":"MediaWiki.Usage.NullableType.ExplicitNullableTypes","severity":5,"fixable":true,"type":"ERROR","line":55,"column":42}]},"\/src\/repo\/includes\/Special\/Campaigns.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Special\/MediaUploaderSimpleForm.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Config\/CampaignParsedConfig.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/MediaUploader.config.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Config\/ConfigCacheInvalidatorTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Campaign\/CampaignStoreTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Config\/ConfigParserFactory.php":{"errors":1,"warnings":0,"messages":[{"message":"Use PHP 8.4 compatible syntax for explicit nullable types (\"?PageReference $pageRef = null\")","source":"MediaWiki.Usage.NullableType.ExplicitNullableTypes","severity":5,"fixable":true,"type":"ERROR","line":41,"column":9}]},"\/src\/repo\/includes\/Config\/ParsedConfig.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Campaign\/CampaignPageFormatter.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/Api\/QueryAllCampaignsTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Config\/RawConfigTest.php":{"errors":0,"warnings":1,"messages":[{"message":"Comments should start on new line.","source":"MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment","severity":5,"fixable":false,"type":"WARNING","line":32,"column":49}]},"\/src\/repo\/tests\/phpunit\/unit\/Campaign\/CampaignRecordTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Config\/ConfigFactory.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Campaign\/CampaignSelectQueryBuilder.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/MediaUploaderResourceModuleTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Campaign\/CampaignContentHandler.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Config\/ConfigParser.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Hooks\/CampaignContentHooksTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/maintenance\/MigrateCampaigns.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/MaintenanceMigrateCampaignsTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Campaign\/CampaignStore.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/MediaUploaderServicesTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Config\/ParsedConfigTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/CampaignStatsTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Hooks\/CampaignHooks.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/SpecialMediaUploaderTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/ConfigParserTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/CampaignStoreTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Campaign\/CampaignStats.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Special\/MediaUploader.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/GlobalConfigAnchorUpdateJobTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Campaign\/CampaignContentTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Hooks\/CampaignHooksTest.php":{"errors":2,"warnings":0,"messages":[{"message":"Use PHP 8.4 compatible syntax for explicit nullable types (\"?CampaignStore $campaignStore = null\")","source":"MediaWiki.Usage.NullableType.ExplicitNullableTypes","severity":5,"fixable":true,"type":"ERROR","line":335,"column":9},{"message":"Use PHP 8.4 compatible syntax for explicit nullable types (\"?ConfigCacheInvalidator $cacheInvalidator = null\")","source":"MediaWiki.Usage.NullableType.ExplicitNullableTypes","severity":5,"fixable":true,"type":"ERROR","line":336,"column":9}]},"\/src\/repo\/tests\/phpunit\/unit\/Config\/GlobalParsedConfigTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Config\/ConfigParserTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Hooks\/RegistrationHooksTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Campaign\/ValidatorTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Config\/CampaignParsedConfigTest.php":{"errors":0,"warnings":0,"messages":[]}}}
--- end ---
PHPCS run failed
$ vendor/bin/phpcbf
--- stdout ---
PHPCBF RESULT SUMMARY
-----------------------------------------------------------------------------
FILE FIXED REMAINING
-----------------------------------------------------------------------------
/src/repo/includes/MediaUploaderServices.php 7 0
/src/repo/includes/Config/ConfigParserFactory.php 1 0
/src/repo/includes/Campaign/CampaignRecord.php 2 0
/src/repo/includes/Campaign/CampaignContent.php 2 0
/src/repo/tests/phpunit/unit/Hooks/CampaignHooksTest.php 2 0
-----------------------------------------------------------------------------
A TOTAL OF 14 ERRORS WERE FIXED IN 5 FILES
-----------------------------------------------------------------------------
Time: 1.21 secs; Memory: 8MB
--- end ---
$ vendor/bin/phpcs --report=json
--- stdout ---
{"totals":{"errors":3,"warnings":1,"fixable":0},"files":{"\/src\/repo\/defines.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/MediaUploader.namespaces.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Campaign\/Exception\/BaseCampaignException.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Campaign\/Exception\/InvalidFormatException.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/MediaUploaderResourceModuleFactory.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Campaign\/Exception\/InvalidCampaignException.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Campaign\/Exception\/IncompleteRecordException.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Config\/GlobalConfigAnchorUpdateJob.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Config\/RawConfig.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Config\/ConfigBase.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/MediaUploaderResourceModule.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Hooks\/RegistrationHooks.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/ServiceWiring.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Config\/ConfigCacheInvalidator.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Config\/ConfigUnitTestCase.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Config\/RequestConfigTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Config\/ConfigFactoryTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Hooks\/Hooks.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Config\/GlobalParsedConfig.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/MediaUploader.alias.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Campaign\/CampaignRecord.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Config\/RequestConfig.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Campaign\/InvalidCampaignExceptionTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/.phan\/config.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Campaign\/Validator.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Campaign\/Exception\/InvalidSchemaException.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Campaign\/CampaignContent.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Config\/CampaignParsedConfig.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Campaign\/CampaignStoreTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/MediaUploaderServices.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Hooks\/CampaignContentHooks.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Api\/QueryAllCampaigns.php":{"errors":3,"warnings":0,"messages":[{"message":"Missing function doc comment","source":"MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic","severity":5,"fixable":false,"type":"ERROR","line":159,"column":12},{"message":"Missing function doc comment","source":"MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic","severity":5,"fixable":false,"type":"ERROR","line":163,"column":12},{"message":"Missing function doc comment","source":"MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic","severity":5,"fixable":false,"type":"ERROR","line":189,"column":12}]},"\/src\/repo\/includes\/Config\/ConfigParserFactory.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Special\/Campaigns.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Special\/MediaUploaderSimpleForm.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/Api\/QueryAllCampaignsTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Campaign\/CampaignSelectQueryBuilder.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Config\/ConfigBaseTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Campaign\/CampaignPageFormatter.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Config\/ParsedConfig.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/MediaUploader.config.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Campaign\/CampaignRecordTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Config\/ConfigCacheInvalidatorTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Config\/ConfigFactory.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Campaign\/CampaignContentHandler.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Hooks\/CampaignContentHooksTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Config\/RawConfigTest.php":{"errors":0,"warnings":1,"messages":[{"message":"Comments should start on new line.","source":"MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment","severity":5,"fixable":false,"type":"WARNING","line":32,"column":49}]},"\/src\/repo\/maintenance\/MigrateCampaigns.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Config\/ConfigParser.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Config\/ParsedConfigTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/MediaUploaderServicesTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Campaign\/CampaignStore.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/MediaUploaderResourceModuleTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/MaintenanceMigrateCampaignsTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Hooks\/CampaignHooks.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Special\/MediaUploader.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/CampaignStatsTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Campaign\/CampaignContentTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/CampaignStoreTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/ConfigParserTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/SpecialMediaUploaderTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/integration\/GlobalConfigAnchorUpdateJobTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Hooks\/CampaignHooksTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/includes\/Campaign\/CampaignStats.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Config\/GlobalParsedConfigTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Hooks\/RegistrationHooksTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Config\/ConfigParserTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Campaign\/ValidatorTest.php":{"errors":0,"warnings":0,"messages":[]},"\/src\/repo\/tests\/phpunit\/unit\/Config\/CampaignParsedConfigTest.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
17 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.20 | 10 parallel jobs
............................................................ 60/69 ( 86%)
......... 69/69 (100%)
Checked 69 files in 0.4 seconds
No syntax error found
................................... 35 / 35 (100%)
Time: 289ms; Memory: 12MB
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": 449,
"optional": 0,
"peer": 1,
"peerOptional": 0,
"total": 449
}
}
}
--- end ---
$ package-lock-lint package-lock.json
--- stdout ---
Checking package-lock.json
--- end ---
build: Updating mediawiki/mediawiki-codesniffer to 45.0.0
$ git add .
--- stdout ---
--- end ---
$ git commit -F /tmp/tmpvdlpuya3
--- stdout ---
[master ac44a04] build: Updating mediawiki/mediawiki-codesniffer to 45.0.0
6 files changed, 15 insertions(+), 15 deletions(-)
--- end ---
$ git format-patch HEAD~1 --stdout
--- stdout ---
From ac44a04ccd19afdd025ef434fc166cabba86a920 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Wed, 13 Nov 2024 01:53:39 +0000
Subject: [PATCH] build: Updating mediawiki/mediawiki-codesniffer to 45.0.0
Change-Id: I0d090cadb8429a25018212bd916eb869ec77bd35
---
composer.json | 2 +-
includes/Campaign/CampaignContent.php | 4 ++--
includes/Campaign/CampaignRecord.php | 4 ++--
includes/Config/ConfigParserFactory.php | 2 +-
includes/MediaUploaderServices.php | 14 +++++++-------
tests/phpunit/unit/Hooks/CampaignHooksTest.php | 4 ++--
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/composer.json b/composer.json
index 116928f..c7717d2 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
"ext-json": "*"
},
"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",
diff --git a/includes/Campaign/CampaignContent.php b/includes/Campaign/CampaignContent.php
index e818454..eb83791 100644
--- a/includes/Campaign/CampaignContent.php
+++ b/includes/Campaign/CampaignContent.php
@@ -103,7 +103,7 @@ class CampaignContent extends TextContent {
*
* @param Validator|null $validator
*/
- public function setServices( Validator $validator = null ) {
+ public function setServices( ?Validator $validator = null ) {
$this->validator = $validator;
$this->initializedServices = true;
}
@@ -196,7 +196,7 @@ class CampaignContent extends TextContent {
*
* @return CampaignRecord
*/
- public function newCampaignRecord( PageReference $page, int $pageId = null ): CampaignRecord {
+ public function newCampaignRecord( PageReference $page, ?int $pageId = null ): CampaignRecord {
$yamlParse = $this->realYamlParse ?: $this->getData();
if ( !$yamlParse->isGood() ) {
$validity = CampaignRecord::CONTENT_INVALID_FORMAT;
diff --git a/includes/Campaign/CampaignRecord.php b/includes/Campaign/CampaignRecord.php
index 409465e..b4feaa4 100644
--- a/includes/Campaign/CampaignRecord.php
+++ b/includes/Campaign/CampaignRecord.php
@@ -51,8 +51,8 @@ class CampaignRecord {
?int $pageId,
bool $enabled,
int $validity,
- array $content = null,
- PageReference $pageReference = null
+ ?array $content = null,
+ ?PageReference $pageReference = null
) {
$this->pageId = $pageId;
$this->enabled = $enabled;
diff --git a/includes/Config/ConfigParserFactory.php b/includes/Config/ConfigParserFactory.php
index 269a1e2..1fafad8 100644
--- a/includes/Config/ConfigParserFactory.php
+++ b/includes/Config/ConfigParserFactory.php
@@ -38,7 +38,7 @@ class ConfigParserFactory {
public function newConfigParser(
array $rawConfig,
ParserOptions $parserOptions,
- PageReference $pageRef = null
+ ?PageReference $pageRef = null
): ConfigParser {
if ( $pageRef === null ) {
$pageRef = PageReferenceValue::localReference( NS_SPECIAL, 'MediaUploader' );
diff --git a/includes/MediaUploaderServices.php b/includes/MediaUploaderServices.php
index 653fe34..f1bb40a 100644
--- a/includes/MediaUploaderServices.php
+++ b/includes/MediaUploaderServices.php
@@ -28,31 +28,31 @@ class MediaUploaderServices {
return $services->getService( 'MediaUploader' . $name );
}
- public static function getCampaignStore( MediaWikiServices $services = null ): CampaignStore {
+ public static function getCampaignStore( ?MediaWikiServices $services = null ): CampaignStore {
return self::getService( $services, 'CampaignStore' );
}
- public static function getCampaignStats( MediaWikiServices $services = null ): CampaignStats {
+ public static function getCampaignStats( ?MediaWikiServices $services = null ): CampaignStats {
return self::getService( $services, 'CampaignStats' );
}
- public static function getCampaignValidator( MediaWikiServices $services = null ): Validator {
+ public static function getCampaignValidator( ?MediaWikiServices $services = null ): Validator {
return self::getService( $services, 'CampaignValidator' );
}
- public static function getConfigFactory( MediaWikiServices $services = null ): ConfigFactory {
+ public static function getConfigFactory( ?MediaWikiServices $services = null ): ConfigFactory {
return self::getService( $services, 'ConfigFactory' );
}
- public static function getConfigParserFactory( MediaWikiServices $services = null ): ConfigParserFactory {
+ public static function getConfigParserFactory( ?MediaWikiServices $services = null ): ConfigParserFactory {
return self::getService( $services, 'ConfigParserFactory' );
}
- public static function getConfigCacheInvalidator( MediaWikiServices $services = null ): ConfigCacheInvalidator {
+ public static function getConfigCacheInvalidator( ?MediaWikiServices $services = null ): ConfigCacheInvalidator {
return self::getService( $services, 'ConfigCacheInvalidator' );
}
- public static function getRawConfig( MediaWikiServices $services = null ): RawConfig {
+ public static function getRawConfig( ?MediaWikiServices $services = null ): RawConfig {
return self::getService( $services, 'RawConfig' );
}
diff --git a/tests/phpunit/unit/Hooks/CampaignHooksTest.php b/tests/phpunit/unit/Hooks/CampaignHooksTest.php
index 9150fb1..749971d 100644
--- a/tests/phpunit/unit/Hooks/CampaignHooksTest.php
+++ b/tests/phpunit/unit/Hooks/CampaignHooksTest.php
@@ -332,8 +332,8 @@ class CampaignHooksTest extends MediaWikiUnitTestCase {
* @return CampaignHooks
*/
private function getCampaignHooks(
- CampaignStore $campaignStore = null,
- ConfigCacheInvalidator $cacheInvalidator = null
+ ?CampaignStore $campaignStore = null,
+ ?ConfigCacheInvalidator $cacheInvalidator = null
): CampaignHooks {
return new CampaignHooks(
$campaignStore ?:
--
2.39.2
--- end ---