|
@@ -117,6 +117,7 @@ class ConfigValidator
|
|
// check for require-dev overrides
|
|
// check for require-dev overrides
|
|
if (isset($manifest['require']) && isset($manifest['require-dev'])) {
|
|
if (isset($manifest['require']) && isset($manifest['require-dev'])) {
|
|
$requireOverrides = array_intersect_key($manifest['require'], $manifest['require-dev']);
|
|
$requireOverrides = array_intersect_key($manifest['require'], $manifest['require-dev']);
|
|
|
|
+
|
|
if (!empty($requireOverrides)) {
|
|
if (!empty($requireOverrides)) {
|
|
$plural = (count($requireOverrides) > 1) ? 'are' : 'is';
|
|
$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";
|
|
$warnings[] = implode(', ', array_keys($requireOverrides)). " {$plural} required both in require and require-dev, this can lead to unexpected behavior";
|
|
@@ -124,7 +125,9 @@ class ConfigValidator
|
|
}
|
|
}
|
|
|
|
|
|
// check for commit references
|
|
// check for commit references
|
|
- $packages = array_merge($manifest['require'], $manifest['require-dev']);
|
|
|
|
|
|
+ $require = isset($manifest['require']) ? $manifest['require'] : array();
|
|
|
|
+ $requireDev = isset($manifest['require-dev']) ? $manifest['require-dev'] : array();
|
|
|
|
+ $packages = array_merge($require, $requireDev);
|
|
foreach ($packages as $package => $version) {
|
|
foreach ($packages as $package => $version) {
|
|
if (preg_match('/#/', $version) === 1) {
|
|
if (preg_match('/#/', $version) === 1) {
|
|
$warnings[] = sprintf(
|
|
$warnings[] = sprintf(
|