jenkins-bot has submitted this change and it was merged.
Change subject: Add PHP linting with mediawiki-codesniffer
......................................................................
Add PHP linting with mediawiki-codesniffer
* Add MediaWiki CodeSniffer to composer.json
* Disable PHPCS rules currently failing rules in phpcs.xml
* Fix CodeSniffer errors automatically using phpcs diff report [1]
[1] The following errors were automatically fixed:
- MediaWiki.Usage.DirUsage.FunctionFound
- MediaWiki.WhiteSpace.SpaceAfterControlStructure.Incorrect
- MediaWiki.WhiteSpace.SpaceyParenthesis.SpaceBeforeOpeningParenthesis
- PSR2.ControlStructures.ElseIfDeclaration.NotAllowed
- PSR2.Methods.MethodDeclaration.AbstractAfterVisibility
- PSR2.Namespaces.NamespaceDeclaration.BlankLineAfter
- PSR2.Namespaces.UseDeclaration.MultipleDeclarations
- PSR2.Namespaces.UseDeclaration.SpaceAfterLastUse
- PSR2.Namespaces.UseDeclaration.SpaceAfterUse
- Squiz.WhiteSpace.LanguageConstructSpacing.Incorrect
- Squiz.WhiteSpace.ScopeClosingBrace.ContentBefore
- Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLine)
Bug: T125554
Change-Id: I90b9fabbe2630ecb9d62d185a5c0b30147d378fe
---
M GWToolset.hooks.php
M GWToolset.i18n.php
M GWToolset.php
M composer.json
M includes/Adapters/Php/MappingPhpAdapter.php
M includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
M includes/Adapters/Php/MetadataPhpAdapter.php
M includes/Forms/MetadataDetectForm.php
M includes/Forms/MetadataMappingForm.php
M includes/Forms/PreviewForm.php
M includes/GWTException.php
M includes/Handlers/Forms/FormHandler.php
M includes/Handlers/Forms/MetadataDetectHandler.php
M includes/Handlers/Forms/MetadataMappingHandler.php
M includes/Handlers/UploadHandler.php
M includes/Handlers/Xml/XmlDetectHandler.php
M includes/Handlers/Xml/XmlHandler.php
M includes/Handlers/Xml/XmlMappingHandler.php
M includes/Helpers/FileChecks.php
M includes/Helpers/GWTFileBackend.php
M includes/Helpers/WikiChecks.php
M includes/Jobs/GWTFileBackendCleanupJob.php
M includes/Jobs/UploadMediafileJob.php
M includes/Jobs/UploadMetadataJob.php
M includes/Models/Mapping.php
M includes/Models/MediawikiTemplate.php
M includes/Models/Metadata.php
M includes/Models/ModelInterface.php
M includes/Php/File.php
M includes/Specials/SpecialGWToolset.php
M includes/Utils.php
M maintenance/cleanupGWTFileBackend.php
A phpcs.xml
33 files changed, 280 insertions(+), 240 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/GWToolset.hooks.php b/GWToolset.hooks.php
index 19e43f3..79fb169 100644
--- a/GWToolset.hooks.php
+++ b/GWToolset.hooks.php
@@ -17,4 +17,4 @@
return true;
}
-}
\ No newline at end of file
+}
diff --git a/GWToolset.i18n.php b/GWToolset.i18n.php
index f600888..b33d226 100644
--- a/GWToolset.i18n.php
+++ b/GWToolset.i18n.php
@@ -15,7 +15,7 @@
function wfJsonI18nShimee273fa76ab14105( $cache, $code, &$cachedData ) {
$codeSequence = array_merge( array( $code ),
$cachedData['fallbackSequence'] );
foreach ( $codeSequence as $csCode ) {
- $fileName = dirname( __FILE__ ) . "/i18n/$csCode.json";
+ $fileName = __DIR__ . "/i18n/$csCode.json";
if ( is_readable( $fileName ) ) {
$data = FormatJson::decode( file_get_contents(
$fileName ), true );
foreach ( array_keys( $data ) as $key ) {
diff --git a/GWToolset.php b/GWToolset.php
index 478aef0..cfbacf0 100644
--- a/GWToolset.php
+++ b/GWToolset.php
@@ -8,6 +8,7 @@
*/
namespace GWToolset;
+
use GWToolset\Constants;
if ( !defined( 'MEDIAWIKI' ) ) {
diff --git a/composer.json b/composer.json
index 1c63f9e..083767b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,10 +1,12 @@
{
"require-dev": {
- "jakub-onderka/php-parallel-lint": "0.9.2"
+ "jakub-onderka/php-parallel-lint": "0.9.2",
+ "mediawiki/mediawiki-codesniffer": "0.5.1"
},
"scripts": {
"test": [
- "parallel-lint . --exclude vendor"
+ "parallel-lint . --exclude vendor",
+ "phpcs -p -s"
]
}
}
diff --git a/includes/Adapters/Php/MappingPhpAdapter.php
b/includes/Adapters/Php/MappingPhpAdapter.php
index f020d66..87bced5 100644
--- a/includes/Adapters/Php/MappingPhpAdapter.php
+++ b/includes/Adapters/Php/MappingPhpAdapter.php
@@ -8,10 +8,11 @@
*/
namespace GWToolset\Adapters\Php;
-use GWToolset\Adapters\DataAdapterInterface,
- GWToolset\GWTException,
- Title,
- WikiPage;
+
+use GWToolset\Adapters\DataAdapterInterface;
+use GWToolset\GWTException;
+use Title;
+use WikiPage;
class MappingPhpAdapter implements DataAdapterInterface {
diff --git a/includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
b/includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
index 2cddb5f..241a225 100644
--- a/includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
+++ b/includes/Adapters/Php/MediawikiTemplatePhpAdapter.php
@@ -8,14 +8,15 @@
*/
namespace GWToolset\Adapters\Php;
-use ApiMain,
- DerivativeRequest,
- GWToolset\Adapters\DataAdapterInterface,
- GWToolset\Config,
- GWToolset\GWTException,
- GWToolset\Utils,
- Linker,
- Title;
+
+use ApiMain;
+use DerivativeRequest;
+use GWToolset\Adapters\DataAdapterInterface;
+use GWToolset\Config;
+use GWToolset\GWTException;
+use GWToolset\Utils;
+use Linker;
+use Title;
class MediawikiTemplatePhpAdapter implements DataAdapterInterface {
@@ -66,7 +67,7 @@
if ( !empty( $template_data ) ) {
$result['mediawiki_template_json'] = $template_data;
- } else if (
+ } elseif (
in_array(
$options['mediawiki_template_name'],
Config::$mediawiki_templates
diff --git a/includes/Adapters/Php/MetadataPhpAdapter.php
b/includes/Adapters/Php/MetadataPhpAdapter.php
index 857a4df..74c52cd 100644
--- a/includes/Adapters/Php/MetadataPhpAdapter.php
+++ b/includes/Adapters/Php/MetadataPhpAdapter.php
@@ -8,6 +8,7 @@
*/
namespace GWToolset\Adapters\Php;
+
use GWToolset\Adapters\DataAdapterInterface;
class MetadataPhpAdapter implements DataAdapterInterface {
diff --git a/includes/Forms/MetadataDetectForm.php
b/includes/Forms/MetadataDetectForm.php
index 8dc19fc..6004196 100644
--- a/includes/Forms/MetadataDetectForm.php
+++ b/includes/Forms/MetadataDetectForm.php
@@ -7,16 +7,17 @@
* @license GNU General Public License 3.0 http://www.gnu.org/licenses/gpl.html
*/
namespace GWToolset\Forms;
-use Html,
- GWToolset\Adapters\Php\MediawikiTemplatePhpAdapter,
- GWToolset\Config,
- GWToolset\Constants,
- GWToolset\Utils,
- GWToolset\Helpers\FileChecks,
- GWToolset\Models\MediawikiTemplate,
- Linker,
- SpecialPage,
- Title;
+
+use Html;
+use GWToolset\Adapters\Php\MediawikiTemplatePhpAdapter;
+use GWToolset\Config;
+use GWToolset\Constants;
+use GWToolset\Utils;
+use GWToolset\Helpers\FileChecks;
+use GWToolset\Models\MediawikiTemplate;
+use Linker;
+use SpecialPage;
+use Title;
class MetadataDetectForm {
@@ -45,7 +46,7 @@
$result .= Html::openElement( 'ul', array( 'id' =>
'gwtoolset-whitelist' ) );
- foreach( $wgCopyUploadsDomains as $domain ) {
+ foreach ( $wgCopyUploadsDomains as $domain ) {
$result .= Html::rawElement(
'li',
array(),
diff --git a/includes/Forms/MetadataMappingForm.php
b/includes/Forms/MetadataMappingForm.php
index 7f19401..dba42b9 100644
--- a/includes/Forms/MetadataMappingForm.php
+++ b/includes/Forms/MetadataMappingForm.php
@@ -7,12 +7,13 @@
* @license GNU General Public License 3.0 http://www.gnu.org/licenses/gpl.html
*/
namespace GWToolset\Forms;
-use Html,
- GWToolset\Config,
- GWToolset\Utils,
- GWToolset\Handlers\Forms\FormHandler,
- Linker,
- Title;
+
+use Html;
+use GWToolset\Config;
+use GWToolset\Utils;
+use GWToolset\Handlers\Forms\FormHandler;
+use Linker;
+use Title;
class MetadataMappingForm {
@@ -252,7 +253,6 @@
)
) .
-
Html::rawElement(
'input',
array(
@@ -345,7 +345,7 @@
// creator template
Html::rawElement(
'h3',
- array( 'style' => 'margin-top:1em;'),
+ array( 'style' => 'margin-top:1em;' ),
wfMessage( 'gwtoolset-wrap-creator-heading'
)->escaped()
) .
@@ -392,7 +392,7 @@
// institution template
Html::rawElement(
'h3',
- array( 'style' => 'margin-top:1em;'),
+ array( 'style' => 'margin-top:1em;' ),
wfMessage( 'gwtoolset-wrap-institution-heading'
)->escaped()
) .
@@ -419,7 +419,7 @@
// language template
Html::rawElement(
'h3',
- array( 'style' => 'margin-top:1em;'),
+ array( 'style' => 'margin-top:1em;' ),
wfMessage( 'gwtoolset-wrap-language-heading'
)->escaped()
) .
@@ -446,7 +446,7 @@
// permission/license template
Html::rawElement(
'h3',
- array( 'style' => 'margin-top:1em;'),
+ array( 'style' => 'margin-top:1em;' ),
wfMessage( 'gwtoolset-detect-license-heading'
)->escaped()
) .
@@ -495,7 +495,7 @@
// global categories
Html::rawElement(
'h3',
- array( 'style' => 'margin-top:1em;'),
+ array( 'style' => 'margin-top:1em;' ),
wfMessage( 'categories' )->escaped()
) .
diff --git a/includes/Forms/PreviewForm.php b/includes/Forms/PreviewForm.php
index ac00573..de99c0c 100644
--- a/includes/Forms/PreviewForm.php
+++ b/includes/Forms/PreviewForm.php
@@ -7,13 +7,14 @@
* @license GNU General Public License 3.0 http://www.gnu.org/licenses/gpl.html
*/
namespace GWToolset\Forms;
-use GWToolset\Config,
- GWToolset\Utils,
- Html,
- IContextSource,
- Linker,
- ParserOptions,
- Title;
+
+use GWToolset\Config;
+use GWToolset\Utils;
+use Html;
+use IContextSource;
+use Linker;
+use ParserOptions;
+use Title;
class PreviewForm {
@@ -369,7 +370,7 @@
) .
Html::openElement( 'ul' );
- foreach( $notParsable as $category ) {
+ foreach ( $notParsable as $category ) {
$result .= Html::rawElement(
'li',
array(),
diff --git a/includes/GWTException.php b/includes/GWTException.php
index 9c7874a..4e69cf9 100644
--- a/includes/GWTException.php
+++ b/includes/GWTException.php
@@ -8,6 +8,7 @@
*/
namespace GWToolset;
+
use Exception;
use Sanitizer;
@@ -46,7 +47,7 @@
foreach ( $message as $key => $params ) {
$result .= wfMessage( $key )->params( $params
)->text();
}
- } else if ( strpos( $message, 'gwtoolset-' ) === 0 ) {
+ } elseif ( strpos( $message, 'gwtoolset-' ) === 0 ) {
$result .= wfMessage( $message )->text();
} else {
$result = $message;
diff --git a/includes/Handlers/Forms/FormHandler.php
b/includes/Handlers/Forms/FormHandler.php
index 137ea10..f417ae3 100644
--- a/includes/Handlers/Forms/FormHandler.php
+++ b/includes/Handlers/Forms/FormHandler.php
@@ -7,10 +7,11 @@
* @license GNU General Public License 3.0 http://www.gnu.org/licenses/gpl.html
*/
namespace GWToolset\Handlers\Forms;
-use GWToolset\GWTException,
- GWToolset\Helpers\WikiChecks,
- Html,
- MWException;
+
+use GWToolset\GWTException;
+use GWToolset\Helpers\WikiChecks;
+use Html;
+use MWException;
abstract class FormHandler {
diff --git a/includes/Handlers/Forms/MetadataDetectHandler.php
b/includes/Handlers/Forms/MetadataDetectHandler.php
index c5d3955..99588a4 100644
--- a/includes/Handlers/Forms/MetadataDetectHandler.php
+++ b/includes/Handlers/Forms/MetadataDetectHandler.php
@@ -8,20 +8,21 @@
*/
namespace GWToolset\Handlers\Forms;
-use GWToolset\Adapters\Php\MappingPhpAdapter,
- GWToolset\Adapters\Php\MediawikiTemplatePhpAdapter,
- GWToolset\Config,
- GWToolset\Forms\MetadataMappingForm,
- GWToolset\Handlers\UploadHandler,
- GWToolset\Handlers\Xml\XmlDetectHandler,
- GWToolset\Helpers\GWTFileBackend,
- GWToolset\Models\Mapping,
- GWToolset\Models\MediawikiTemplate,
- GWToolset\Utils,
- FSFile,
- Language,
- MWException,
- Php\File;
+
+use GWToolset\Adapters\Php\MappingPhpAdapter;
+use GWToolset\Adapters\Php\MediawikiTemplatePhpAdapter;
+use GWToolset\Config;
+use GWToolset\Forms\MetadataMappingForm;
+use GWToolset\Handlers\UploadHandler;
+use GWToolset\Handlers\Xml\XmlDetectHandler;
+use GWToolset\Helpers\GWTFileBackend;
+use GWToolset\Models\Mapping;
+use GWToolset\Models\MediawikiTemplate;
+use GWToolset\Utils;
+use FSFile;
+use Language;
+use MWException;
+use Php\File;
class MetadataDetectHandler extends FormHandler {
diff --git a/includes/Handlers/Forms/MetadataMappingHandler.php
b/includes/Handlers/Forms/MetadataMappingHandler.php
index 2e94aac..d957451 100644
--- a/includes/Handlers/Forms/MetadataMappingHandler.php
+++ b/includes/Handlers/Forms/MetadataMappingHandler.php
@@ -8,26 +8,27 @@
*/
namespace GWToolset\Handlers\Forms;
-use FSFile,
- GWToolset\Adapters\Php\MappingPhpAdapter,
- GWToolset\Adapters\Php\MediawikiTemplatePhpAdapter,
- GWToolset\Adapters\Php\MetadataPhpAdapter,
- GWToolset\Config,
- GWToolset\Constants,
- GWToolset\Utils,
- GWToolset\Forms\PreviewForm,
- GWToolset\Handlers\UploadHandler,
- GWToolset\Handlers\Xml\XmlMappingHandler,
- GWToolset\Helpers\GWTFileBackend,
- GWToolset\Jobs\UploadMetadataJob,
- GWToolset\Models\Mapping,
- GWToolset\Models\MediawikiTemplate,
- GWToolset\Models\Metadata,
- Html,
- JobQueueGroup,
- Linker,
- MWException,
- Title;
+
+use FSFile;
+use GWToolset\Adapters\Php\MappingPhpAdapter;
+use GWToolset\Adapters\Php\MediawikiTemplatePhpAdapter;
+use GWToolset\Adapters\Php\MetadataPhpAdapter;
+use GWToolset\Config;
+use GWToolset\Constants;
+use GWToolset\Utils;
+use GWToolset\Forms\PreviewForm;
+use GWToolset\Handlers\UploadHandler;
+use GWToolset\Handlers\Xml\XmlMappingHandler;
+use GWToolset\Helpers\GWTFileBackend;
+use GWToolset\Jobs\UploadMetadataJob;
+use GWToolset\Models\Mapping;
+use GWToolset\Models\MediawikiTemplate;
+use GWToolset\Models\Metadata;
+use Html;
+use JobQueueGroup;
+use Linker;
+use MWException;
+use Title;
class MetadataMappingHandler extends FormHandler {
@@ -349,7 +350,7 @@
$options,
$this->_whitelisted_post
);
- } else if ( $user_options['preview'] ) {
+ } elseif ( $user_options['preview'] ) {
$result = $this->_UploadHandler->getPreview(
$user_options );
} else {
$result =
$this->_UploadHandler->saveMediafileAsContent( $user_options );
diff --git a/includes/Handlers/UploadHandler.php
b/includes/Handlers/UploadHandler.php
index 0cabb27..2537ecd 100644
--- a/includes/Handlers/UploadHandler.php
+++ b/includes/Handlers/UploadHandler.php
@@ -8,25 +8,26 @@
*/
namespace GWToolset\Handlers;
-use ApiMain,
- ContentHandler,
- DerivativeRequest,
- GWToolset\Config,
- GWToolset\Constants,
- GWToolset\GWTException,
- GWToolset\Utils,
- GWToolset\Helpers\FileChecks,
- GWToolset\Helpers\WikiChecks,
- GWToolset\Jobs\UploadMediafileJob,
- Http,
- MimeMagic,
- MWException,
- MWHttpRequest,
- Status,
- Title,
- UploadBase,
- UploadFromUrl,
- WikiPage;
+
+use ApiMain;
+use ContentHandler;
+use DerivativeRequest;
+use GWToolset\Config;
+use GWToolset\Constants;
+use GWToolset\GWTException;
+use GWToolset\Utils;
+use GWToolset\Helpers\FileChecks;
+use GWToolset\Helpers\WikiChecks;
+use GWToolset\Jobs\UploadMediafileJob;
+use Http;
+use MimeMagic;
+use MWException;
+use MWHttpRequest;
+use Status;
+use Title;
+use UploadBase;
+use UploadFromUrl;
+use WikiPage;
class UploadHandler {
@@ -206,7 +207,7 @@
return $result;
}
- foreach( $categories as $category ) {
+ foreach ( $categories as $category ) {
$result .= '[[' .
Utils::getNamespaceName( NS_CATEGORY ) .
$category .
@@ -249,7 +250,7 @@
);
// this title’s most recent mediafile is the
same as the one being uploaded
- } else if (
+ } elseif (
$upload->getTempFileSha1Base36() ===
$warnings['exists']['file']->getSha1()
) {
@@ -357,7 +358,7 @@
throw new GWTException(
array(
'gwtoolset-mapping-media-file-no-content-type' =>
- array ( $url )
+ array( $url )
)
);
}
@@ -390,7 +391,7 @@
// $Output->setCategoryLinks requires an array with the
category name
// as the key and a sortkey as the value; not sure what the
are valid
// sortkey values, but 0 seems to work well
- foreach( $categories as $category ) {
+ foreach ( $categories as $category ) {
$result[$category] = 0;
}
@@ -427,7 +428,7 @@
throw new GWTException(
array(
'gwtoolset-mapping-media-file-no-content-type' =>
- array ( $options['url'] )
+ array( $options['url'] )
)
);
}
@@ -796,7 +797,7 @@
);
}
- foreach( $categories as $key => $item ) {
+ foreach ( $categories as $key => $item ) {
$this->_global_categories[$key] =
Utils::stripIllegalCategoryChars(
Utils::sanitizeString( $item )
@@ -832,7 +833,7 @@
);
}
- foreach( $metadata_values as $metadata_value ) {
+ foreach ( $metadata_values as $metadata_value )
{
if ( !empty( $phrase ) ) {
$this->_item_specific_categories[] =
Utils::stripIllegalCategoryChars(
diff --git a/includes/Handlers/Xml/XmlDetectHandler.php
b/includes/Handlers/Xml/XmlDetectHandler.php
index 360aa44..902d931 100644
--- a/includes/Handlers/Xml/XmlDetectHandler.php
+++ b/includes/Handlers/Xml/XmlDetectHandler.php
@@ -8,15 +8,15 @@
*/
namespace GWToolset\Handlers\Xml;
-use
-DOMElement,
- GWToolset\GWTException,
- GWToolset\Utils,
- GWToolset\Models\Mapping,
- Html,
- MWException,
- Sanitizer,
- XMLReader;
+
+use DOMElement;
+use GWToolset\GWTException;
+use GWToolset\Utils;
+use GWToolset\Models\Mapping;
+use Html;
+use MWException;
+use Sanitizer;
+use XMLReader;
/**
* @todo possibley pull out the decorator methods and place them
@@ -283,7 +283,7 @@
if ( $parameter === 'gwtoolset-title' ) {
$result = wfMessage( 'gwtoolset-title-label'
)->escaped();
- } else if ( $parameter === 'gwtoolset-url-to-the-media-file' ) {
+ } elseif ( $parameter === 'gwtoolset-url-to-the-media-file' ) {
$result = wfMessage(
'gwtoolset-url-to-the-media-file-label' )->escaped();
} else {
$result = str_replace(
diff --git a/includes/Handlers/Xml/XmlHandler.php
b/includes/Handlers/Xml/XmlHandler.php
index 1ff461f..1b2d29f 100644
--- a/includes/Handlers/Xml/XmlHandler.php
+++ b/includes/Handlers/Xml/XmlHandler.php
@@ -8,11 +8,12 @@
*/
namespace GWToolset\Handlers\Xml;
-use GWToolset\GWTException,
- GWToolset\Helpers\GWTFileBackend,
- Html,
- MWException,
- XMLReader;
+
+use GWToolset\GWTException;
+use GWToolset\Helpers\GWTFileBackend;
+use Html;
+use MWException;
+use XMLReader;
abstract class XmlHandler {
@@ -21,7 +22,7 @@
*/
protected $_GWTFileBackend;
- public abstract function __construct();
+ abstract public function __construct();
/**
* a debug method for testing the reader
@@ -77,7 +78,7 @@
return $result;
}
- public abstract function processXml( array &$user_options, $xml_source
= null );
+ abstract public function processXml( array &$user_options, $xml_source
= null );
/**
* opens the xml file as a stream and sends the stream to other methods
in
diff --git a/includes/Handlers/Xml/XmlMappingHandler.php
b/includes/Handlers/Xml/XmlMappingHandler.php
index e5d9871..72c517c 100644
--- a/includes/Handlers/Xml/XmlMappingHandler.php
+++ b/includes/Handlers/Xml/XmlMappingHandler.php
@@ -8,12 +8,12 @@
*/
namespace GWToolset\Handlers\Xml;
-use
-DOMElement,
- GWToolset\Config,
- GWToolset\Utils,
- MWException,
- XMLReader;
+
+use DOMElement;
+use GWToolset\Config;
+use GWToolset\Utils;
+use MWException;
+use XMLReader;
class XmlMappingHandler extends XmlHandler {
diff --git a/includes/Helpers/FileChecks.php b/includes/Helpers/FileChecks.php
index 560fd7e..20c2f85 100644
--- a/includes/Helpers/FileChecks.php
+++ b/includes/Helpers/FileChecks.php
@@ -8,14 +8,15 @@
*/
namespace GWToolset\Helpers;
-use GWToolset\Config,
- GWToolset\GWTException,
- GWToolset\Utils,
- MimeMagic,
- MWException,
- Php\File,
- Status,
- UploadBase;
+
+use GWToolset\Config;
+use GWToolset\GWTException;
+use GWToolset\Utils;
+use MimeMagic;
+use MWException;
+use Php\File;
+use Status;
+use UploadBase;
/**
* @todo: examine other checks in baseupload - detectVirus
@@ -36,8 +37,8 @@
*/
public static function checkMaxPostSize() {
if ( isset( $_SERVER["CONTENT_LENGTH"] )
- && Utils::getBytes( ini_get('post_max_size') ) > 0
- && ( (int)$_SERVER["CONTENT_LENGTH"] > Utils::getBytes(
ini_get('post_max_size') ) )
+ && Utils::getBytes( ini_get( 'post_max_size' ) ) > 0
+ && ( (int)$_SERVER["CONTENT_LENGTH"] > Utils::getBytes(
ini_get( 'post_max_size' ) ) )
) {
throw new GWTException( 'gwtoolset-over-max-ini' );
}
diff --git a/includes/Helpers/GWTFileBackend.php
b/includes/Helpers/GWTFileBackend.php
index 5e82635..d239e59 100644
--- a/includes/Helpers/GWTFileBackend.php
+++ b/includes/Helpers/GWTFileBackend.php
@@ -8,17 +8,18 @@
*/
namespace GWToolset\Helpers;
-use FileBackendGroup,
- GWToolset\Jobs\GWTFileBackendCleanupJob,
- GWToolset\Constants,
- GWToolset\Utils,
- JobQueueGroup,
- MWException,
- Exception,
- Php\File,
- Status,
- Title,
- User;
+
+use FileBackendGroup;
+use GWToolset\Jobs\GWTFileBackendCleanupJob;
+use GWToolset\Constants;
+use GWToolset\Utils;
+use JobQueueGroup;
+use MWException;
+use Exception;
+use Php\File;
+use Status;
+use Title;
+use User;
class GWTFileBackend {
diff --git a/includes/Helpers/WikiChecks.php b/includes/Helpers/WikiChecks.php
index b930e2d..7ea71c7 100644
--- a/includes/Helpers/WikiChecks.php
+++ b/includes/Helpers/WikiChecks.php
@@ -8,12 +8,13 @@
*/
namespace GWToolset\Helpers;
-use GWToolset\Config,
- GWToolset\Constants,
- GWToolset\Utils,
- MWException,
- SpecialPage,
- Status;
+
+use GWToolset\Config;
+use GWToolset\Constants;
+use GWToolset\Utils;
+use MWException;
+use SpecialPage;
+use Status;
/**
* provides several methods for verifying :
@@ -80,7 +81,7 @@
try {
wfUseMW( Constants::REQUIRED_MEDIAWIKI_VERSION );
- } catch( MWException $e ) {
+ } catch ( MWException $e ) {
return Status::newFatal(
'gwtoolset-mediawiki-version-invalid',
Constants::REQUIRED_MEDIAWIKI_VERSION,
diff --git a/includes/Jobs/GWTFileBackendCleanupJob.php
b/includes/Jobs/GWTFileBackendCleanupJob.php
index 1c89531..1edf017 100644
--- a/includes/Jobs/GWTFileBackendCleanupJob.php
+++ b/includes/Jobs/GWTFileBackendCleanupJob.php
@@ -8,11 +8,12 @@
*/
namespace GWToolset\Jobs;
-use Job,
- GWToolset\Config,
- GWToolset\Helpers\GWTFileBackend,
- GWToolset\GWTException,
- User;
+
+use Job;
+use GWToolset\Config;
+use GWToolset\Helpers\GWTFileBackend;
+use GWToolset\GWTException;
+use User;
class GWTFileBackendCleanupJob extends Job {
diff --git a/includes/Jobs/UploadMediafileJob.php
b/includes/Jobs/UploadMediafileJob.php
index 04af130..677d4ce 100755
--- a/includes/Jobs/UploadMediafileJob.php
+++ b/includes/Jobs/UploadMediafileJob.php
@@ -8,20 +8,20 @@
*/
namespace GWToolset\Jobs;
-use GWToolset\Adapters\Php\MappingPhpAdapter,
- GWToolset\Adapters\Php\MediawikiTemplatePhpAdapter,
- GWToolset\Adapters\Php\MetadataPhpAdapter,
- GWToolset\GWTException,
- GWToolset\Handlers\UploadHandler,
- GWToolset\Models\Mapping,
- GWToolset\Models\MediawikiTemplate,
- GWToolset\Models\Metadata,
- GWToolset\Utils,
- Job,
- ScopedCallback,
- Title,
- User;
+use GWToolset\Adapters\Php\MappingPhpAdapter;
+use GWToolset\Adapters\Php\MediawikiTemplatePhpAdapter;
+use GWToolset\Adapters\Php\MetadataPhpAdapter;
+use GWToolset\GWTException;
+use GWToolset\Handlers\UploadHandler;
+use GWToolset\Models\Mapping;
+use GWToolset\Models\MediawikiTemplate;
+use GWToolset\Models\Metadata;
+use GWToolset\Utils;
+use Job;
+use ScopedCallback;
+use Title;
+use User;
class UploadMediafileJob extends Job {
diff --git a/includes/Jobs/UploadMetadataJob.php
b/includes/Jobs/UploadMetadataJob.php
index 6161d2a..20cb179 100644
--- a/includes/Jobs/UploadMetadataJob.php
+++ b/includes/Jobs/UploadMetadataJob.php
@@ -8,17 +8,18 @@
*/
namespace GWToolset\Jobs;
-use Job,
- JobQueueGroup,
- GWToolset\Config,
- GWToolset\Constants,
- GWToolset\Utils,
- GWToolset\GWTException,
- GWToolset\Handlers\Forms\MetadataMappingHandler,
- MWException,
- Exception,
- Title,
- User;
+
+use Job;
+use JobQueueGroup;
+use GWToolset\Config;
+use GWToolset\Constants;
+use GWToolset\Utils;
+use GWToolset\GWTException;
+use GWToolset\Handlers\Forms\MetadataMappingHandler;
+use MWException;
+use Exception;
+use Title;
+use User;
/**
* runs the MetadataMappingHandler with the originally $_POST’ed form fields
when
diff --git a/includes/Models/Mapping.php b/includes/Models/Mapping.php
index 8a4831e..bc54a26 100644
--- a/includes/Models/Mapping.php
+++ b/includes/Models/Mapping.php
@@ -8,11 +8,12 @@
*/
namespace GWToolset\Models;
-use GWToolset\Adapters\DataAdapterInterface,
- GWtoolset\Config,
- GWToolset\GWTException,
- GWToolset\Utils,
- Linker;
+
+use GWToolset\Adapters\DataAdapterInterface;
+use GWtoolset\Config;
+use GWToolset\GWTException;
+use GWToolset\Utils;
+use Linker;
class Mapping implements ModelInterface {
diff --git a/includes/Models/MediawikiTemplate.php
b/includes/Models/MediawikiTemplate.php
index 4c5044d..c474b80 100644
--- a/includes/Models/MediawikiTemplate.php
+++ b/includes/Models/MediawikiTemplate.php
@@ -8,12 +8,13 @@
*/
namespace GWToolset\Models;
-use Html,
- GWToolset\Adapters\DataAdapterInterface,
- GWToolset\Config,
- GWToolset\GWTException,
- GWToolset\Utils,
- MWException;
+
+use Html;
+use GWToolset\Adapters\DataAdapterInterface;
+use GWToolset\Config;
+use GWToolset\GWTException;
+use GWToolset\Utils;
+use MWException;
class MediawikiTemplate implements ModelInterface {
@@ -257,7 +258,7 @@
protected function getPermission( $content, array $user_options ) {
if ( !empty( $user_options['gwtoolset-global-license'] ) ) {
return $user_options['gwtoolset-global-license'];
- } else if ( $user_options['gwtoolset-detect-license'] ) {
+ } elseif ( $user_options['gwtoolset-detect-license'] ) {
$permission = strtolower( $content );
} else {
return $content;
diff --git a/includes/Models/Metadata.php b/includes/Models/Metadata.php
index 161c3d7..4ec2875 100644
--- a/includes/Models/Metadata.php
+++ b/includes/Models/Metadata.php
@@ -8,9 +8,10 @@
*/
namespace GWToolset\Models;
-use GWToolset\Adapters\DataAdapterInterface,
- GWToolset\Config,
- GWToolset\Utils;
+
+use GWToolset\Adapters\DataAdapterInterface;
+use GWToolset\Config;
+use GWToolset\Utils;
class Metadata implements ModelInterface {
/**
diff --git a/includes/Models/ModelInterface.php
b/includes/Models/ModelInterface.php
index b5bf5bc..03f763b 100644
--- a/includes/Models/ModelInterface.php
+++ b/includes/Models/ModelInterface.php
@@ -8,7 +8,6 @@
*/
namespace GWToolset\Models;
-
interface ModelInterface {
public function create( array $options = array() );
diff --git a/includes/Php/File.php b/includes/Php/File.php
index 3a5aacd..6ac88f1 100644
--- a/includes/Php/File.php
+++ b/includes/Php/File.php
@@ -8,11 +8,11 @@
*/
namespace Php;
-use
-GWToolset\GWTException,
- GWToolset\Utils,
- MimeMagic,
- MWException;
+
+use GWToolset\GWTException;
+use GWToolset\Utils;
+use MimeMagic;
+use MWException;
/**
* @link http://php.net/manual/en/reserved.variables.files.php
diff --git a/includes/Specials/SpecialGWToolset.php
b/includes/Specials/SpecialGWToolset.php
index 217bae0..8c5c52f 100644
--- a/includes/Specials/SpecialGWToolset.php
+++ b/includes/Specials/SpecialGWToolset.php
@@ -8,15 +8,15 @@
*/
namespace GWToolset;
-use
-GWToolset\Handlers\Forms\FormHandler,
- GWToolset\Helpers\FileChecks,
- GWToolset\Helpers\WikiChecks,
- Html,
- Linker,
- MWException,
- SpecialPage,
- Title;
+
+use GWToolset\Handlers\Forms\FormHandler;
+use GWToolset\Helpers\FileChecks;
+use GWToolset\Helpers\WikiChecks;
+use Html;
+use Linker;
+use MWException;
+use SpecialPage;
+use Title;
class SpecialGWToolset extends SpecialPage {
@@ -177,7 +177,7 @@
throw new MWException( $msg );
}
- } else if ( $this->getRequest()->wasPosted() ) {
+ } elseif ( $this->getRequest()->wasPosted() ) {
// a posted form must have a registered module key
$msg = wfMessage( 'gwtoolset-developer-issue' )
->params(
diff --git a/includes/Utils.php b/includes/Utils.php
index ad6cf42..e7cef72 100644
--- a/includes/Utils.php
+++ b/includes/Utils.php
@@ -8,12 +8,12 @@
*/
namespace GWToolset;
-use Language,
- ManualLogEntry,
- MWException,
- Sanitizer,
- Title;
+use Language;
+use ManualLogEntry;
+use MWException;
+use Sanitizer;
+use Title;
class Utils {
@@ -63,10 +63,13 @@
* @return {int}
*/
public static function getBytes( $val ) {
- switch ( substr ( $val, -1 ) ) {
- case 'M': case 'm': return (int)$val * 1048576;
- case 'K': case 'k': return (int)$val * 1024;
- case 'G': case 'g': return (int)$val * 1073741824;
+ switch ( substr( $val, -1 ) ) {
+ case 'M': case 'm':
+ return (int)$val * 1048576;
+ case 'K': case 'k':
+ return (int)$val * 1024;
+ case 'G': case 'g':
+ return (int)$val * 1073741824;
default:
}
diff --git a/maintenance/cleanupGWTFileBackend.php
b/maintenance/cleanupGWTFileBackend.php
index 9f7fd04..120e7b7 100644
--- a/maintenance/cleanupGWTFileBackend.php
+++ b/maintenance/cleanupGWTFileBackend.php
@@ -8,16 +8,16 @@
*/
namespace GWToolset;
-use
-GWToolset\Helpers\GWTFileBackend,
- Maintenance,
- MWException;
+
+use GWToolset\Helpers\GWTFileBackend;
+use Maintenance;
+use MWException;
$IP = getenv( 'MW_INSTALL_PATH' );
if ( $IP === false ) {
- $IP = dirname( __FILE__ ) . '/../../..';
+ $IP = __DIR__ . '/../../..';
}
-require_once( "$IP/maintenance/Maintenance.php" );
+require_once ( "$IP/maintenance/Maintenance.php" );
/**
diff --git a/phpcs.xml b/phpcs.xml
new file mode 100644
index 0000000..8fee2e0
--- /dev/null
+++ b/phpcs.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<ruleset>
+ <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+ <exclude name="Generic.Files.LineLength"/>
+ <exclude
name="Generic.Functions.OpeningFunctionBraceKernighanRitchie.ContentAfterBrace"/>
+ <exclude name="Generic.WhiteSpace.DisallowSpaceIndent.SpacesUsed"/>
+ <exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.EmptyComment"/>
+ <exclude
name="MediaWiki.WhiteSpace.SpaceyParenthesis.SingleSpaceAfterOpenParenthesis"/>
+ <exclude
name="MediaWiki.WhiteSpace.SpaceyParenthesis.SingleSpaceBeforeCloseParenthesis"/>
+ <exclude name="PSR2.Classes.PropertyDeclaration.Underscore"/>
+ </rule>
+ <file>.</file>
+ <arg name="encoding" value="utf8"/>
+ <arg name="extensions" value="php,php5,inc"/>
+ <exclude-pattern>vendor</exclude-pattern>
+</ruleset>
--
To view, visit https://gerrit.wikimedia.org/r/270095
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I90b9fabbe2630ecb9d62d185a5c0b30147d378fe
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/GWToolset
Gerrit-Branch: master
Gerrit-Owner: Jean-Frédéric <jeanfrederic.w...@gmail.com>
Gerrit-Reviewer: Jean-Frédéric <jeanfrederic.w...@gmail.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@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
