From 74612832ab755ce1c806692e81607913c78fd619 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Mon, 18 Mar 2024 17:41:59 +0000
Subject: [PATCH] build: Updating mediawiki/mediawiki-codesniffer to 43.0.0
The following sniffs are failing and were disabled:
* MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic
Change-Id: I7d208796c1b3ed066394c4bc9268f95690cb98d4
---
.phpcs.xml | 1 +
composer.json | 5 +++--
src/Components/Logo.php | 2 +-
src/Components/UserButton.php | 16 ++++++++--------
src/Panel/ContentActions.php | 3 ++-
src/SkinDataFieldDefinition.php | 2 +-
.../AssocLinksProvider/CustomCallbackTest.php | 6 +++---
7 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/.phpcs.xml b/.phpcs.xml
index 1142410..72797f5 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -2,6 +2,7 @@
<ruleset>
<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPrivate" />
+ <exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
<exclude name="MediaWiki.Commenting.FunctionComment.TypeTypeHintParam" />
<exclude name="MediaWiki.Commenting.FunctionComment.TypeTypeHintReturn" />
<exclude name="MediaWiki.Commenting.PropertyDocumentation.MissingDocumentationProtected" />
diff --git a/composer.json b/composer.json
index d685a13..77cd4fa 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
"composer/installers": "~1.0"
},
"require-dev": {
- "mediawiki/mediawiki-codesniffer": "41.0.0",
+ "mediawiki/mediawiki-codesniffer": "43.0.0",
"mediawiki/minus-x": "1.1.1",
"php-parallel-lint/php-console-highlighter": "1.0.0",
"php-parallel-lint/php-parallel-lint": "1.3.2"
@@ -42,7 +42,8 @@
},
"config": {
"allow-plugins": {
- "composer/installers": true
+ "composer/installers": true,
+ "dealerdirect/phpcodesniffer-composer-installer": true
}
}
}
diff --git a/src/Components/Logo.php b/src/Components/Logo.php
index 1a469f6..4e24eb7 100644
--- a/src/Components/Logo.php
+++ b/src/Components/Logo.php
@@ -24,7 +24,7 @@ class Logo extends TemplateComponent {
$args = parent::getTemplateArgs();
foreach ( $logo as $key => $value ) {
- $args['items'][] = $value;
+ $args['items'][] = $value;
}
return $args;
diff --git a/src/Components/UserButton.php b/src/Components/UserButton.php
index 74660a5..6b73e08 100644
--- a/src/Components/UserButton.php
+++ b/src/Components/UserButton.php
@@ -166,15 +166,15 @@ class UserButton extends TemplateComponent {
protected function getLoginButton() {
$returnToPage = $this->getSkin()->getTitle();
- if ( $returnToPage->equals( \SpecialPage::getTitleFor( 'Badtitle' ) ) ) {
- $request = $this->getSkin()->getRequest();
- $requestTitle = \Title::newFromText( $request->getVal( 'title', '' ) );
- if ( $requestTitle instanceof \Title ) {
- $returnToPage = $requestTitle;
- } else {
- $returnToPage = \Title::newMainPage();
- }
+ if ( $returnToPage->equals( \SpecialPage::getTitleFor( 'Badtitle' ) ) ) {
+ $request = $this->getSkin()->getRequest();
+ $requestTitle = \Title::newFromText( $request->getVal( 'title', '' ) );
+ if ( $requestTitle instanceof \Title ) {
+ $returnToPage = $requestTitle;
+ } else {
+ $returnToPage = \Title::newMainPage();
}
+ }
$returnTarget = 'returnto=' . $returnToPage->getPrefixedDBkey();
diff --git a/src/Panel/ContentActions.php b/src/Panel/ContentActions.php
index 73524c3..d54b30b 100644
--- a/src/Panel/ContentActions.php
+++ b/src/Panel/ContentActions.php
@@ -23,7 +23,8 @@ class ContentActions extends BasePanel {
$list = [];
foreach ( $content_navigation_data as $key => $value ) {
- if ( $value['bs-group'] !== 'default' ) { continue;
+ if ( $value['bs-group'] !== 'default' ) {
+ continue;
}
$list[] = $value;
}
diff --git a/src/SkinDataFieldDefinition.php b/src/SkinDataFieldDefinition.php
index f7012ab..adda5e8 100644
--- a/src/SkinDataFieldDefinition.php
+++ b/src/SkinDataFieldDefinition.php
@@ -243,7 +243,7 @@ class SkinDataFieldDefinition {
$value[$param] = $param_value;
}
}
- $linklist[$key] = $value;
+ $linklist[$key] = $value;
}
}
}
diff --git a/tests/phpunit/AssocLinksProvider/CustomCallbackTest.php b/tests/phpunit/AssocLinksProvider/CustomCallbackTest.php
index a449f4c..8d31f72 100644
--- a/tests/phpunit/AssocLinksProvider/CustomCallbackTest.php
+++ b/tests/phpunit/AssocLinksProvider/CustomCallbackTest.php
@@ -15,7 +15,7 @@ use PHPUnit\Framework\TestCase;
class CustomCallbackTest extends TestCase {
/**
- * @covers CustomCallback::factory
+ * @covers \BlueSpice\Calumma\AssocLinksProvider\CustomCallback::factory
*/
public function testFactory() {
$callback = static function ( $context, $config ) {
@@ -34,7 +34,7 @@ class CustomCallbackTest extends TestCase {
$links = CustomCallback::factory( null, $config );
$this->assertCount( 1, $links, "Should create one item" );
- $this->assertInstanceOf( ILink::class, $links[0], "First item should implement ILink" );
+ $this->assertInstanceOf( ILink::class, $links[0], "First item should implement ILink" );
$this->assertEquals(
'Some Label',
$links[0]->getLabel()->plain(),
@@ -43,7 +43,7 @@ class CustomCallbackTest extends TestCase {
}
/**
- * @covers CustomCallback::factory
+ * @covers \BlueSpice\Calumma\AssocLinksProvider\CustomCallback::factory
*/
public function testFactoryException() {
$this->expectException( Exception::class );
--
2.39.2
$ date
--- stdout ---
Mon Mar 18 17:41:48 UTC 2024
--- end ---
$ git clone file:///srv/git/mediawiki-skins-BlueSpiceCalumma.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 ---
dc19e086e364b8dc5e9ac9e0dc1f427075747178 refs/heads/master
--- end ---
$ /usr/bin/npm audit --json
--- stdout ---
{
"auditReportVersion": 2,
"vulnerabilities": {},
"metadata": {
"vulnerabilities": {
"info": 0,
"low": 0,
"moderate": 0,
"high": 0,
"critical": 0,
"total": 0
},
"dependencies": {
"prod": 1,
"dev": 313,
"optional": 0,
"peer": 1,
"peerOptional": 0,
"total": 313
}
}
}
--- end ---
$ /usr/bin/composer install
--- stderr ---
No composer.lock file present. Updating dependencies to latest instead of installing from lock file. See https://getcomposer.org/install for more information.
Loading composer repositories with package information
Updating dependencies
Lock file operations: 20 installs, 0 updates, 0 removals
- Locking composer/installers (v1.12.0)
- Locking composer/semver (3.3.2)
- Locking composer/spdx-licenses (1.5.8)
- Locking mediawiki/mediawiki-codesniffer (v41.0.0)
- Locking mediawiki/minus-x (1.1.1)
- Locking php-parallel-lint/php-console-color (v1.0.1)
- Locking php-parallel-lint/php-console-highlighter (v1.0.0)
- Locking php-parallel-lint/php-parallel-lint (v1.3.2)
- Locking psr/container (2.0.2)
- Locking squizlabs/php_codesniffer (3.7.2)
- Locking symfony/console (v5.4.36)
- Locking symfony/deprecation-contracts (v3.4.0)
- Locking symfony/polyfill-ctype (v1.29.0)
- Locking symfony/polyfill-intl-grapheme (v1.29.0)
- Locking symfony/polyfill-intl-normalizer (v1.29.0)
- Locking symfony/polyfill-mbstring (v1.29.0)
- Locking symfony/polyfill-php73 (v1.29.0)
- Locking symfony/polyfill-php80 (v1.29.0)
- Locking symfony/service-contracts (v3.4.1)
- Locking symfony/string (v6.4.4)
Writing lock file
Installing dependencies from lock file (including require-dev)
Package operations: 20 installs, 0 updates, 0 removals
0 [>---------------------------] 0 [->--------------------------]
- Installing composer/installers (v1.12.0): Extracting archive
- Installing symfony/polyfill-php80 (v1.29.0): Extracting archive
- Installing squizlabs/php_codesniffer (3.7.2): Extracting archive
- Installing symfony/polyfill-mbstring (v1.29.0): Extracting archive
- Installing composer/spdx-licenses (1.5.8): Extracting archive
- Installing composer/semver (3.3.2): Extracting archive
- Installing mediawiki/mediawiki-codesniffer (v41.0.0): Extracting archive
- Installing symfony/polyfill-intl-normalizer (v1.29.0): Extracting archive
- Installing symfony/polyfill-intl-grapheme (v1.29.0): Extracting archive
- Installing symfony/polyfill-ctype (v1.29.0): Extracting archive
- Installing symfony/string (v6.4.4): Extracting archive
- Installing psr/container (2.0.2): Extracting archive
- Installing symfony/service-contracts (v3.4.1): Extracting archive
- Installing symfony/polyfill-php73 (v1.29.0): Extracting archive
- Installing symfony/deprecation-contracts (v3.4.0): Extracting archive
- Installing symfony/console (v5.4.36): Extracting archive
- Installing mediawiki/minus-x (1.1.1): Extracting archive
- Installing php-parallel-lint/php-console-color (v1.0.1): Extracting archive
- Installing php-parallel-lint/php-console-highlighter (v1.0.0): Extracting archive
- Installing php-parallel-lint/php-parallel-lint (v1.3.2): Extracting archive
0/19 [>---------------------------] 0%
18/19 [==========================>-] 94%
19/19 [============================] 100%
4 package suggestions were added by new dependencies, use `composer suggest` to see details.
Generating autoload files
14 packages you are using are looking for funding.
Use the `composer fund` command to find out more!
--- stdout ---
--- end ---
Upgrading c:mediawiki/mediawiki-codesniffer from 41.0.0 -> 43.0.0
$ /usr/bin/composer update
--- stderr ---
Loading composer repositories with package information
Updating dependencies
Lock file operations: 3 installs, 3 updates, 0 removals
- Upgrading composer/semver (3.3.2 => 3.4.0)
- Locking dealerdirect/phpcodesniffer-composer-installer (v1.0.0)
- Upgrading mediawiki/mediawiki-codesniffer (v41.0.0 => v43.0.0)
- Locking phpcsstandards/phpcsextra (1.1.2)
- Locking phpcsstandards/phpcsutils (1.0.9)
- Upgrading squizlabs/php_codesniffer (3.7.2 => 3.8.1)
Writing lock file
Installing dependencies from lock file (including require-dev)
Package operations: 3 installs, 3 updates, 0 removals
0 [>---------------------------] 0 [->--------------------------]
- Upgrading squizlabs/php_codesniffer (3.7.2 => 3.8.1): Extracting archive
- Installing dealerdirect/phpcodesniffer-composer-installer (v1.0.0): Extracting archive
- Installing phpcsstandards/phpcsutils (1.0.9): Extracting archive
- Installing phpcsstandards/phpcsextra (1.1.2): Extracting archive
- Upgrading composer/semver (3.3.2 => 3.4.0): Extracting archive
- Upgrading mediawiki/mediawiki-codesniffer (v41.0.0 => v43.0.0): Extracting archive
0/4 [>---------------------------] 0%
4/4 [============================] 100%
Generating autoload files
15 packages you are using are looking for funding.
Use the `composer fund` command to find out more!
No security vulnerability advisories found
--- stdout ---
PHP CodeSniffer Config installed_paths set to ../../mediawiki/mediawiki-codesniffer,../../phpcsstandards/phpcsextra,../../phpcsstandards/phpcsutils
--- end ---
{'MediaWiki.Commenting.PropertyDocumentation.MissingDocumentationProtected', 'MediaWiki.Commenting.FunctionComment.TypeTypeHintParam', 'MediaWiki.Commenting.PropertyDocumentation.MissingDocumentationPublic', 'MediaWiki.Commenting.FunctionComment.MissingDocumentationPrivate', 'MediaWiki.Commenting.FunctionComment.TypeTypeHintReturn'}
Tests fail!
$ vendor/bin/phpcbf
--- stdout ---
PHPCBF RESULT SUMMARY
--------------------------------------------------------------------------------
FILE FIXED REMAINING
--------------------------------------------------------------------------------
/src/repo/src/Components/Logo.php 1 0
...epo/tests/phpunit/AssocLinksProvider/CustomCallbackTest.php 3 0
/src/repo/src/Components/UserButton.php 5 0
/src/repo/src/Panel/ContentActions.php 1 0
/src/repo/src/SkinDataFieldDefinition.php 1 1
--------------------------------------------------------------------------------
A TOTAL OF 11 ERRORS WERE FIXED IN 5 FILES
--------------------------------------------------------------------------------
Time: 814ms; Memory: 6MB
--- end ---
$ git checkout .phpcs.xml
--- stderr ---
Updated 1 path from the index
--- stdout ---
--- end ---
$ /usr/bin/composer install
--- stderr ---
Installing dependencies from lock file (including require-dev)
Verifying lock file contents can be installed on current platform.
Nothing to install, update or remove
Generating autoload files
15 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
> minus-x check .
> phpcs -sp
--- stdout ---
PHP 8.2.7 | 10 parallel jobs
............................................................ 60/116 (51 %)
........................................................ 116/116 (100 %)
Checked 116 files in 0.5 seconds
No syntax error found
MinusX
======
Processing /src/repo...
.............................................................
.............................................................
.............................................................
.............................................................
.............................................................
.............................................................
.............................................................
.............................................................
.............................................................
.............................................................
.............................................................
.............................................................
.........................................................
All good!
.......................................................... 58 / 58 (100%)
Time: 641ms; Memory: 6MB
--- end ---
$ /usr/bin/npm audit --json
--- stdout ---
{
"auditReportVersion": 2,
"vulnerabilities": {},
"metadata": {
"vulnerabilities": {
"info": 0,
"low": 0,
"moderate": 0,
"high": 0,
"critical": 0,
"total": 0
},
"dependencies": {
"prod": 1,
"dev": 313,
"optional": 0,
"peer": 1,
"peerOptional": 0,
"total": 313
}
}
}
--- end ---
$ package-lock-lint package-lock.json
--- stdout ---
Checking package-lock.json
--- end ---
build: Updating mediawiki/mediawiki-codesniffer to 43.0.0
The following sniffs are failing and were disabled:
* MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic
$ git add .
--- stdout ---
--- end ---
$ git commit -F /tmp/tmp7po4nb7y
--- stdout ---
[master 7461283] build: Updating mediawiki/mediawiki-codesniffer to 43.0.0
7 files changed, 19 insertions(+), 16 deletions(-)
--- end ---
$ git format-patch HEAD~1 --stdout
--- stdout ---
From 74612832ab755ce1c806692e81607913c78fd619 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Mon, 18 Mar 2024 17:41:59 +0000
Subject: [PATCH] build: Updating mediawiki/mediawiki-codesniffer to 43.0.0
The following sniffs are failing and were disabled:
* MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic
Change-Id: I7d208796c1b3ed066394c4bc9268f95690cb98d4
---
.phpcs.xml | 1 +
composer.json | 5 +++--
src/Components/Logo.php | 2 +-
src/Components/UserButton.php | 16 ++++++++--------
src/Panel/ContentActions.php | 3 ++-
src/SkinDataFieldDefinition.php | 2 +-
.../AssocLinksProvider/CustomCallbackTest.php | 6 +++---
7 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/.phpcs.xml b/.phpcs.xml
index 1142410..72797f5 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -2,6 +2,7 @@
<ruleset>
<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPrivate" />
+ <exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
<exclude name="MediaWiki.Commenting.FunctionComment.TypeTypeHintParam" />
<exclude name="MediaWiki.Commenting.FunctionComment.TypeTypeHintReturn" />
<exclude name="MediaWiki.Commenting.PropertyDocumentation.MissingDocumentationProtected" />
diff --git a/composer.json b/composer.json
index d685a13..77cd4fa 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
"composer/installers": "~1.0"
},
"require-dev": {
- "mediawiki/mediawiki-codesniffer": "41.0.0",
+ "mediawiki/mediawiki-codesniffer": "43.0.0",
"mediawiki/minus-x": "1.1.1",
"php-parallel-lint/php-console-highlighter": "1.0.0",
"php-parallel-lint/php-parallel-lint": "1.3.2"
@@ -42,7 +42,8 @@
},
"config": {
"allow-plugins": {
- "composer/installers": true
+ "composer/installers": true,
+ "dealerdirect/phpcodesniffer-composer-installer": true
}
}
}
diff --git a/src/Components/Logo.php b/src/Components/Logo.php
index 1a469f6..4e24eb7 100644
--- a/src/Components/Logo.php
+++ b/src/Components/Logo.php
@@ -24,7 +24,7 @@ class Logo extends TemplateComponent {
$args = parent::getTemplateArgs();
foreach ( $logo as $key => $value ) {
- $args['items'][] = $value;
+ $args['items'][] = $value;
}
return $args;
diff --git a/src/Components/UserButton.php b/src/Components/UserButton.php
index 74660a5..6b73e08 100644
--- a/src/Components/UserButton.php
+++ b/src/Components/UserButton.php
@@ -166,15 +166,15 @@ class UserButton extends TemplateComponent {
protected function getLoginButton() {
$returnToPage = $this->getSkin()->getTitle();
- if ( $returnToPage->equals( \SpecialPage::getTitleFor( 'Badtitle' ) ) ) {
- $request = $this->getSkin()->getRequest();
- $requestTitle = \Title::newFromText( $request->getVal( 'title', '' ) );
- if ( $requestTitle instanceof \Title ) {
- $returnToPage = $requestTitle;
- } else {
- $returnToPage = \Title::newMainPage();
- }
+ if ( $returnToPage->equals( \SpecialPage::getTitleFor( 'Badtitle' ) ) ) {
+ $request = $this->getSkin()->getRequest();
+ $requestTitle = \Title::newFromText( $request->getVal( 'title', '' ) );
+ if ( $requestTitle instanceof \Title ) {
+ $returnToPage = $requestTitle;
+ } else {
+ $returnToPage = \Title::newMainPage();
}
+ }
$returnTarget = 'returnto=' . $returnToPage->getPrefixedDBkey();
diff --git a/src/Panel/ContentActions.php b/src/Panel/ContentActions.php
index 73524c3..d54b30b 100644
--- a/src/Panel/ContentActions.php
+++ b/src/Panel/ContentActions.php
@@ -23,7 +23,8 @@ class ContentActions extends BasePanel {
$list = [];
foreach ( $content_navigation_data as $key => $value ) {
- if ( $value['bs-group'] !== 'default' ) { continue;
+ if ( $value['bs-group'] !== 'default' ) {
+ continue;
}
$list[] = $value;
}
diff --git a/src/SkinDataFieldDefinition.php b/src/SkinDataFieldDefinition.php
index f7012ab..adda5e8 100644
--- a/src/SkinDataFieldDefinition.php
+++ b/src/SkinDataFieldDefinition.php
@@ -243,7 +243,7 @@ class SkinDataFieldDefinition {
$value[$param] = $param_value;
}
}
- $linklist[$key] = $value;
+ $linklist[$key] = $value;
}
}
}
diff --git a/tests/phpunit/AssocLinksProvider/CustomCallbackTest.php b/tests/phpunit/AssocLinksProvider/CustomCallbackTest.php
index a449f4c..8d31f72 100644
--- a/tests/phpunit/AssocLinksProvider/CustomCallbackTest.php
+++ b/tests/phpunit/AssocLinksProvider/CustomCallbackTest.php
@@ -15,7 +15,7 @@ use PHPUnit\Framework\TestCase;
class CustomCallbackTest extends TestCase {
/**
- * @covers CustomCallback::factory
+ * @covers \BlueSpice\Calumma\AssocLinksProvider\CustomCallback::factory
*/
public function testFactory() {
$callback = static function ( $context, $config ) {
@@ -34,7 +34,7 @@ class CustomCallbackTest extends TestCase {
$links = CustomCallback::factory( null, $config );
$this->assertCount( 1, $links, "Should create one item" );
- $this->assertInstanceOf( ILink::class, $links[0], "First item should implement ILink" );
+ $this->assertInstanceOf( ILink::class, $links[0], "First item should implement ILink" );
$this->assertEquals(
'Some Label',
$links[0]->getLabel()->plain(),
@@ -43,7 +43,7 @@ class CustomCallbackTest extends TestCase {
}
/**
- * @covers CustomCallback::factory
+ * @covers \BlueSpice\Calumma\AssocLinksProvider\CustomCallback::factory
*/
public function testFactoryException() {
$this->expectException( Exception::class );
--
2.39.2
--- end ---