Paladox has submitted this change and it was merged.
Change subject: Tweaks for test and code style.
......................................................................
Tweaks for test and code style.
Change-Id: Iaaa8605c5109faf4573271cac946ed042d3aee5d
---
M MediaWikiFarmer.php
M composer.json
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Paladox: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MediaWikiFarmer.php b/MediaWikiFarmer.php
index 1c8ad62..21afbe0 100644
--- a/MediaWikiFarmer.php
+++ b/MediaWikiFarmer.php
@@ -114,10 +114,10 @@
$this->_useDatabase = ( $this->_databaseName !== null );
if ( $this->_useDatabase ) {
- // @codingStandardsIgnoreStart
+ // @codingStandardsIgnoreStart Ignore global not
starting with wg.
global $IP;
- require_once ( "$IP/includes/GlobalFunctions.php" );
// @codingStandardsIgnoreEnd
+ require_once "$IP/includes/GlobalFunctions.php";
} else {
if ( !is_dir( $this->_configDirectory ) ) {
throw new MWException( 'configDirectory not
found: ' . $this->_configDirectory );
diff --git a/composer.json b/composer.json
index e0f4e67..4365e8a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
{
"require-dev": {
- "jakub-onderka/php-parallel-lint": "0.9.*",
+ "jakub-onderka/php-parallel-lint": "0.9",
"mediawiki/mediawiki-codesniffer": "0.4.0"
},
"scripts": {
--
To view, visit https://gerrit.wikimedia.org/r/241939
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaaa8605c5109faf4573271cac946ed042d3aee5d
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Farmer
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[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
