jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371420 )
Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.11.0
......................................................................
build: Updating mediawiki/mediawiki-codesniffer to 0.11.0
Change-Id: I8444d8a0ad772ac6c05148311a023ca4cedcc6c2
---
M UploadWizard.config.php
M composer.json
M includes/CampaignSchema.php
M includes/UploadWizardConfig.php
4 files changed, 16 insertions(+), 16 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/UploadWizard.config.php b/UploadWizard.config.php
index 09cda85..5199a4c 100644
--- a/UploadWizard.config.php
+++ b/UploadWizard.config.php
@@ -574,7 +574,7 @@
// exceptions used at Wikimedia Commons: the language template for
Tagalog (ISO 646 code 'tl') is not named 'tl'
// but 'tgl' for historical reasons.
// @codingStandardsIgnoreEnd
- 'languageTemplateFixups' => $uwDefaultLanguageFixups,
+ 'languageTemplateFixups' => $uwDefaultLanguageFixups,
// @codingStandardsIgnoreStart
// XXX this is horribly confusing -- some file restrictions are
client side, others are server side
diff --git a/composer.json b/composer.json
index 55507be..d1e3215 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
{
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
- "mediawiki/mediawiki-codesniffer": "0.10.1",
+ "mediawiki/mediawiki-codesniffer": "0.11.0",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
diff --git a/includes/CampaignSchema.php b/includes/CampaignSchema.php
index 47182f9..2618be9 100644
--- a/includes/CampaignSchema.php
+++ b/includes/CampaignSchema.php
@@ -71,7 +71,7 @@
],
"defaults" => [
"type" => "object",
- "properties" =>[
+ "properties" => [
"alt" => [
"type" => "number"
],
@@ -96,7 +96,7 @@
],
"display" => [
"type" => "object",
- "properties" =>[
+ "properties" => [
"headerLabel" => [
"type" => "string"
],
@@ -138,7 +138,7 @@
],
"licensing" => [
"type" => "object",
- "properties" =>[
+ "properties" => [
"defaultType" => [
"type" => "string"
],
@@ -147,14 +147,14 @@
],
"ownWork" => [
"type" => "object",
- "properties" =>[
+ "properties" => [
"default" => [
"type" => "string",
"enum" => array_keys(
UploadWizardConfig::getSetting( 'licenses' ) )
],
"licenses" => [
"type" => "array",
- "items" =>[
+ "items" => [
[
"type"
=> "string",
"enum"
=> array_keys( UploadWizardConfig::getSetting( 'licenses' ) )
@@ -172,23 +172,23 @@
],
"thirdParty" => [
"type" => "object",
- "properties" =>[
+ "properties" => [
"defaults" => [
"type" => "string",
"enum" => array_keys(
UploadWizardConfig::getSetting( 'licenses' ) )
],
"licenseGroups" => [
"type" => "array",
- "items" =>[
+ "items" => [
[
"type"
=> "object",
-
"properties" =>[
+
"properties" => [
"head" => [
"type" => "string"
],
"licenses" => [
"type" => "array",
-
"items" =>[
+
"items" => [
[
"type" => "string",
"enum" => array_keys( UploadWizardConfig::getSetting(
'licenses' ) )
@@ -213,7 +213,7 @@
],
"tutorial" => [
"type" => "object",
- "properties" =>[
+ "properties" => [
"skip" => [
"type" => "boolean"
],
@@ -233,7 +233,7 @@
"properties" => [
"display" => [
"type" => "object",
- "properties" =>[
+ "properties" => [
"headerLabel" => [
"type" => "string"
],
@@ -266,7 +266,7 @@
"properties" => [
"display" => [
"type" => "object",
- "properties" =>[
+ "properties" => [
"headerLabel" => [
"type" => "string"
],
@@ -282,7 +282,7 @@
"properties" => [
"display" => [
"type" => "object",
- "properties" =>[
+ "properties" => [
"headerLabel" => [
"type" => "string"
],
diff --git a/includes/UploadWizardConfig.php b/includes/UploadWizardConfig.php
index 2278685..71f56b7 100644
--- a/includes/UploadWizardConfig.php
+++ b/includes/UploadWizardConfig.php
@@ -132,7 +132,7 @@
* @return array
*/
protected static function getDefaultConfig() {
- $configPath = dirname( __DIR__ ) . '/UploadWizard.config.php';
+ $configPath = dirname( __DIR__ ) . '/UploadWizard.config.php';
return is_file( $configPath ) ? include $configPath : [];
}
--
To view, visit https://gerrit.wikimedia.org/r/371420
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8444d8a0ad772ac6c05148311a023ca4cedcc6c2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
