From c13f4d84a0456c5812be6305a39410f6e849471d Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Tue, 14 Jan 2020 12:18:33 +0000
Subject: [PATCH] build: Updating mediawiki/mediawiki-codesniffer to 29.0.0

The following sniffs are failing and were disabled:
* MediaWiki.Commenting.FunctionComment.MissingDocumentationPrivate

Additional changes:
* Also sorted "composer fix" command to run phpcbf last.

Change-Id: I168acfd973ed0bdb924f6aee523c934fe54213fa
---
 .phpcs.xml    | 1 +
 composer.json | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.phpcs.xml b/.phpcs.xml
index 0c00f903..bb833c06 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ruleset>
 	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPrivate" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
 		<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
 		<exclude name="PSR12.Properties.ConstantVisibility.NotFound" />
diff --git a/composer.json b/composer.json
index c458a86f..c4fc9399 100644
--- a/composer.json
+++ b/composer.json
@@ -2,14 +2,14 @@
 	"require-dev": {
 		"jakub-onderka/php-parallel-lint": "1.0.0",
 		"jakub-onderka/php-console-highlighter": "0.3.2",
-		"mediawiki/mediawiki-codesniffer": "28.0.0",
+		"mediawiki/mediawiki-codesniffer": "29.0.0",
 		"mediawiki/minus-x": "0.3.2",
 		"mediawiki/mediawiki-phan-config": "0.9.0"
 	},
 	"scripts": {
 		"fix": [
-			"phpcbf",
-			"minus-x fix ."
+			"minus-x fix .",
+			"phpcbf"
 		],
 		"test": [
 			"parallel-lint . --exclude node_modules --exclude vendor",