jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/396599 )
Change subject: Rename classes to match file names
..
Rename classes to match file names
Change-Id: I39c60b2d059d1cb2c1c0d3a4206232d961536697
---
M .phpcs.xml
R CheckUserHooks.php
M api/ApiQueryCheckUser.php
M extension.json
M maintenance/purgeOldData.php
M specials/SpecialCheckUser.php
R tests/phpunit/SpecialCheckUserTest.php
7 files changed, 20 insertions(+), 19 deletions(-)
Approvals:
Huji: Looks good to me, approved
jenkins-bot: Verified
Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
diff --git a/.phpcs.xml b/.phpcs.xml
index 68a2c86..124ea83 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -7,8 +7,9 @@
-
-
+
+
+ */maintenance/*
CheckUser\.alias\.php
diff --git a/CheckUser.hooks.php b/CheckUserHooks.php
similarity index 100%
rename from CheckUser.hooks.php
rename to CheckUserHooks.php
diff --git a/api/ApiQueryCheckUser.php b/api/ApiQueryCheckUser.php
index de9d53f..8d3e0e7 100644
--- a/api/ApiQueryCheckUser.php
+++ b/api/ApiQueryCheckUser.php
@@ -90,7 +90,7 @@
$resultIPs[] = $data;
}
- CheckUser::addLogEntry( 'userips', 'user',
$target, $reason, $user_id );
+ SpecialCheckUser::addLogEntry( 'userips',
'user', $target, $reason, $user_id );
$result->addValue( [
'query', $this->getModuleName() ],
'userips', $resultIPs );
$result->addIndexedTagName( [
@@ -99,7 +99,7 @@
case 'edits':
if ( IP::isIPAddress( $target ) ) {
- $cond = CheckUser::getIpConds( $db,
$target, isset( $xff ) );
+ $cond = SpecialCheckUser::getIpConds(
$db, $target, isset( $xff ) );
if ( !$cond ) {
if ( is_callable( [ $this,
'dieWithError' ] ) ) {
$this->dieWithError(
'apierror-badip', 'invalidip' );
@@ -162,7 +162,7 @@
$edits[] = $edit;
}
- CheckUser::addLogEntry( $log_type[0],
$log_type[1],
+ SpecialCheckUser::addLogEntry( $log_type[0],
$log_type[1],
$target, $reason, isset( $user_id ) ?
$user_id : '0' );
$result->addValue( [
'query', $this->getModuleName() ],
'edits', $edits );
@@ -172,7 +172,7 @@
case 'ipusers':
if ( IP::isIPAddress( $target ) ) {
- $cond = CheckUser::getIpConds( $db,
$target, isset( $xff ) );
+ $cond = SpecialCheckUser::getIpConds(
$db, $target, isset( $xff ) );
$this->addWhere( $cond );
$log_type = 'ipusers';
if ( isset( $xff ) ) {
@@ -224,7 +224,7 @@
$resultUsers[] = $userData;
}
- CheckUser::addLogEntry( $log_type, 'ip',
$target, $reason );
+ SpecialCheckUser::addLogEntry( $log_type, 'ip',
$target, $reason );
$result->addValue( [
'query', $this->getModuleName() ],
'ipusers', $resultUsers );
$result->addIndexedTagName( [
diff --git a/extension.json b/extension.json
index 4ecf9ce..efc162a 100644
--- a/extension.json
+++ b/extension.json
@@ -105,13 +105,13 @@
"checkuser-log"
],
"SpecialPages": {
- "CheckUser": "CheckUser",
+ "CheckUser": "SpecialCheckUser",
"CheckUserLog": "SpecialCheckUserLog"
},
"AutoloadClasses": {
- "CheckUser": "specials/SpecialCheckUser.php",
- "CheckUserHooks": "CheckUser.hooks.php",
+ "CheckUserHooks": "CheckUserHooks.php",
"CheckUserLogPager": "CheckUserLogPager.php",
+ "SpecialCheckUser": "specials/SpecialCheckUser.php",
"SpecialCheckUserLog": "specials/SpecialCheckUserLog.php",
"CheckUserEncryptedData": "CheckUserEncryptedData.php",
"ApiQueryCheckUser": "api/ApiQueryCheckUser.php",
diff --git a/mainte
