Libraryupgrader has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/400951 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
Change-Id: I4ca53e4ad3e5f4ea3a3acaa50f8b71fd517944e0
---
M composer.json
M includes/CollapsedTextBuilder.php
M includes/InlineTwoColConflict/InlineTwoColConflictHelper.php
3 files changed, 3 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoColConflict
refs/changes/51/400951/1
diff --git a/composer.json b/composer.json
index b7fa9a9..5fddd6a 100644
--- a/composer.json
+++ b/composer.json
@@ -4,7 +4,7 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "14.1.0",
+ "mediawiki/mediawiki-codesniffer": "15.0.0",
"jakub-onderka/php-console-highlighter": "0.3.2",
"mediawiki/minus-x": "0.2.1"
},
diff --git a/includes/CollapsedTextBuilder.php
b/includes/CollapsedTextBuilder.php
index da47c6b..ea53939 100644
--- a/includes/CollapsedTextBuilder.php
+++ b/includes/CollapsedTextBuilder.php
@@ -21,8 +21,7 @@
return false;
}
- return
- '<span
class="mw-twocolconflict-diffchange-fadeout-end">' .
+ return '<span
class="mw-twocolconflict-diffchange-fadeout-end">' .
htmlspecialchars( self::trimStringToFullWord(
$lines[0], $maxLength / 2, true ) ) .
'</span>' .
( count( $lines ) > 1 ? "\n" : wfMessage(
'word-separator' ) ) .
diff --git a/includes/InlineTwoColConflict/InlineTwoColConflictHelper.php
b/includes/InlineTwoColConflict/InlineTwoColConflictHelper.php
index 162ef29..2f902c5 100644
--- a/includes/InlineTwoColConflict/InlineTwoColConflictHelper.php
+++ b/includes/InlineTwoColConflict/InlineTwoColConflictHelper.php
@@ -550,8 +550,7 @@
return $text;
}
- return
- '<span class="mw-twocolconflict-diffchange-same-full">'
. $text . '</span>' .
+ return '<span class="mw-twocolconflict-diffchange-same-full">'
. $text . '</span>' .
'<span
class="mw-twocolconflict-diffchange-same-collapsed">' . $collapsedText .
'</span>';
}
--
To view, visit https://gerrit.wikimedia.org/r/400951
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ca53e4ad3e5f4ea3a3acaa50f8b71fd517944e0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader <tools.libraryupgra...@tools.wmflabs.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
