jenkins-bot has submitted this change and it was merged.
Change subject: Fix test entry points
......................................................................
Fix test entry points
* Remove PHPUnit dependency from composer. Extensions tests are run from
MediaWiki core testsuite 'extensions'
* Fix PHP CodeSniffer errors (whitespaces, lines too long)
* Syntax error in i18n/got.json
* Fix autoloader
* Rename class Patroller -> SpecialPatroller
Change-Id: Ibd39c164bce41501bd589b4543d5e1e9a9a03d59
---
M Patroller.php
M SpecialPatroller.php
M composer.json
M i18n/got.json
4 files changed, 48 insertions(+), 19 deletions(-)
Approvals:
Cblair91: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/Patroller.php b/Patroller.php
index 5af7592..0c09192 100644
--- a/Patroller.php
+++ b/Patroller.php
@@ -32,11 +32,12 @@
'licence-name' => 'GPL-2.0'
);
-$dir = dirname(__FILE__) . '/';
+$dir = dirname( __FILE__ ) . '/';
# Register hooks
$wgAutoloadClasses['PatrollerHooks'] = $dir .
'Patroller.hooks.php';
-$wgAutoloadClasses['SpecialPatroller'] = $dir .
'SpecialPatroller.php';
+$wgAutoloadClasses['Patroller'] = $dir
. 'SpecialPatroller.php';
+
$wgHooks['LoadExtensionSchemaUpdates'][] =
'PatrollerHooks::onLoadExtensionSchemaUpdates';
$wgSpecialPages['Patrol'] =
'SpecialPatroller';
diff --git a/SpecialPatroller.php b/SpecialPatroller.php
index 9098a78..a0173f4 100644
--- a/SpecialPatroller.php
+++ b/SpecialPatroller.php
@@ -10,7 +10,7 @@
* @link: https://mediawiki.org/wiki/Extension:Patroller
*/
-class Patroller extends SpecialPage {
+class SpecialPatroller extends SpecialPage {
/**
* Constructor
*
@@ -72,7 +72,8 @@
}
}
- # If a token was passed, but the check box value was not, then
the user wants to pause or stop patrolling
+ # If a token was passed, but the check box value was not, then
the user
+ # wants to pause or stop patrolling
if ( $wgRequest->getCheck( 'wpToken' ) &&
!$wgRequest->getCheck( 'wpAnother' ) ) {
$skin =& $wgUser->getSkin();
$self = SpecialPage::getTitleFor( 'Patrol' );
@@ -115,7 +116,11 @@
$edit->counter = 1;
$edit->mAttribs['rc_patrolled'] = 1;
$list = ChangesList::newFromUser( $wgUser );
- $wgOut->addHTML( $list->beginRecentChangesList() .
$list->recentChangesLine( $edit ) . $list->endRecentChangesList() );
+ $wgOut->addHTML(
+ $list->beginRecentChangesList()
+ . $list->recentChangesLine( $edit )
+ . $list->endRecentChangesList()
+ );
}
/**
@@ -126,7 +131,11 @@
* @return void
*/
private function showDiff( &$edit ) {
- $diff = new DifferenceEngine( $edit->getTitle(),
$edit->mAttribs['rc_last_oldid'], $edit->mAttribs['rc_this_oldid'] );
+ $diff = new DifferenceEngine(
+ $edit->getTitle(),
+ $edit->mAttribs['rc_last_oldid'],
+ $edit->mAttribs['rc_this_oldid']
+ );
$diff->showDiff( '', '' );
}
@@ -140,17 +149,25 @@
private function showControls( &$edit ) {
global $wgUser, $wgOut;
$self = SpecialPage::getTitleFor( 'Patrol' );
- $form = Html::openElement( 'form', array( 'method' => 'post',
'action' => $self->getLocalUrl() ) );
+ $form = Html::openElement( 'form', array(
+ 'method' => 'post', 'action' => $self->getLocalUrl() )
+ );
$form .= Html::openElement( 'table' );
$form .= Html::openElement( 'tr' );
$form .= Html::openElement( 'td', array( 'align' => 'right' ) );
- $form .= Html::submitButton( wfMessage( 'patrol-endorse'
)->escaped(), array( 'name' => 'wpPatrolEndorse' ) );
+ $form .= Html::submitButton(
+ wfMessage( 'patrol-endorse' )->escaped(),
+ array( 'name' => 'wpPatrolEndorse' )
+ );
$form .= Html::closeElement( 'td' );
$form .= Html::openElement( 'td' ) . Html::closeElement( 'td' );
$form .= Html::closeElement( 'tr' );
$form .= Html::openElement( 'tr' );
$form .= Html::openElement( 'td', array( 'align' => 'right' ) );
- $form .= Html::submitButton( wfMessage( 'patrol-revert'
)->escaped(), array( 'name' => 'wpPatrolRevert' ) );
+ $form .= Html::submitButton(
+ wfMessage( 'patrol-revert' )->escaped(),
+ array( 'name' => 'wpPatrolRevert' )
+ );
$form .= Html::closeElement( 'td' );
$form .= Html::openElement( 'td' );
$form .= Html::label( wfMessage( 'patrol-revert-reason'
)->escaped(), 'reason' ) . ' ';
@@ -159,7 +176,10 @@
$form .= Html::closeElement( 'tr' );
$form .= Html::openElement( 'tr' );
$form .= Html::openElement( 'td', array( 'align' => 'right' ) );
- $form .= Html::submitButton( wfMessage( 'patrol-skip'
)->escaped(), array( 'name' => 'wpPatrolSkip' ) );
+ $form .= Html::submitButton(
+ wfMessage( 'patrol-skip' )->escaped(),
+ array( 'name' => 'wpPatrolSkip' )
+ );
$form .= Html::closeElement( 'td' );
$form .= Html::closeElement( 'tr' );
$form .= Html::openElement( 'tr' );
@@ -226,7 +246,8 @@
}
/**
- * Assign the patrolling of a particular change, so other users don't
pull it up, duplicating effort
+ * Assign the patrolling of a particular change, so other users don't
pull
+ * it up, duplicating effort
*
* @access private
* @param string RecentChange item to assign
@@ -263,7 +284,11 @@
*/
private function pruneAssignments() {
$dbw = wfGetDB( DB_MASTER );
- $dbw->delete( 'patrollers', array( 'ptr_timestamp < ' .
$dbw->timestamp( time() - 120 ) ), 'Patroller::pruneAssignments' );
+ $dbw->delete(
+ 'patrollers',
+ array( 'ptr_timestamp < ' . $dbw->timestamp( time() -
120 ) ),
+ 'Patroller::pruneAssignments'
+ );
}
/**
@@ -286,7 +311,12 @@
$old = Revision::newFromId(
$edit->mAttribs['rc_last_oldid'] );
# Be certain we're not overwriting a more recent change
# If we would, ignore it, and silently consider this
change patrolled
- $latest = (int)$dbw->selectField( 'page',
'page_latest', array( 'page_id' => $title->getArticleID() ), __METHOD__ );
+ $latest = (int)$dbw->selectField(
+ 'page',
+ 'page_latest',
+ array( 'page_id' => $title->getArticleID() ),
+ __METHOD__
+ );
if ( $edit->mAttribs['rc_this_oldid'] == $latest ) {
# Revert the edit; keep the reversion itself
out of recent changes
wfDebugLog( 'patroller', 'Reverting "' .
$title->getPrefixedText() . '" to r' . $old->getId() );
@@ -346,4 +376,4 @@
$custom = $request->getText( 'wpPatrolRevertReason' );
return trim( $custom ) != '' ? $custom : $request->getText(
'wpPatrolRevertReasonCommon' );
}
-}
\ No newline at end of file
+}
diff --git a/composer.json b/composer.json
index 4ef4e8a..a02f0b1 100644
--- a/composer.json
+++ b/composer.json
@@ -16,14 +16,12 @@
],
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9",
- "mediawiki/mediawiki-codesniffer": "0.3.0",
- "phpunit/phpunit": "4.6.*"
+ "mediawiki/mediawiki-codesniffer": "0.3.0"
},
"scripts": {
"test": [
"parallel-lint . --exclude vendor",
- "phpunit $PHPUNIT_ARGS",
"phpcs -p"
]
}
-}
\ No newline at end of file
+}
diff --git a/i18n/got.json b/i18n/got.json
index 3ece1dd..d1b5dfd 100644
--- a/i18n/got.json
+++ b/i18n/got.json
@@ -1,7 +1,7 @@
{
"@metadata": {
"authors": [
- "Crazymadlover"",
+ "Crazymadlover",
"Jocke Pirat"
]
},
--
To view, visit https://gerrit.wikimedia.org/r/239849
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd39c164bce41501bd589b4543d5e1e9a9a03d59
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Patroller
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Cblair91 <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
