[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: Restore 100% code coverage

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

Change subject: Restore 100% code coverage
..


Restore 100% code coverage

Change-Id: I0adbef2d9113679b4793b41beb7a92621db198cc
---
M src/MediaWikiFarmComposerScript.php
M tests/phpunit/data/mediawiki/vstub/composer.json
2 files changed, 4 insertions(+), 1 deletion(-)

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



diff --git a/src/MediaWikiFarmComposerScript.php 
b/src/MediaWikiFarmComposerScript.php
index 42fd69e..93caaab 100644
--- a/src/MediaWikiFarmComposerScript.php
+++ b/src/MediaWikiFarmComposerScript.php
@@ -149,7 +149,7 @@
unset( 
$baseComposerJson['require'][$package['name']] );
}
if( array_key_exists( 'require-dev', 
$baseComposerJson ) && array_key_exists( $package['name'], 
$baseComposerJson['require-dev'] ) ) {
-   unset( 
$baseComposerJson['require-dev'][$package['name']] ); // @codeCoverageIgnore
+   unset( 
$baseComposerJson['require-dev'][$package['name']] );
}
$dependencies[$extensions[$package['name']]] = 
array_key_exists( 'require', $package ) ? array_keys( $package['require'] ) : 
array();
}
diff --git a/tests/phpunit/data/mediawiki/vstub/composer.json 
b/tests/phpunit/data/mediawiki/vstub/composer.json
index c3746c3..2b88fcb 100644
--- a/tests/phpunit/data/mediawiki/vstub/composer.json
+++ b/tests/phpunit/data/mediawiki/vstub/composer.json
@@ -4,5 +4,8 @@
"mediawiki/page-forms": "*",
"mediawiki/semantic-forms-select": "*",
"mediawiki/chameleon-skin": "*"
+   },
+   "require-dev": {
+   "mediawiki/page-forms": "*"
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0adbef2d9113679b4793b41beb7a92621db198cc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiFarm
Gerrit-Branch: master
Gerrit-Owner: Seb35 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Seb35 
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...MediaWikiFarm[master]: Restore 100% code coverage

2017-03-25 Thread Seb35 (Code Review) 
Seb35 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/344784 )

Change subject: Restore 100% code coverage
..

Restore 100% code coverage

Change-Id: I0adbef2d9113679b4793b41beb7a92621db198cc
---
M src/MediaWikiFarmComposerScript.php
M tests/phpunit/data/mediawiki/vstub/composer.json
2 files changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MediaWikiFarm 
refs/changes/84/344784/1

diff --git a/src/MediaWikiFarmComposerScript.php 
b/src/MediaWikiFarmComposerScript.php
index 42fd69e..93caaab 100644
--- a/src/MediaWikiFarmComposerScript.php
+++ b/src/MediaWikiFarmComposerScript.php
@@ -149,7 +149,7 @@
unset( 
$baseComposerJson['require'][$package['name']] );
}
if( array_key_exists( 'require-dev', 
$baseComposerJson ) && array_key_exists( $package['name'], 
$baseComposerJson['require-dev'] ) ) {
-   unset( 
$baseComposerJson['require-dev'][$package['name']] ); // @codeCoverageIgnore
+   unset( 
$baseComposerJson['require-dev'][$package['name']] );
}
$dependencies[$extensions[$package['name']]] = 
array_key_exists( 'require', $package ) ? array_keys( $package['require'] ) : 
array();
}
diff --git a/tests/phpunit/data/mediawiki/vstub/composer.json 
b/tests/phpunit/data/mediawiki/vstub/composer.json
index c3746c3..2b88fcb 100644
--- a/tests/phpunit/data/mediawiki/vstub/composer.json
+++ b/tests/phpunit/data/mediawiki/vstub/composer.json
@@ -4,5 +4,8 @@
"mediawiki/page-forms": "*",
"mediawiki/semantic-forms-select": "*",
"mediawiki/chameleon-skin": "*"
+   },
+   "require-dev": {
+   "mediawiki/page-forms": "*"
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0adbef2d9113679b4793b41beb7a92621db198cc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MediaWikiFarm
Gerrit-Branch: master
Gerrit-Owner: Seb35 

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