build: Updating mediawiki/mediawiki-codesniffer to 22.0.0

libraryupgrader · libraryupgrader · commit ada8e536cd09 · 2018-09-03T05:30:54.000Z
And updating CoC link to use Special:MyLanguage (T202047).

Change-Id: I900c01cef632dd80952e08df260e08b8d1a52fa9
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -1 +1 @@
-The development of this software is covered by a [Code of Conduct](https://www.mediawiki.org/wiki/Code_of_Conduct).
+The development of this software is covered by a [Code of Conduct](https://www.mediawiki.org/wiki/Special:MyLanguage/Code_of_Conduct).
diff --git a/Memento/MementoResource.php b/Memento/MementoResource.php
@@ -324,7 +324,7 @@ public function constructTimeMapLinkHeaderWithBounds(
 	public function constructTimeMapLinkHeader( $title ) {
 		$uri = SpecialPage::getTitleFor( 'TimeMap', $title )->getFullURL();
 
-		$entry = '<' . $uri .  '>; rel="timemap"; type="application/link-format"';
+		$entry = '<' . $uri . '>; rel="timemap"; type="application/link-format"';
 
 		return $entry;
 	}
diff --git a/Memento/TimeMapResource.php b/Memento/TimeMapResource.php
@@ -61,7 +61,7 @@ abstract class TimeMapResource extends MementoResource {
 	 */
 	public static function containsPivot( $urlparam ) {
 		return (
-			preg_match( '/' .  self::PIVOTURLPATTERN .
+			preg_match( '/' . self::PIVOTURLPATTERN .
 				'/', $urlparam ) == 1 );
 	}
 
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
 	"require-dev": {
 		"jakub-onderka/php-parallel-lint": "1.0.0",
 		"jakub-onderka/php-console-highlighter": "0.3.2",
-		"mediawiki/mediawiki-codesniffer": "21.0.0",
+		"mediawiki/mediawiki-codesniffer": "22.0.0",
 		"mediawiki/minus-x": "0.3.1"
 	},
 	"scripts": {
diff --git a/tests/lib/TestSupport.php b/tests/lib/TestSupport.php
@@ -110,7 +110,7 @@ function diffStrings( $string1, $string2 ) {
 			} else {
 				echo "at position $i: string1 has character " . $string1[$i] .
 					'(' . ord( $string1[$i] ) . "), and string2 has character " .
-					$string2[$i] .  '(' . ord( $string2[$i] ) . ")\n";
+					$string2[$i] . '(' . ord( $string2[$i] ) . ")\n";
 			}
 
 		} else {

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-The development of this software is covered by a [Code of Conduct](https://www.mediawiki.org/wiki/Code_of_Conduct).`
	`1`	`+The development of this software is covered by a [Code of Conduct](https://www.mediawiki.org/wiki/Special:MyLanguage/Code_of_Conduct).`
Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ public function constructTimeMapLinkHeaderWithBounds(`
`324`	`324`	`public function constructTimeMapLinkHeader( $title ) {`
`325`	`325`	`$uri = SpecialPage::getTitleFor( 'TimeMap', $title )->getFullURL();`
`326`	`326`
`327`		`- $entry = '<' . $uri . '>; rel="timemap"; type="application/link-format"';`
	`327`	`+ $entry = '<' . $uri . '>; rel="timemap"; type="application/link-format"';`
`328`	`328`
`329`	`329`	`return $entry;`
`330`	`330`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ abstract class TimeMapResource extends MementoResource {`
`61`	`61`	`*/`
`62`	`62`	`public static function containsPivot( $urlparam ) {`
`63`	`63`	`return (`
`64`		`- preg_match( '/' . self::PIVOTURLPATTERN .`
	`64`	`+ preg_match( '/' . self::PIVOTURLPATTERN .`
`65`	`65`	`'/', $urlparam ) == 1 );`
`66`	`66`	`}`
`67`	`67`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ function diffStrings( $string1, $string2 ) {`
`110`	`110`	`} else {`
`111`	`111`	`echo "at position $i: string1 has character " . $string1[$i] .`
`112`	`112`	`'(' . ord( $string1[$i] ) . "), and string2 has character " .`
`113`		`- $string2[$i] . '(' . ord( $string2[$i] ) . ")\n";`
	`113`	`+ $string2[$i] . '(' . ord( $string2[$i] ) . ")\n";`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`} else {`