mediawiki/extensions/DocBookExport: main (log #1181883)

sourcepatches

This run took 12 seconds.

From a4997ef14640c6edeb9ebb9afc69ff6d6264c7df Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Sun, 17 Mar 2024 17:01:37 +0000
Subject: [PATCH] build: Updating mediawiki/mediawiki-codesniffer to 43.0.0

The following sniffs are failing and were disabled:
* Generic.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition

The following sniffs now pass and were enabled:
* MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures

Change-Id: I621ed95f894553ee501299db9298ffd5d8dec64f
---
 .phpcs.xml            |  2 +-
 DocBookExport.php     |  2 +-
 SpecialGetDocbook.php | 10 +++++-----
 composer.json         |  7 ++++++-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.phpcs.xml b/.phpcs.xml
index c46c7d4..d064319 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <ruleset>
 	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+		<exclude name="Generic.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition" />
 		<exclude name="Generic.Files.LineLength.TooLong" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
-		<exclude name="MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures" />
 		<exclude name="MediaWiki.NamingConventions.PrefixedGlobalFunctions.allowedPrefix" />
 		<exclude name="MediaWiki.Usage.ExtendClassUsage.FunctionConfigUsage" />
 		<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
diff --git a/DocBookExport.php b/DocBookExport.php
index b247364..3863da6 100644
--- a/DocBookExport.php
+++ b/DocBookExport.php
@@ -111,7 +111,7 @@ class DocBookExport {
 			}
 			$identifier = $parts[0];
 			$after_identifier = $parts[1];
-			list( $param_content, $parameters ) = SpecialGetDocbook::extractParametersInBrackets( $after_identifier );
+			[ $param_content, $parameters ] = SpecialGetDocbook::extractParametersInBrackets( $after_identifier );
 
 			$docbook_preview .= '<br>' . $identifier . " "
 				. implode(
diff --git a/SpecialGetDocbook.php b/SpecialGetDocbook.php
index c8b085c..c565339 100644
--- a/SpecialGetDocbook.php
+++ b/SpecialGetDocbook.php
@@ -236,7 +236,7 @@ class SpecialGetDocbook extends SpecialPage {
 			$book_contents .= '<corpauthor>' . $options['corpauthor'] . '</corpauthor>';
 		}
 		if ( !empty( $options['productname'] ) ) {
-			list( $param_content, $parameters ) = self::extractParametersInBrackets( $options['productname'] );
+			[ $param_content, $parameters ] = self::extractParametersInBrackets( $options['productname'] );
 			if ( array_key_exists( 'class', $parameters ) ) {
 				$book_contents .= '<productname class="' . $parameters['class'] . '">' . $param_content . '</productname>';
 			} else {
@@ -244,7 +244,7 @@ class SpecialGetDocbook extends SpecialPage {
 			}
 		}
 		if ( !empty( $options['biblioid'] ) ) {
-			list( $param_content, $parameters ) = self::extractParametersInBrackets( $options['biblioid'] );
+			[ $param_content, $parameters ] = self::extractParametersInBrackets( $options['biblioid'] );
 			if ( array_key_exists( 'class', $parameters ) ) {
 				$book_contents .= '<biblioid class="' . $parameters['class'] . '">' . $param_content . '</biblioid>';
 			} else {
@@ -499,7 +499,7 @@ class SpecialGetDocbook extends SpecialPage {
 			$identifier = $parts[0];
 			$after_identifier = $parts[1];
 
-			list( $param_content, $parameters ) = self::extractParametersInBrackets( $after_identifier );
+			[ $param_content, $parameters ] = self::extractParametersInBrackets( $after_identifier );
 			$wiki_pages = explode( ',', $param_content );
 			$display_pagename = $wiki_pages[0];
 			$orientation_mode = "";
@@ -1129,8 +1129,8 @@ function cleanse( $string, $allowedTags = [] ) {
 	// Remove MS Word Special Characters
 	// ============
 
-	$search  = [ '&acirc;€“','&acirc;€œ','&acirc;€˜','&acirc;€™','&Acirc;&pound;','&Acirc;&not;','&acirc;„&cent;' ];
-	$replace = [ '-','&ldquo;','&lsquo;','&rsquo;','&pound;','&not;','&#8482;' ];
+	$search  = [ '&acirc;€“', '&acirc;€œ', '&acirc;€˜', '&acirc;€™', '&Acirc;&pound;', '&Acirc;&not;', '&acirc;„&cent;' ];
+	$replace = [ '-', '&ldquo;', '&lsquo;', '&rsquo;', '&pound;', '&not;', '&#8482;' ];
 
 	$string = str_replace( $search, $replace, $string );
 	$string = str_replace( '&acirc;€', '&rdquo;', $string );
diff --git a/composer.json b/composer.json
index 3061b46..d6aa8f0 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
 	"require-dev": {
-		"mediawiki/mediawiki-codesniffer": "41.0.0",
+		"mediawiki/mediawiki-codesniffer": "43.0.0",
 		"mediawiki/minus-x": "1.1.1",
 		"mpdf/mpdf": "^8.0",
 		"php-parallel-lint/php-console-highlighter": "1.0.0",
@@ -17,5 +17,10 @@
 			"phpcbf"
 		],
 		"phpcs": "phpcs -sp --cache"
+	},
+	"config": {
+		"allow-plugins": {
+			"dealerdirect/phpcodesniffer-composer-installer": true
+		}
 	}
 }
-- 
2.39.2

$ date
--- stdout ---
Sun Mar 17 17:01:29 UTC 2024

--- end ---
$ git clone file:///srv/git/mediawiki-extensions-DocBookExport.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 ---
c20c64c0c5f7a71e84e99b59801dda865a8a5eb9 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": 427,
      "optional": 0,
      "peer": 7,
      "peerOptional": 0,
      "total": 427
    }
  }
}

--- 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: 27 installs, 0 updates, 0 removals
  - 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 mpdf/mpdf (v8.2.3)
  - Locking mpdf/psr-http-message-shim (v2.0.1)
  - Locking mpdf/psr-log-aware-trait (v2.0.0)
  - Locking myclabs/deep-copy (1.11.1)
  - Locking paragonie/random_compat (v9.99.100)
  - 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 psr/http-message (2.0)
  - Locking psr/log (2.0.0)
  - Locking setasign/fpdi (v2.6.0)
  - 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: 27 installs, 0 updates, 0 removals
    0 [>---------------------------]    0 [->--------------------------]
  - 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 setasign/fpdi (v2.6.0): Extracting archive
  - Installing psr/log (2.0.0): Extracting archive
  - Installing psr/http-message (2.0): Extracting archive
  - Installing paragonie/random_compat (v9.99.100): Extracting archive
  - Installing myclabs/deep-copy (1.11.1): Extracting archive
  - Installing mpdf/psr-log-aware-trait (v2.0.0): Extracting archive
  - Installing mpdf/psr-http-message-shim (v2.0.1): Extracting archive
  - Installing mpdf/mpdf (v8.2.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.3.2): Extracting archive
  0/27 [>---------------------------]   0%
 18/27 [==================>---------]  66%
 26/27 [==========================>-]  96%
 27/27 [============================] 100%
6 package suggestions were added by new dependencies, use `composer suggest` to see details.
Generating autoload files
16 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
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 ---
{'MediaWiki.NamingConventions.PrefixedGlobalFunctions.allowedPrefix', 'MediaWiki.Usage.ExtendClassUsage.FunctionConfigUsage', 'Squiz.Scope.MethodScope.Missing', 'MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures', 'Generic.Files.LineLength.TooLong', 'MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected', 'MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment', 'MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic'}
Tests fail!
$ vendor/bin/phpcbf
--- stdout ---

PHPCBF RESULT SUMMARY
----------------------------------------------------------------------
FILE                                                  FIXED  REMAINING
----------------------------------------------------------------------
/src/repo/DocBookExport.php                           1      3
/src/repo/SpecialGetDocbook.php                       15     66
----------------------------------------------------------------------
A TOTAL OF 16 ERRORS WERE FIXED IN 2 FILES
----------------------------------------------------------------------

Time: 488ms; 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
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.7 | 10 parallel jobs
....                                                         4/4 (100 %)


Checked 4 files in 0.1 seconds
No syntax error found
.... 4 / 4 (100%)


Time: 90ms; Memory: 8MB

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": 427,
      "optional": 0,
      "peer": 7,
      "peerOptional": 0,
      "total": 427
    }
  }
}

--- 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:
* Generic.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition

The following sniffs now pass and were enabled:
* MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures

$ git add .
--- stdout ---

--- end ---
$ git commit -F /tmp/tmpggwn6fvz
--- stdout ---
[master a4997ef] build: Updating mediawiki/mediawiki-codesniffer to 43.0.0
 4 files changed, 13 insertions(+), 8 deletions(-)

--- end ---
$ git format-patch HEAD~1 --stdout
--- stdout ---
From a4997ef14640c6edeb9ebb9afc69ff6d6264c7df Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Sun, 17 Mar 2024 17:01:37 +0000
Subject: [PATCH] build: Updating mediawiki/mediawiki-codesniffer to 43.0.0

The following sniffs are failing and were disabled:
* Generic.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition

The following sniffs now pass and were enabled:
* MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures

Change-Id: I621ed95f894553ee501299db9298ffd5d8dec64f
---
 .phpcs.xml            |  2 +-
 DocBookExport.php     |  2 +-
 SpecialGetDocbook.php | 10 +++++-----
 composer.json         |  7 ++++++-
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.phpcs.xml b/.phpcs.xml
index c46c7d4..d064319 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <ruleset>
 	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+		<exclude name="Generic.CodeAnalysis.AssignmentInCondition.FoundInWhileCondition" />
 		<exclude name="Generic.Files.LineLength.TooLong" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
-		<exclude name="MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures" />
 		<exclude name="MediaWiki.NamingConventions.PrefixedGlobalFunctions.allowedPrefix" />
 		<exclude name="MediaWiki.Usage.ExtendClassUsage.FunctionConfigUsage" />
 		<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
diff --git a/DocBookExport.php b/DocBookExport.php
index b247364..3863da6 100644
--- a/DocBookExport.php
+++ b/DocBookExport.php
@@ -111,7 +111,7 @@ class DocBookExport {
 			}
 			$identifier = $parts[0];
 			$after_identifier = $parts[1];
-			list( $param_content, $parameters ) = SpecialGetDocbook::extractParametersInBrackets( $after_identifier );
+			[ $param_content, $parameters ] = SpecialGetDocbook::extractParametersInBrackets( $after_identifier );
 
 			$docbook_preview .= '<br>' . $identifier . " "
 				. implode(
diff --git a/SpecialGetDocbook.php b/SpecialGetDocbook.php
index c8b085c..c565339 100644
--- a/SpecialGetDocbook.php
+++ b/SpecialGetDocbook.php
@@ -236,7 +236,7 @@ class SpecialGetDocbook extends SpecialPage {
 			$book_contents .= '<corpauthor>' . $options['corpauthor'] . '</corpauthor>';
 		}
 		if ( !empty( $options['productname'] ) ) {
-			list( $param_content, $parameters ) = self::extractParametersInBrackets( $options['productname'] );
+			[ $param_content, $parameters ] = self::extractParametersInBrackets( $options['productname'] );
 			if ( array_key_exists( 'class', $parameters ) ) {
 				$book_contents .= '<productname class="' . $parameters['class'] . '">' . $param_content . '</productname>';
 			} else {
@@ -244,7 +244,7 @@ class SpecialGetDocbook extends SpecialPage {
 			}
 		}
 		if ( !empty( $options['biblioid'] ) ) {
-			list( $param_content, $parameters ) = self::extractParametersInBrackets( $options['biblioid'] );
+			[ $param_content, $parameters ] = self::extractParametersInBrackets( $options['biblioid'] );
 			if ( array_key_exists( 'class', $parameters ) ) {
 				$book_contents .= '<biblioid class="' . $parameters['class'] . '">' . $param_content . '</biblioid>';
 			} else {
@@ -499,7 +499,7 @@ class SpecialGetDocbook extends SpecialPage {
 			$identifier = $parts[0];
 			$after_identifier = $parts[1];
 
-			list( $param_content, $parameters ) = self::extractParametersInBrackets( $after_identifier );
+			[ $param_content, $parameters ] = self::extractParametersInBrackets( $after_identifier );
 			$wiki_pages = explode( ',', $param_content );
 			$display_pagename = $wiki_pages[0];
 			$orientation_mode = "";
@@ -1129,8 +1129,8 @@ function cleanse( $string, $allowedTags = [] ) {
 	// Remove MS Word Special Characters
 	// ============
 
-	$search  = [ '&acirc;€“','&acirc;€œ','&acirc;€˜','&acirc;€™','&Acirc;&pound;','&Acirc;&not;','&acirc;„&cent;' ];
-	$replace = [ '-','&ldquo;','&lsquo;','&rsquo;','&pound;','&not;','&#8482;' ];
+	$search  = [ '&acirc;€“', '&acirc;€œ', '&acirc;€˜', '&acirc;€™', '&Acirc;&pound;', '&Acirc;&not;', '&acirc;„&cent;' ];
+	$replace = [ '-', '&ldquo;', '&lsquo;', '&rsquo;', '&pound;', '&not;', '&#8482;' ];
 
 	$string = str_replace( $search, $replace, $string );
 	$string = str_replace( '&acirc;€', '&rdquo;', $string );
diff --git a/composer.json b/composer.json
index 3061b46..d6aa8f0 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
 	"require-dev": {
-		"mediawiki/mediawiki-codesniffer": "41.0.0",
+		"mediawiki/mediawiki-codesniffer": "43.0.0",
 		"mediawiki/minus-x": "1.1.1",
 		"mpdf/mpdf": "^8.0",
 		"php-parallel-lint/php-console-highlighter": "1.0.0",
@@ -17,5 +17,10 @@
 			"phpcbf"
 		],
 		"phpcs": "phpcs -sp --cache"
+	},
+	"config": {
+		"allow-plugins": {
+			"dealerdirect/phpcodesniffer-composer-installer": true
+		}
 	}
 }
-- 
2.39.2


--- end ---
Source code is licensed under the AGPL.