[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

2017-08-10 Thread Legoktm (Code Review)
Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/371261 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0
..

build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

Change-Id: I0d9f7690cc26c208159ddd150d37794dbd74c5af
---
M composer.json
M includes/content/CollaborationHubContent.php
M includes/content/CollaborationListContent.php
3 files changed, 7 insertions(+), 7 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit 
refs/changes/61/371261/1

diff --git a/composer.json b/composer.json
index a71bb37..9939308 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/content/CollaborationHubContent.php 
b/includes/content/CollaborationHubContent.php
index cc40d37..08f4cc7 100644
--- a/includes/content/CollaborationHubContent.php
+++ b/includes/content/CollaborationHubContent.php
@@ -968,7 +968,7 @@
$out = '';
foreach ( $this->content as $item ) {
$out .= self::escapeForHumanEditable( $item['title'] );
-   if ( isset ( $item['image'] ) ) {
+   if ( isset( $item['image'] ) ) {
$out .= '|image='
. self::escapeForHumanEditable( 
$item['image'] );
}
@@ -1004,7 +1004,7 @@
}
$text = strtr( $text, [
"\n" => '\n',
-   '\n'=> 'n',
+   '\n' => 'n',
'|' => '{{!}}'
] );
return $text;
@@ -1018,7 +1018,7 @@
 */
public static function unescapeForHumanEditable( $text ) {
$text = strtr( $text, [
-   'n'=> "\\n",
+   'n' => "\\n",
'\n' => "\n",
'{{!}}' => '|'
] );
diff --git a/includes/content/CollaborationListContent.php 
b/includes/content/CollaborationListContent.php
index 2c7dad6..e194b96 100644
--- a/includes/content/CollaborationListContent.php
+++ b/includes/content/CollaborationListContent.php
@@ -415,7 +415,7 @@
$text .= '[[:' . 
$titleForItem->getPrefixedDBkey() . '|'
. wfEscapeWikiText( 
$titleText ) . ']]';
} else {
-   $text .=  wfEscapeWikiText( 
$item->title );
+   $text .= wfEscapeWikiText( 
$item->title );
}
$text .= "\n";
$text .= '' . "\n";
@@ -734,7 +734,7 @@
 
foreach ( $column->items as $item ) {
$out .= 
CollaborationHubContent::escapeForHumanEditable( $item->title );
-   if ( isset ( $item->notes ) ) {
+   if ( isset( $item->notes ) ) {
$out .= '|'
. 
CollaborationHubContent::escapeForHumanEditable( $item->notes );
} else {
@@ -824,7 +824,7 @@
$optionString = substr( $text, $split1 + $dividerLength, 
$optionLength );
$res['options'] = self::parseHumanOptions( $optionString );
 
-   if ( isset ( $res['options']->DISPLAYMODE ) ) {
+   if ( isset( $res['options']->DISPLAYMODE ) ) {
$res['displaymode'] = $res['options']->DISPLAYMODE;
unset( $res['options']->DISPLAYMODE );
} else {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d9f7690cc26c208159ddd150d37794dbd74c5af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 

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


[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

2017-08-10 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/371261 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0
..


build: Updating mediawiki/mediawiki-codesniffer to 0.11.0

Change-Id: I0d9f7690cc26c208159ddd150d37794dbd74c5af
---
M composer.json
M includes/content/CollaborationHubContent.php
M includes/content/CollaborationListContent.php
3 files changed, 7 insertions(+), 7 deletions(-)

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



diff --git a/composer.json b/composer.json
index a71bb37..9939308 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/content/CollaborationHubContent.php 
b/includes/content/CollaborationHubContent.php
index cc40d37..08f4cc7 100644
--- a/includes/content/CollaborationHubContent.php
+++ b/includes/content/CollaborationHubContent.php
@@ -968,7 +968,7 @@
$out = '';
foreach ( $this->content as $item ) {
$out .= self::escapeForHumanEditable( $item['title'] );
-   if ( isset ( $item['image'] ) ) {
+   if ( isset( $item['image'] ) ) {
$out .= '|image='
. self::escapeForHumanEditable( 
$item['image'] );
}
@@ -1004,7 +1004,7 @@
}
$text = strtr( $text, [
"\n" => '\n',
-   '\n'=> 'n',
+   '\n' => 'n',
'|' => '{{!}}'
] );
return $text;
@@ -1018,7 +1018,7 @@
 */
public static function unescapeForHumanEditable( $text ) {
$text = strtr( $text, [
-   'n'=> "\\n",
+   'n' => "\\n",
'\n' => "\n",
'{{!}}' => '|'
] );
diff --git a/includes/content/CollaborationListContent.php 
b/includes/content/CollaborationListContent.php
index 2c7dad6..e194b96 100644
--- a/includes/content/CollaborationListContent.php
+++ b/includes/content/CollaborationListContent.php
@@ -415,7 +415,7 @@
$text .= '[[:' . 
$titleForItem->getPrefixedDBkey() . '|'
. wfEscapeWikiText( 
$titleText ) . ']]';
} else {
-   $text .=  wfEscapeWikiText( 
$item->title );
+   $text .= wfEscapeWikiText( 
$item->title );
}
$text .= "\n";
$text .= '' . "\n";
@@ -734,7 +734,7 @@
 
foreach ( $column->items as $item ) {
$out .= 
CollaborationHubContent::escapeForHumanEditable( $item->title );
-   if ( isset ( $item->notes ) ) {
+   if ( isset( $item->notes ) ) {
$out .= '|'
. 
CollaborationHubContent::escapeForHumanEditable( $item->notes );
} else {
@@ -824,7 +824,7 @@
$optionString = substr( $text, $split1 + $dividerLength, 
$optionLength );
$res['options'] = self::parseHumanOptions( $optionString );
 
-   if ( isset ( $res['options']->DISPLAYMODE ) ) {
+   if ( isset( $res['options']->DISPLAYMODE ) ) {
$res['displaymode'] = $res['options']->DISPLAYMODE;
unset( $res['options']->DISPLAYMODE );
} else {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0d9f7690cc26c208159ddd150d37794dbd74c5af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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