jenkins-bot has submitted this change and it was merged.
Change subject: Add linters and "beautify"
......................................................................
Add linters and "beautify"
Change-Id: I997557e9f8fa38474cf3e2aa00e5897e43785f43
---
M .gitignore
A .jscsrc
M .jshintrc
M CleanChanges.php
M CleanChanges_body.php
M Filters.php
M Gruntfile.js
M composer.json
M package.json
A phpcs.xml
M resources/cleanchanges.js
M resources/cleanchanges.uls.js
12 files changed, 105 insertions(+), 30 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitignore b/.gitignore
index e7e3181..16ca8f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
.*.swp
.idea
node_modules/
+vendor/
+composer.lock
diff --git a/.jscsrc b/.jscsrc
new file mode 100644
index 0000000..9d22e3f
--- /dev/null
+++ b/.jscsrc
@@ -0,0 +1,3 @@
+{
+ "preset": "wikimedia"
+}
diff --git a/.jshintrc b/.jshintrc
index 0967ef4..31ce942 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -1 +1,20 @@
-{}
+{
+ "bitwise": true,
+ "curly": true,
+ "eqeqeq": true,
+ "forin": false,
+ "freeze": true,
+ "latedef": true,
+ "noarg": true,
+ "nonew": true,
+ "onevar": true,
+ "strict": true,
+ "undef": true,
+ "unused": true,
+ "browser": true,
+ "predef": [
+ "mediaWiki",
+ "jQuery",
+ "QUnit"
+ ]
+}
diff --git a/CleanChanges.php b/CleanChanges.php
index 54d3da8..fe520cd 100644
--- a/CleanChanges.php
+++ b/CleanChanges.php
@@ -4,7 +4,8 @@
// Keep i18n globals so mergeMessageFileList.php doesn't break
$wgMessagesDirs['CleanChanges'] = __DIR__ . '/i18n';
/* wfWarn(
- 'Deprecated PHP entry point used for CleanChanges extension.
Please use wfLoadExtension instead, ' .
+ 'Deprecated PHP entry point used for CleanChanges extension. ' .
+ 'Please use wfLoadExtension instead, ' .
'see https://www.mediawiki.org/wiki/Extension_registration for
more details.'
); */
return;
diff --git a/CleanChanges_body.php b/CleanChanges_body.php
index 0580661..311eb73 100644
--- a/CleanChanges_body.php
+++ b/CleanChanges_body.php
@@ -162,7 +162,9 @@
// Make user links
if ( $this->isDeleted( $rc, Revision::DELETED_USER ) ) {
- $rc->_user = ' <span class="history-deleted">' .
$this->msg( 'rev-deleted-user' )->escaped() . '</span>';
+ $rc->_user = ' <span class="history-deleted">' .
+ $this->msg( 'rev-deleted-user' )->escaped() .
+ '</span>';
$rc->_userInfo = '';
self::$userinfo += array();
} else {
@@ -284,7 +286,8 @@
$toggleLink = "javascript:toggleVisibilityE('$rci', '$rcm',
'$rcl', 'block')";
$tl =
Xml::tags( 'span', array( 'id' => $rcm ),
- Xml::tags( 'a', array( 'href' => $toggleLink ),
$this->arrow( $this->direction ? 'r' : 'l' ) ) ) .
+ Xml::tags( 'a', array( 'href' => $toggleLink ),
+ $this->arrow( $this->direction ? 'r' : 'l' ) )
) .
Xml::tags( 'span', array( 'id' => $rcl, 'style' => 'display:
none;' ),
Xml::tags( 'a', array( 'href' => $toggleLink ),
$this->downArrow() ) );
@@ -327,7 +330,7 @@
$items[] = $this->makeUserlinks( $userlinks );
$items[] = $block[0]->_watching;
- $lines = Xml::tags( 'div', null, implode( " {$this->dir}",
$items ) ) . "\n" ;
+ $lines = Xml::tags( 'div', null, implode( " {$this->dir}",
$items ) ) . "\n";
# Sub-entries
$lines .= Xml::tags( 'div',
@@ -348,11 +351,17 @@
*/
protected function arrow( $dir, $alt = '', $title = '' ) {
global $wgExtensionAssetsPath;
- $encUrl = htmlspecialchars( $wgExtensionAssetsPath .
'/CleanChanges/images/Arr_' . $dir . '.png' );
- $encAlt = htmlspecialchars( $alt );
- $encTitle = htmlspecialchars( $title );
- return "<img src=\"$encUrl\" width=\"12\" height=\"12\"
alt=\"$encAlt\" title=\"$encTitle\" />";
+ return Html::element(
+ 'img',
+ array(
+ 'src' =>
"$wgExtensionAssetsPath/CleanChanges/images/Arr_$dir.png",
+ 'width' => 12,
+ 'height' => 12,
+ 'alt' => $alt,
+ 'title' => $title,
+ )
+ );
}
/**
@@ -443,7 +452,7 @@
if ( is_int( $size ) ) {
$size = $this->wrapCharacterDifference( $size );
// FIXME: i18n: Hard coded parentheses and spaces.
- return $this->msg( 'cleanchanges-rcinfo-3'
)->rawParams( $diff, $hist, $size)->escaped();
+ return $this->msg( 'cleanchanges-rcinfo-3'
)->rawParams( $diff, $hist, $size )->escaped();
} else {
return $this->msg( 'cleanchanges-rcinfo-2'
)->rawParams( $diff, $hist )->escaped();
}
@@ -494,9 +503,13 @@
} elseif ( $this->isDeleted( $rc, LogPage::DELETED_COMMENT ) ) {
$priviledged = $this->getUser()->isAllowed(
'deleterevision' );
if ( $priviledged ) {
- return $action . ' <span
class="history-deleted">' . Linker::formatComment( $comment ) . '</span>';
+ return $action . ' <span
class="history-deleted">' .
+ Linker::formatComment( $comment ) .
+ '</span>';
}
- return $action . ' <span class="history-deleted">' .
$this->msg( 'rev-deleted-comment' )->escaped() . '</span>';
+ return $action . ' <span class="history-deleted">' .
+ $this->msg( 'rev-deleted-comment' )->escaped() .
+ '</span>';
}
return $action . Linker::commentBlock( $comment,
$rc->getTitle() );
}
diff --git a/Filters.php b/Filters.php
index bd3cdb5..18d8ae8 100644
--- a/Filters.php
+++ b/Filters.php
@@ -54,9 +54,13 @@
$opts->consumeValue( 'users' );
$default = $wgRequest->getVal( 'users', '' );
- $items['users'] = Xml::inputLabelSep( wfMessage(
'cleanchanges-users' )->text(), 'users',
- 'mw-users', 40, $default );
- return;
+ $items['users'] = Xml::inputLabelSep(
+ wfMessage( 'cleanchanges-users' )->text(),
+ 'users',
+ 'mw-users',
+ 40,
+ $default
+ );
}
/**
diff --git a/Gruntfile.js b/Gruntfile.js
index 3a1e89d..056ac0d 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,19 +1,36 @@
-/*!
- * Grunt file
- *
- * @package CleanChanges
- */
-
/*jshint node:true */
module.exports = function ( grunt ) {
'use strict';
+
+ grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+ grunt.loadNpmTasks( 'grunt-jscs' );
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-banana-checker' );
+
grunt.initConfig( {
+ jshint: {
+ options: {
+ jshintrc: true
+ },
+ all: [
+ '**/*.js',
+ '!node_modules/**'
+ ]
+ },
+ jscs: {
+ src: '<%= jshint.all %>'
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**'
+ ]
+ },
banana: {
- all: ['i18n/']
+ all: 'i18n'
}
} );
- grunt.registerTask( 'test', [ 'banana' ] );
+ grunt.registerTask( 'test', [ 'jshint', 'jscs', 'jsonlint', 'banana' ]
);
grunt.registerTask( 'default', 'test' );
};
diff --git a/composer.json b/composer.json
index beb266f..da3b947 100644
--- a/composer.json
+++ b/composer.json
@@ -4,8 +4,17 @@
"description": "More compact display of recent changes lists",
"homepage": "https://www.mediawiki.org/wiki/Extension:CleanChanges";,
"license": "GPL-2.0+",
-
"require": {
"composer/installers": "*"
+ },
+ "require-dev": {
+ "jakub-onderka/php-parallel-lint": "0.9.2",
+ "mediawiki/mediawiki-codesniffer": "0.5.1"
+ },
+ "scripts": {
+ "test": [
+ "parallel-lint . --exclude vendor",
+ "phpcs -p -s"
+ ]
}
}
diff --git a/package.json b/package.json
index 06c2805..611c585 100644
--- a/package.json
+++ b/package.json
@@ -1,14 +1,14 @@
{
- "name": "cleanchanges",
- "version": "0.0.0",
"private": true,
- "description": "Build tools for the CleanChanges extension.",
"scripts": {
"test": "grunt test"
},
"devDependencies": {
"grunt": "0.4.5",
"grunt-cli": "0.1.13",
+ "grunt-contrib-jshint": "0.11.3",
+ "grunt-jscs": "2.5.0",
+ "grunt-jsonlint": "1.0.7",
"grunt-banana-checker": "0.4.0"
}
}
diff --git a/phpcs.xml b/phpcs.xml
new file mode 100644
index 0000000..d81a292
--- /dev/null
+++ b/phpcs.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<ruleset>
+ <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki"/>
+ <file>.</file>
+ <arg name="extensions" value="php,php5,inc"/>
+ <arg name="encoding" value="utf8"/>
+ <exclude-pattern>vendor</exclude-pattern>
+</ruleset>
diff --git a/resources/cleanchanges.js b/resources/cleanchanges.js
index c11ec80..16816ee 100644
--- a/resources/cleanchanges.js
+++ b/resources/cleanchanges.js
@@ -1,4 +1,4 @@
-(function ( mw, $ ) {
+( function ( mw, $ ) {
'use strict';
window.toggleVisibilityE = function ( levelId, otherId, linkId, type ) {
diff --git a/resources/cleanchanges.uls.js b/resources/cleanchanges.uls.js
index 4567341..9e960cd 100644
--- a/resources/cleanchanges.uls.js
+++ b/resources/cleanchanges.uls.js
@@ -1,4 +1,4 @@
-/**
+/*!
*
* @author Niklas Laxström
* @license GPL-2.0+
@@ -15,7 +15,6 @@
$clear = $( '<span>' )
.text( 'X' )
.addClass( 'ext-cc-language-selector__clear' );
-
$trigger.hide().after(
$( '<span>' )
--
To view, visit https://gerrit.wikimedia.org/r/270250
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I997557e9f8fa38474cf3e2aa00e5897e43785f43
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CleanChanges
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
