jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/360359 )
Change subject: Clean up after MediaWiki CodeSniffer update to version 0.9.0
......................................................................
Clean up after MediaWiki CodeSniffer update to version 0.9.0
This removes a not needed "return true" from the only hook in
this code base.
Change-Id: Iae7c2ee8afe55bda85cf69f1f086df28bb3f58c8
---
M composer.json
M resources.test.php
M src/resources.php
3 files changed, 6 insertions(+), 10 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index d6e5aad..ab7b0b0 100644
--- a/composer.json
+++ b/composer.json
@@ -20,9 +20,9 @@
"data-values/javascript": "~0.8.0|~0.7.0|~0.6.0"
},
"require-dev": {
+ "jakub-onderka/php-console-highlighter": "0.3.2",
"jakub-onderka/php-parallel-lint": ">=0.3 <0.10",
- "mediawiki/mediawiki-codesniffer": "0.9.0",
- "jakub-onderka/php-console-highlighter": "0.3.2"
+ "mediawiki/mediawiki-codesniffer": "0.9.0"
},
"autoload": {
"files": [
diff --git a/resources.test.php b/resources.test.php
index 0316635..859663a 100644
--- a/resources.test.php
+++ b/resources.test.php
@@ -7,13 +7,11 @@
*/
global $wgHooks;
$wgHooks['ResourceLoaderTestModules'][] = function (
- array &$testModules,
- ResourceLoader &$resourceLoader
- ) {
+ array &$testModules,
+ ResourceLoader &$resourceLoader
+) {
$testModules['qunit'] = array_merge(
$testModules['qunit'],
- include 'tests/resources.php'
+ include __DIR__ . '/tests/resources.php'
);
-
- return true;
};
diff --git a/src/resources.php b/src/resources.php
index 867fbf6..70d514a 100644
--- a/src/resources.php
+++ b/src/resources.php
@@ -14,7 +14,6 @@
];
return [
-
'wikibase.api.__namespace' => $moduleTemplate + [
'scripts' => [
'namespace.js'
@@ -80,6 +79,5 @@
'wikibase.api.__namespace',
],
],
-
];
} );
--
To view, visit https://gerrit.wikimedia.org/r/360359
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iae7c2ee8afe55bda85cf69f1f086df28bb3f58c8
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/WikibaseJavaScriptApi
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
