From 27fa8c4f7dae5348e41293874b6641d564a47658 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Thu, 10 Aug 2017 23:22:40 -0400 Subject: [PATCH] build: Updating mediawiki/mediawiki-codesniffer to 0.11.0 Change-Id: I48f0b64f19f9582b40540fa1b42a39d281979624 --- composer.json | 2 +- includes/DiscussionParser.php | 4 ++-- includes/api/ApiEchoNotifications.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 91c630406..eff2a816e 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "require-dev": { "jakub-onderka/php-parallel-lint": "0.9.2", - "mediawiki/mediawiki-codesniffer": "0.10.1", + "mediawiki/mediawiki-codesniffer": "0.11.0", "jakub-onderka/php-console-highlighter": "0.3.2" }, "scripts": { diff --git a/includes/DiscussionParser.php b/includes/DiscussionParser.php index a1b1ea8a4..11d5e7fed 100644 --- a/includes/DiscussionParser.php +++ b/includes/DiscussionParser.php @@ -746,7 +746,7 @@ abstract class EchoDiscussionParser { if ( $matches[0][0][1] > 1 ) { // is there text before the first headline? $sections[] = [ 'header' => false, - 'content' => substr( $text, 0, $matches[0][0][1] - 1 ) + 'content' => substr( $text, 0, $matches[0][0][1] - 1 ) ]; } for ( $i = 0; $i < $sectionNum; $i++ ) { @@ -757,7 +757,7 @@ abstract class EchoDiscussionParser { } $sections[] = [ 'header' => self::extractHeader( $matches[0][$i][0] ), - 'content' => trim( $content ) + 'content' => trim( $content ) ]; } diff --git a/includes/api/ApiEchoNotifications.php b/includes/api/ApiEchoNotifications.php index 870d9f73a..121499c34 100644 --- a/includes/api/ApiEchoNotifications.php +++ b/includes/api/ApiEchoNotifications.php @@ -277,7 +277,7 @@ class ApiEchoNotifications extends ApiCrossWikiBase { // @todo: what to do with this when fetching from multiple wikis? $timestamp = wfTimestamp( TS_UNIX, $overfetchedItem->getTimestamp() ); $id = $overfetchedItem->getEvent()->getId(); - $result['continue'] = $timestamp . '|' . $id; + $result['continue'] = $timestamp . '|' . $id; } return $result;