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

Downgrade severity of branch-alias validation failure to warning

pull/1331/merge
Jordi Boggiano 2012-11-17 22:19:09 +01:00
parent ef0151e1ba
commit ec7088aba5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Package/Loader/ValidatingArrayLoader.php
View File

@ -194,7 +194,7 @@ class ValidatingArrayLoader implements LoaderInterface
foreach ($this->config['extra']['branch-alias'] as $sourceBranch => $targetBranch) { foreach ($this->config['extra']['branch-alias'] as $sourceBranch => $targetBranch) {
// ensure it is an alias to a -dev package // ensure it is an alias to a -dev package
if ('-dev' !== substr($targetBranch, -4)) { if ('-dev' !== substr($targetBranch, -4)) {
$this->errors[] = 'extra.branch-alias.'.$sourceBranch.' : the target branch ('.$targetBranch.') must end in -dev'; $this->warnings[] = 'extra.branch-alias.'.$sourceBranch.' : the target branch ('.$targetBranch.') must end in -dev';
unset($this->config['extra']['branch-alias'][$sourceBranch]); unset($this->config['extra']['branch-alias'][$sourceBranch]);
continue; continue;
@ -203,7 +203,7 @@ class ValidatingArrayLoader implements LoaderInterface
// normalize without -dev and ensure it's a numeric branch that is parseable // normalize without -dev and ensure it's a numeric branch that is parseable
$validatedTargetBranch = $this->versionParser->normalizeBranch(substr($targetBranch, 0, -4)); $validatedTargetBranch = $this->versionParser->normalizeBranch(substr($targetBranch, 0, -4));
if ('-dev' !== substr($validatedTargetBranch, -4)) { if ('-dev' !== substr($validatedTargetBranch, -4)) {
$this->errors[] = 'extra.branch-alias.'.$sourceBranch.' : the target branch ('.$targetBranch.') must be a parseable number like 2.0-dev'; $this->warnings[] = 'extra.branch-alias.'.$sourceBranch.' : the target branch ('.$targetBranch.') must be a parseable number like 2.0-dev';
unset($this->config['extra']['branch-alias'][$sourceBranch]); unset($this->config['extra']['branch-alias'][$sourceBranch]);
} }
} }