jenkins-bot has submitted this change and it was merged.
Change subject: Add php code sniffer
......................................................................
Add php code sniffer
Change-Id: I7a1f9f1aa29fec7efa563dcb1e0e710fb4c803d8
---
M EditUser.alias.php
M EditUser.php
M EditUserPreferencesForm.php
M EditUser_body.php
M composer.json
A phpcs.xml
6 files changed, 26 insertions(+), 14 deletions(-)
Approvals:
Paladox: Looks good to me, approved
jenkins-bot: Verified
diff --git a/EditUser.alias.php b/EditUser.alias.php
index 9c3e77f..dc7ce2e 100644
--- a/EditUser.alias.php
+++ b/EditUser.alias.php
@@ -5,6 +5,7 @@
* @file
* @ingroup Extensions
*/
+// @codingStandardsIgnoreFile
$specialPageAliases = array();
diff --git a/EditUser.php b/EditUser.php
index d789a62..090c11e 100644
--- a/EditUser.php
+++ b/EditUser.php
@@ -3,9 +3,9 @@
* EditUser extension by Ryan Schmidt
*/
-if(!defined('MEDIAWIKI')) {
+if ( !defined( 'MEDIAWIKI' ) ) {
echo "This file is an extension to the MediaWiki software and is not a
valid access point";
- die(1);
+ die( 1 );
}
$wgExtensionCredits['specialpage'][] = array(
diff --git a/EditUserPreferencesForm.php b/EditUserPreferencesForm.php
index ec29978..d5b6ee0 100644
--- a/EditUserPreferencesForm.php
+++ b/EditUserPreferencesForm.php
@@ -8,9 +8,11 @@
function getButtons() {
$html = HTMLForm::getButtons();
- $url = SpecialPage::getTitleFor( 'EditUser' )->getFullURL(
array( 'reset' => 1, 'username' => $this->getModifiedUser()->getName() ) );
+ $url = SpecialPage::getTitleFor( 'EditUser' )->getFullURL(
+ array( 'reset' => 1, 'username' =>
$this->getModifiedUser()->getName() )
+ );
- $html .= "\n" . Xml::element('a', array( 'href'=> $url ),
wfMsgHtml( 'restoreprefs' ) );
+ $html .= "\n" . Xml::element( 'a', array( 'href'=> $url ),
wfMsgHtml( 'restoreprefs' ) );
$html = Xml::tags( 'div', array( 'class' => 'mw-prefs-buttons'
), $html );
diff --git a/EditUser_body.php b/EditUser_body.php
index 6b0bcd4..d7f227f 100644
--- a/EditUser_body.php
+++ b/EditUser_body.php
@@ -3,14 +3,14 @@
class EditUser extends SpecialPage {
function __construct() {
- parent::__construct('EditUser', 'edituser');
+ parent::__construct( 'EditUser', 'edituser' );
}
function execute( $par ) {
$user = $this->getUser();
$out = $this->getOutput();
- if( !$user->isAllowed( 'edituser' ) ) {
+ if ( !$user->isAllowed( 'edituser' ) ) {
$out->permissionRequired( 'edituser' );
return false;
}
@@ -19,18 +19,18 @@
$request = $this->getRequest();
$this->target = ( isset( $par ) ) ? $par : $request->getText(
'username', '' );
- if( $this->target === '' ) {
+ if ( $this->target === '' ) {
$out->addHtml( $this->makeSearchForm() );
return;
}
$targetuser = User::NewFromName( $this->target );
- if( $targetuser->getID() == 0 ) {
+ if ( $targetuser->getID() == 0 ) {
$out->addWikiMsg( 'edituser-nouser', htmlspecialchars(
$this->target ) );
return;
}
$this->targetuser = $targetuser;
#Allow editing self via this interface
- if( $targetuser->isAllowed( 'edituser-exempt' ) &&
$targetuser->getName() != $user->getName() ) {
+ if ( $targetuser->isAllowed( 'edituser-exempt' ) &&
$targetuser->getName() != $user->getName() ) {
$out->addWikiMsg( 'edituser-exempt',
$targetuser->getName() );
return;
}
@@ -43,7 +43,7 @@
$out->readOnlyPage();
return;
}
-
+
if ( $request->getCheck( 'reset' ) ) {
$this->showResetForm();
return;
@@ -61,7 +61,7 @@
'savedprefs'
);
}
-
+
if ( $request->getCheck( 'eauth' ) ) {
$out->wrapWikiMsg( "<div class='error' style='clear:
both;'>\n$1\n</div>",
'eauthentsent', $this->target );
@@ -82,7 +82,7 @@
$htmlForm->setSubmitText( wfMsg( 'restoreprefs' ) );
$htmlForm->addHiddenField( 'username', $this->target );
- $htmlForm->addHiddenField( 'reset' , '1' );
+ $htmlForm->addHiddenField( 'reset', '1' );
$htmlForm->setSubmitCallback( array( $this, 'submitReset' ) );
$htmlForm->suppressReset();
diff --git a/composer.json b/composer.json
index 3d55a97..534f8fb 100644
--- a/composer.json
+++ b/composer.json
@@ -1,10 +1,12 @@
{
"require-dev": {
- "jakub-onderka/php-parallel-lint": "0.9.*"
+ "jakub-onderka/php-parallel-lint": "0.9.*",
+ "mediawiki/mediawiki-codesniffer": "0.3.0"
},
"scripts": {
"test": [
- "parallel-lint . --exclude vendor"
+ "parallel-lint . --exclude vendor",
+ "phpcs -p"
]
}
}
diff --git a/phpcs.xml b/phpcs.xml
new file mode 100644
index 0000000..cb19440
--- /dev/null
+++ b/phpcs.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<ruleset>
+ <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki"/>
+ <file>.</file>
+ <arg name="extensions" value="php"/>
+ <exclude-pattern>vendor</exclude-pattern>
+</ruleset>
--
To view, visit https://gerrit.wikimedia.org/r/233121
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7a1f9f1aa29fec7efa563dcb1e0e710fb4c803d8
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/EditUser
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
