[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

2017-07-26 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/368096 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
..


build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

Change-Id: I835d4d0c8ab7bab02e60072e334c73a865e2d1ef
---
M composer.json
M includes/UploadWizardCampaign.php
M includes/UploadWizardConfig.php
M phpcs.xml
4 files changed, 4 insertions(+), 5 deletions(-)

Approvals:
  jenkins-bot: Verified
  Jforrester: Looks good to me, approved



diff --git a/composer.json b/composer.json
index 1366381..55507be 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.0",
+   "mediawiki/mediawiki-codesniffer": "0.10.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
diff --git a/includes/UploadWizardCampaign.php 
b/includes/UploadWizardCampaign.php
index 7b3e0e5..d9e69b3 100644
--- a/includes/UploadWizardCampaign.php
+++ b/includes/UploadWizardCampaign.php
@@ -93,7 +93,7 @@
 *
 * @since 1.4
 *
-* @return boolean
+* @return bool
 */
public function getIsEnabled() {
return $this->config['enabled'];
diff --git a/includes/UploadWizardConfig.php b/includes/UploadWizardConfig.php
index bf58ce9..2278685 100644
--- a/includes/UploadWizardConfig.php
+++ b/includes/UploadWizardConfig.php
@@ -79,7 +79,7 @@
static $mergedConfig = false;
 
if ( !$mergedConfig ) {
-   $wgUploadWizardConfig = 
UploadWizardConfig::array_replace_sanely(
+   $wgUploadWizardConfig = self::array_replace_sanely(
self::getDefaultConfig(),
$wgUploadWizardConfig
);
@@ -87,7 +87,7 @@
}
 
if ( !is_null( $campaignName ) ) {
-   $wgUploadWizardConfig = 
UploadWizardConfig::array_replace_sanely(
+   $wgUploadWizardConfig = self::array_replace_sanely(
$wgUploadWizardConfig,
self::getCampaignConfig( $campaignName )
);
diff --git a/phpcs.xml b/phpcs.xml
index f7eee52..69ff6a9 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -15,5 +15,4 @@
.


-   vendor
 

-- 
To view, visit https://gerrit.wikimedia.org/r/368096
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I835d4d0c8ab7bab02e60072e334c73a865e2d1ef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...UploadWizard[master]: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

2017-07-26 Thread Umherirrender (Code Review) 
Umherirrender has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/368096 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 0.10.1
..

build: Updating mediawiki/mediawiki-codesniffer to 0.10.1

Change-Id: I835d4d0c8ab7bab02e60072e334c73a865e2d1ef
---
M composer.json
M includes/UploadWizardCampaign.php
M includes/UploadWizardConfig.php
M phpcs.xml
4 files changed, 4 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard 
refs/changes/96/368096/1

diff --git a/composer.json b/composer.json
index 1366381..55507be 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.0",
+   "mediawiki/mediawiki-codesniffer": "0.10.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},
"scripts": {
diff --git a/includes/UploadWizardCampaign.php 
b/includes/UploadWizardCampaign.php
index 7b3e0e5..d9e69b3 100644
--- a/includes/UploadWizardCampaign.php
+++ b/includes/UploadWizardCampaign.php
@@ -93,7 +93,7 @@
 *
 * @since 1.4
 *
-* @return boolean
+* @return bool
 */
public function getIsEnabled() {
return $this->config['enabled'];
diff --git a/includes/UploadWizardConfig.php b/includes/UploadWizardConfig.php
index bf58ce9..2278685 100644
--- a/includes/UploadWizardConfig.php
+++ b/includes/UploadWizardConfig.php
@@ -79,7 +79,7 @@
static $mergedConfig = false;
 
if ( !$mergedConfig ) {
-   $wgUploadWizardConfig = 
UploadWizardConfig::array_replace_sanely(
+   $wgUploadWizardConfig = self::array_replace_sanely(
self::getDefaultConfig(),
$wgUploadWizardConfig
);
@@ -87,7 +87,7 @@
}
 
if ( !is_null( $campaignName ) ) {
-   $wgUploadWizardConfig = 
UploadWizardConfig::array_replace_sanely(
+   $wgUploadWizardConfig = self::array_replace_sanely(
$wgUploadWizardConfig,
self::getCampaignConfig( $campaignName )
);
diff --git a/phpcs.xml b/phpcs.xml
index f7eee52..69ff6a9 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -15,5 +15,4 @@
.


-   vendor
 

-- 
To view, visit https://gerrit.wikimedia.org/r/368096
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I835d4d0c8ab7bab02e60072e334c73a865e2d1ef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits