public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

ConfigValidator: ensure that require-dev exists during override check 

- Ensure that require-dev is present before checking for dependeny overrides.
- A small grammar update for the warning message.
pull/2535/head
chr0n1x 2013-12-28 00:40:27 -05:00
parent 09602bbf00
commit 528d35a835
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Composer/Util/ConfigValidator.php
View File

@ -108,9 +108,14 @@ class ConfigValidator
$warnings[] = "The package type 'composer-installer' is deprecated. Please distribute your custom installers as plugins from now on. See http://getcomposer.org/doc/articles/plugins.md for plugin documentation.";
}
$requireOverrides = array_intersect_key($manifest['require'], $manifest['require-dev']);
if (!empty($requireOverrides)) {
$warnings[] = implode(', ', array_keys($requireOverrides)). " is required both in require and require-dev, this can lead to unexpected behavior";
// check for require-dev overrides
if (isset($manifest['require']) && isset($manifest['require-dev'])) {
$requireOverrides = array_intersect_key($manifest['require'], $manifest['require-dev']);
if (!empty($requireOverrides)) {
$plural = (count($requireOverrides) > 1) ? 'are' : 'is';
$warnings[] = implode(', ', array_keys($requireOverrides)). " {$plural} required both in require and require-dev, this can lead to unexpected behavior";
}
}
try {