jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/368014 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
Change-Id: I6bbe8421f04e404e26b21db04c54c671ed841a7f
---
M Hooks.php
M composer.json
M includes/Model/AbstractRevision.php
M includes/Model/UUID.php
M phpcs.xml
5 files changed, 10 insertions(+), 12 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/Hooks.php b/Hooks.php
index 262a676..309e27c 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -481,7 +481,7 @@
$rc = $block[0];
// quit if non-flow
- if ( !FlowHooks::isFlow( $rc ) ) {
+ if ( !self::isFlow( $rc ) ) {
return true;
}
@@ -540,7 +540,7 @@
private static function modifyChangesListLine( $changesList, &$data,
$rc, &$classes ) {
// quit if non-flow
- if ( !FlowHooks::isFlow( $rc ) ) {
+ if ( !self::isFlow( $rc ) ) {
return true;
}
@@ -1546,7 +1546,7 @@
public static function onArticleConfirmDelete( $article, $output,
&$reason ) {
$title = $article->getTitle();
if ( $title->inNamespace( NS_TOPIC ) ) {
- $output->addHTML( FlowHooks::getTopicDeletionError(
$title ) );
+ $output->addHTML( self::getTopicDeletionError( $title )
);
return false;
}
@@ -1566,7 +1566,7 @@
public static function onArticleDelete( WikiPage &$article, User
&$user, &$reason, &$error ) {
$title = $article->getTitle();
if ( $title->inNamespace( NS_TOPIC ) ) {
- $error = FlowHooks::getTopicDeletionError( $title );
+ $error = self::getTopicDeletionError( $title );
return false;
}
diff --git a/composer.json b/composer.json
index 216884b..d8f2b6a 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
"symfony/css-selector": "~2.5",
"jakub-onderka/php-parallel-lint": "0.9.2",
"jakub-onderka/php-console-highlighter": "0.3.2",
- "mediawiki/mediawiki-codesniffer": "0.10.0"
+ "mediawiki/mediawiki-codesniffer": "0.10.1"
},
"scripts": {
"fix": "phpcbf",
diff --git a/includes/Model/AbstractRevision.php
b/includes/Model/AbstractRevision.php
index 990a226..8a44ad2 100644
--- a/includes/Model/AbstractRevision.php
+++ b/includes/Model/AbstractRevision.php
@@ -186,8 +186,8 @@
// BC: 'suppress' used to be called 'censor' & 'lock' was
'close'
$bc = [
- 'censor' => AbstractRevision::MODERATED_SUPPRESSED,
- 'close' => AbstractRevision::MODERATED_LOCKED,
+ 'censor' => self::MODERATED_SUPPRESSED,
+ 'close' => self::MODERATED_LOCKED,
];
$obj->moderationState = str_replace( array_keys( $bc ),
array_values( $bc ), $obj->moderationState );
diff --git a/includes/Model/UUID.php b/includes/Model/UUID.php
index 32c2fde..f4bef47 100644
--- a/includes/Model/UUID.php
+++ b/includes/Model/UUID.php
@@ -349,7 +349,7 @@
if ( $value instanceof UUIDBlob ) {
// database encoded binary value
if ( $format === 'alphadecimal' ) {
- $array[$key] = UUID::create(
$value->fetch() )->getAlphadecimal();
+ $array[$key] = self::create(
$value->fetch() )->getAlphadecimal();
}
} elseif ( $value instanceof UUID ) {
if ( $format === 'binary' ) {
@@ -361,13 +361,13 @@
// things that look like uuids
$len = strlen( $value );
if ( $format === 'alphadecimal' && $len ===
self::BIN_LEN ) {
- $array[$key] = UUID::create( $value
)->getAlphadecimal();
+ $array[$key] = self::create( $value
)->getAlphadecimal();
} elseif ( $format === 'binary' && (
( $len >= self::MIN_ALNUM_LEN && $len
<= self::ALNUM_LEN )
||
$len === self::HEX_LEN
) ) {
- $array[$key] = UUID::create( $value
)->getBinary();
+ $array[$key] = self::create( $value
)->getBinary();
}
}
}
diff --git a/phpcs.xml b/phpcs.xml
index 3845b56..1d8dc7a 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -17,6 +17,4 @@
<arg name="extensions" value="php,php5,inc"/>
<arg name="encoding" value="UTF-8"/>
<exclude-pattern>handlebars</exclude-pattern>
- <exclude-pattern>vendor</exclude-pattern>
- <exclude-pattern>node_modules</exclude-pattern>
</ruleset>
--
To view, visit https://gerrit.wikimedia.org/r/368014
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6bbe8421f04e404e26b21db04c54c671ed841a7f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
