wikimedia/mediawiki-extensions-TitleBlacklist
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/TitleBlacklist synced 2024-11-30 16:54:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix and enable 1 PHPCS exclusion"

Browse source
This commit is contained in:
jenkins-bot 2022-04-28 16:00:36 +00:00 committed by Gerrit Code Review
parent feb57fd022 70754ecf37
commit 6e24f2d1b7
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.phpcs.xml
View file

@ -4,7 +4,6 @@
<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" /> <exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
<exclude name="MediaWiki.Commenting.PropertyDocumentation.MissingDocumentationProtected" /> <exclude name="MediaWiki.Commenting.PropertyDocumentation.MissingDocumentationProtected" />
<exclude name="MediaWiki.Commenting.PropertyDocumentation.MissingDocumentationPublic" /> <exclude name="MediaWiki.Commenting.PropertyDocumentation.MissingDocumentationPublic" />
<exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment"/>
</rule> </rule>
<rule ref="Squiz.Classes.ValidClassName.NotCamelCaps"> <rule ref="Squiz.Classes.ValidClassName.NotCamelCaps">
<exclude-pattern>Scribunto_LuaTitleBlacklistLibrary\.php</exclude-pattern> <exclude-pattern>Scribunto_LuaTitleBlacklistLibrary\.php</exclude-pattern>

3
includes/TitleBlacklist.php
View file

@ -125,7 +125,8 @@ class TitleBlacklist {
*/ */
private static function getBlacklistText( $source ) { private static function getBlacklistText( $source ) {
if ( !is_array( $source ) || count( $source ) <= 0 ) { if ( !is_array( $source ) || count( $source ) <= 0 ) {
return ''; // Return empty string in error case // Return empty string in error case
return '';
} }
if ( $source['type'] == 'message' ) { if ( $source['type'] == 'message' ) {

6
includes/TitleBlacklistEntry.php
View file

@ -172,7 +172,8 @@ class TitleBlacklistEntry {
* @return TitleBlacklistEntry|null * @return TitleBlacklistEntry|null
*/ */
public static function newFromString( $line, $source ) { public static function newFromString( $line, $source ) {
$raw = $line; // Keep line for raw data // Keep line for raw data
$raw = $line;
$options = []; $options = [];
// Strip comments // Strip comments
$line = preg_replace( "/^\\s*([^#]*)\\s*((.*)?)$/", "\\1", $line ); $line = preg_replace( "/^\\s*([^#]*)\\s*((.*)?)$/", "\\1", $line );
@ -187,7 +188,8 @@ class TitleBlacklistEntry {
return null; return null;
} }
$regex = trim( $pockets[1] ); $regex = trim( $pockets[1] );
$regex = str_replace( '_', ' ', $regex ); // We'll be matching against text form // We'll be matching against text form
$regex = str_replace( '_', ' ', $regex );
$opts_str = isset( $pockets[3] ) ? trim( $pockets[3] ) : ''; $opts_str = isset( $pockets[3] ) ? trim( $pockets[3] ) : '';
// Parse opts // Parse opts
$opts = preg_split( '/\s*\|\s*/', $opts_str ); $opts = preg_split( '/\s*\|\s*/', $opts_str );