[MediaWiki-commits] [Gerrit] mediawiki...SpamBlacklist[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/368081 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
..
build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
Change-Id: I70cc261499286e5bc46ee96e9b9ea07f41c836a1
---
M SpamRegexBatch.php
M composer.json
M phpcs.xml
3 files changed, 12 insertions(+), 14 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/SpamRegexBatch.php b/SpamRegexBatch.php
index 8348da1..3fd6e2e 100644
--- a/SpamRegexBatch.php
+++ b/SpamRegexBatch.php
@@ -93,9 +93,9 @@
* @return array of regexes
*/
static function buildSafeRegexes( $lines, BaseBlacklist $blacklist,
$fileName=false ) {
- $lines = SpamRegexBatch::stripLines( $lines );
- $regexes = SpamRegexBatch::buildRegexes( $lines, $blacklist );
- if ( SpamRegexBatch::validateRegexes( $regexes ) ) {
+ $lines = self::stripLines( $lines );
+ $regexes = self::buildRegexes( $lines, $blacklist );
+ if ( self::validateRegexes( $regexes ) ) {
return $regexes;
} else {
// _Something_ broke... rebuild line-by-line; it'll be
@@ -104,7 +104,7 @@
if ( $fileName ) {
wfDebugLog( 'SpamBlacklist', "Spam blacklist
warning: bogus line in $fileName\n" );
}
- return SpamRegexBatch::buildRegexes( $lines,
$blacklist, 0 );
+ return self::buildRegexes( $lines, $blacklist, 0 );
}
}
@@ -116,7 +116,7 @@
* @return array of input lines which produce invalid input, or empty
array if no problems
*/
static function getBadLines( $lines, BaseBlacklist $blacklist ) {
- $lines = SpamRegexBatch::stripLines( $lines );
+ $lines = self::stripLines( $lines );
$badLines = [];
foreach ( $lines as $line ) {
@@ -126,16 +126,16 @@
}
}
- $regexes = SpamRegexBatch::buildRegexes( $lines, $blacklist );
- if ( SpamRegexBatch::validateRegexes( $regexes ) ) {
+ $regexes = self::buildRegexes( $lines, $blacklist );
+ if ( self::validateRegexes( $regexes ) ) {
// No other problems!
return $badLines;
}
// Something failed in the batch, so check them one by one.
foreach ( $lines as $line ) {
- $regexes = SpamRegexBatch::buildRegexes( [ $line ],
$blacklist );
- if ( !SpamRegexBatch::validateRegexes( $regexes ) ) {
+ $regexes = self::buildRegexes( [ $line ], $blacklist );
+ if ( !self::validateRegexes( $regexes ) ) {
$badLines[] = $line;
}
}
@@ -153,7 +153,7 @@
*/
static function regexesFromText( $source, BaseBlacklist $blacklist,
$fileName=false ) {
$lines = explode( "\n", $source );
- return SpamRegexBatch::buildSafeRegexes( $lines, $blacklist,
$fileName );
+ return self::buildSafeRegexes( $lines, $blacklist, $fileName );
}
/**
@@ -167,7 +167,7 @@
static function regexesFromMessage( $message, BaseBlacklist $blacklist
) {
$source = wfMessage( $message )->inContentLanguage();
if ( !$source->isDisabled() ) {
- return SpamRegexBatch::regexesFromText(
$source->plain(), $blacklist );
+ return self::regexesFromText( $source->plain(),
$blacklist );
} else {
return [];
}
diff --git a/composer.json b/composer.json
index 8599d9b..1c2721a 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"require-dev": {
"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/phpcs.xml b/phpcs.xml
index 19f91c8..8139da0 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -17,6 +17,4 @@
.
- vendor
- node_modules
--
To view, visit https://gerrit.wikimedia.org/r/368081
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I70cc261499286e5bc46ee96e9b9ea07f41c836a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SpamBlacklist
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
[MediaWiki-commits] [Gerrit] mediawiki...SpamBlacklist[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/368081 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
..
build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
Change-Id: I70cc261499286e5bc46ee96e9b9ea07f41c836a1
---
M SpamRegexBatch.php
M composer.json
M phpcs.xml
3 files changed, 12 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SpamBlacklist
refs/changes/81/368081/1
diff --git a/SpamRegexBatch.php b/SpamRegexBatch.php
index 8348da1..3fd6e2e 100644
--- a/SpamRegexBatch.php
+++ b/SpamRegexBatch.php
@@ -93,9 +93,9 @@
* @return array of regexes
*/
static function buildSafeRegexes( $lines, BaseBlacklist $blacklist,
$fileName=false ) {
- $lines = SpamRegexBatch::stripLines( $lines );
- $regexes = SpamRegexBatch::buildRegexes( $lines, $blacklist );
- if ( SpamRegexBatch::validateRegexes( $regexes ) ) {
+ $lines = self::stripLines( $lines );
+ $regexes = self::buildRegexes( $lines, $blacklist );
+ if ( self::validateRegexes( $regexes ) ) {
return $regexes;
} else {
// _Something_ broke... rebuild line-by-line; it'll be
@@ -104,7 +104,7 @@
if ( $fileName ) {
wfDebugLog( 'SpamBlacklist', "Spam blacklist
warning: bogus line in $fileName\n" );
}
- return SpamRegexBatch::buildRegexes( $lines,
$blacklist, 0 );
+ return self::buildRegexes( $lines, $blacklist, 0 );
}
}
@@ -116,7 +116,7 @@
* @return array of input lines which produce invalid input, or empty
array if no problems
*/
static function getBadLines( $lines, BaseBlacklist $blacklist ) {
- $lines = SpamRegexBatch::stripLines( $lines );
+ $lines = self::stripLines( $lines );
$badLines = [];
foreach ( $lines as $line ) {
@@ -126,16 +126,16 @@
}
}
- $regexes = SpamRegexBatch::buildRegexes( $lines, $blacklist );
- if ( SpamRegexBatch::validateRegexes( $regexes ) ) {
+ $regexes = self::buildRegexes( $lines, $blacklist );
+ if ( self::validateRegexes( $regexes ) ) {
// No other problems!
return $badLines;
}
// Something failed in the batch, so check them one by one.
foreach ( $lines as $line ) {
- $regexes = SpamRegexBatch::buildRegexes( [ $line ],
$blacklist );
- if ( !SpamRegexBatch::validateRegexes( $regexes ) ) {
+ $regexes = self::buildRegexes( [ $line ], $blacklist );
+ if ( !self::validateRegexes( $regexes ) ) {
$badLines[] = $line;
}
}
@@ -153,7 +153,7 @@
*/
static function regexesFromText( $source, BaseBlacklist $blacklist,
$fileName=false ) {
$lines = explode( "\n", $source );
- return SpamRegexBatch::buildSafeRegexes( $lines, $blacklist,
$fileName );
+ return self::buildSafeRegexes( $lines, $blacklist, $fileName );
}
/**
@@ -167,7 +167,7 @@
static function regexesFromMessage( $message, BaseBlacklist $blacklist
) {
$source = wfMessage( $message )->inContentLanguage();
if ( !$source->isDisabled() ) {
- return SpamRegexBatch::regexesFromText(
$source->plain(), $blacklist );
+ return self::regexesFromText( $source->plain(),
$blacklist );
} else {
return [];
}
diff --git a/composer.json b/composer.json
index 8599d9b..1c2721a 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"require-dev": {
"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/phpcs.xml b/phpcs.xml
index 19f91c8..8139da0 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -17,6 +17,4 @@
.
- vendor
- node_modules
--
To view, visit https://gerrit.wikimedia.org/r/368081
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I70cc261499286e5bc46ee96e9b9ea07f41c836a1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SpamBlacklist
Gerrit-Branch: master
