[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

2017-12-29 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
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(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



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
-   '' .
+   return '' .
htmlspecialchars( self::trimStringToFullWord( 
$lines[0], $maxLength / 2, true ) ) .
'' .
( 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
-   '' 
. $text . '' .
+   return '' 
. $text . '' .
'' . $collapsedText . 
'';
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/400951
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4ca53e4ad3e5f4ea3a3acaa50f8b71fd517944e0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Andrew-WMDE 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: WMDE-Fisch 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

2017-12-29 Thread Libraryupgrader (Code Review) 
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
-   '' .
+   return '' .
htmlspecialchars( self::trimStringToFullWord( 
$lines[0], $maxLength / 2, true ) ) .
'' .
( 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
-   '' 
. $text . '' .
+   return '' 
. $text . '' .
'' . $collapsedText . 
'';
}
 

-- 
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 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits