From 6adf0a07120552def75bd2061ecc88d16f938428 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Mon, 3 Sep 2018 14:30:30 +0000
Subject: [PATCH] build: Updating mediawiki/mediawiki-codesniffer to 22.0.0

The following sniffs are failing and were disabled:
* Squiz.PHP.NonExecutableCode.Unreachable

Change-Id: Ifa593af5d3fb2aa38dea9f73e903a2fb27d1d6e6
---
 .phpcs.xml                 | 1 +
 composer.json              | 2 +-
 maintenance/replaceAll.php | 4 ++--
 src/SpecialReplaceText.php | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.phpcs.xml b/.phpcs.xml
index acc112eb..7deb4a9a 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <ruleset>
 	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+		<exclude name="Squiz.PHP.NonExecutableCode.Unreachable" />
 		<exclude name="Squiz.Scope.MethodScope.Missing" />
 	</rule>
 	<file>.</file>
diff --git a/composer.json b/composer.json
index eae08cdc..6a994db9 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
 	"require-dev": {
 		"jakub-onderka/php-parallel-lint": "1.0.0",
-		"mediawiki/mediawiki-codesniffer": "21.0.0",
+		"mediawiki/mediawiki-codesniffer": "22.0.0",
 		"jakub-onderka/php-console-highlighter": "0.3.2",
 		"mediawiki/minus-x": "0.3.1",
 		"mediawiki/mediawiki-phan-config": "0.3.0"
diff --git a/maintenance/replaceAll.php b/maintenance/replaceAll.php
index f1078bdc..943b2557 100755
--- a/maintenance/replaceAll.php
+++ b/maintenance/replaceAll.php
@@ -58,7 +58,7 @@ class ReplaceAll extends Maintenance {
 
 	public function __construct() {
 		parent::__construct();
-		$this->mDescription = "CLI utility to replace text wherever it is ".
+		$this->mDescription = "CLI utility to replace text wherever it is " .
 			"found in the wiki.";
 
 		$this->addArg( "target", "Target text to find.", false );
@@ -72,7 +72,7 @@ class ReplaceAll extends Maintenance {
 			false, true, 'u' );
 		$this->addOption( "yes", "Skip all prompts with an assumed 'yes'.",
 			false, false, 'y' );
-		$this->addOption( "summary", "Alternate edit summary. (%r is where to ".
+		$this->addOption( "summary", "Alternate edit summary. (%r is where to " .
 			" place the replacement text, %f the text to look for.)",
 			false, true, 's' );
 		$this->addOption( "nsall", "Search all canonical namespaces (false). " .
diff --git a/src/SpecialReplaceText.php b/src/SpecialReplaceText.php
index d556548f..fecf5109 100644
--- a/src/SpecialReplaceText.php
+++ b/src/SpecialReplaceText.php
@@ -674,7 +674,7 @@ class SpecialReplaceText extends SpecialPage {
 			$out->addWikiMsg( 'replacetext_cannotmove', $wgLang->formatNum( count( $unmoveable_titles ) ) );
 			$text = "<ul>\n";
 			foreach ( $unmoveable_titles as $title ) {
-				$text .= "<li>" .  ReplaceTextUtils::link( $title ) . "<br />\n";
+				$text .= "<li>" . ReplaceTextUtils::link( $title ) . "<br />\n";
 			}
 			$text .= "</ul>\n";
 			$out->addHTML( $text );