jenkins-bot has submitted this change and it was merged.
Change subject: Update mediawiki/mediawiki-codesniffer to 0.4.0
......................................................................
Update mediawiki/mediawiki-codesniffer to 0.4.0
Change-Id: I856d85f3a186b6e97fb00bc7e0b935391db69f94
---
M MediaWikiFarmer.php
M composer.json
M phpcs.xml
3 files changed, 6 insertions(+), 3 deletions(-)
Approvals:
Paladox: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MediaWikiFarmer.php b/MediaWikiFarmer.php
index 63cab67..1c8ad62 100644
--- a/MediaWikiFarmer.php
+++ b/MediaWikiFarmer.php
@@ -114,8 +114,10 @@
$this->_useDatabase = ( $this->_databaseName !== null );
if ( $this->_useDatabase ) {
+ // @codingStandardsIgnoreStart
global $IP;
require_once ( "$IP/includes/GlobalFunctions.php" );
+ // @codingStandardsIgnoreEnd
} else {
if ( !is_dir( $this->_configDirectory ) ) {
throw new MWException( 'configDirectory not
found: ' . $this->_configDirectory );
diff --git a/composer.json b/composer.json
index 534f8fb..e0f4e67 100644
--- a/composer.json
+++ b/composer.json
@@ -1,12 +1,12 @@
{
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.*",
- "mediawiki/mediawiki-codesniffer": "0.3.0"
+ "mediawiki/mediawiki-codesniffer": "0.4.0"
},
"scripts": {
"test": [
"parallel-lint . --exclude vendor",
- "phpcs -p"
+ "phpcs -p -s"
]
}
}
diff --git a/phpcs.xml b/phpcs.xml
index cb19440..d81a292 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -2,6 +2,7 @@
<ruleset>
<rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki"/>
<file>.</file>
- <arg name="extensions" value="php"/>
+ <arg name="extensions" value="php,php5,inc"/>
+ <arg name="encoding" value="utf8"/>
<exclude-pattern>vendor</exclude-pattern>
</ruleset>
--
To view, visit https://gerrit.wikimedia.org/r/241934
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I856d85f3a186b6e97fb00bc7e0b935391db69f94
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Farmer
Gerrit-Branch: master
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
