From 5bd2eaf70e4f131d015fa19ff44d27a5ed66c768 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Wed, 6 Feb 2019 13:01:32 +0000
Subject: [PATCH] build: Updating mediawiki/mediawiki-codesniffer to 24.0.0

Change-Id: Ifd3dde125bae36b1076576ddc0c8b09eadd18a72
---
 composer.json                                  | 2 +-
 includes/DiscussionParser.php                  | 6 +++---
 includes/controller/NotificationController.php | 8 ++++----
 includes/model/Event.php                       | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index edad2b43e..8d8396094 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
 	"require-dev": {
 		"jakub-onderka/php-parallel-lint": "1.0.0",
-		"mediawiki/mediawiki-codesniffer": "23.0.0",
+		"mediawiki/mediawiki-codesniffer": "24.0.0",
 		"jakub-onderka/php-console-highlighter": "0.3.2",
 		"mediawiki/minus-x": "0.3.1"
 	},
diff --git a/includes/DiscussionParser.php b/includes/DiscussionParser.php
index 32cf18c5a..97c3c1ba5 100644
--- a/includes/DiscussionParser.php
+++ b/includes/DiscussionParser.php
@@ -5,9 +5,9 @@ use MediaWiki\MediaWikiServices;
 abstract class EchoDiscussionParser {
 	const HEADER_REGEX = '^(==+)\h*([^=].*)\h*\1$';
 
-	static protected $timestampRegex;
-	static protected $revisionInterpretationCache = [];
-	static protected $diffParser;
+	protected static $timestampRegex;
+	protected static $revisionInterpretationCache = [];
+	protected static $diffParser;
 
 	/**
 	 * Given a Revision object, generates EchoEvent objects for
diff --git a/includes/controller/NotificationController.php b/includes/controller/NotificationController.php
index e9204be04..52661c297 100644
--- a/includes/controller/NotificationController.php
+++ b/includes/controller/NotificationController.php
@@ -13,28 +13,28 @@ class EchoNotificationController {
 	 *
 	 * @var int $maxRecipientCacheSize
 	 */
-	static protected $maxRecipientCacheSize = 200;
+	protected static $maxRecipientCacheSize = 200;
 
 	/**
 	 * Echo event agent per user blacklist
 	 *
 	 * @var MapCacheLRU
 	 */
-	static protected $blacklistByUser;
+	protected static $blacklistByUser;
 
 	/**
 	 * Echo event agent per wiki blacklist
 	 *
 	 * @var EchoContainmentList|null
 	 */
-	static protected $wikiBlacklist;
+	protected static $wikiBlacklist;
 
 	/**
 	 * Echo event agent per user whitelist, this overwrites $blacklistByUser
 	 *
 	 * @var MapCacheLRU
 	 */
-	static protected $whitelistByUser;
+	protected static $whitelistByUser;
 
 	/**
 	 * Returns the count passed in, or MWEchoNotifUser::MAX_BADGE_COUNT + 1,
diff --git a/includes/model/Event.php b/includes/model/Event.php
index 28e6416c4..1ba6fa014 100644
--- a/includes/model/Event.php
+++ b/includes/model/Event.php
@@ -150,7 +150,7 @@ class EchoEvent extends EchoAbstractEntity implements Bundleable {
 			$obj->setTitle( $obj->title );
 		}
 
-		if ( $obj->agent && ! $obj->agent instanceof User ) {
+		if ( $obj->agent && !$obj->agent instanceof User ) {
 			throw new InvalidArgumentException( "Invalid user parameter" );
 		}