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

Fix pretty constraint for --with overrides

pull/8944/head
Jordi Boggiano 2020-06-03 10:43:18 +02:00
parent 7507b87fb3
commit ccea1b95a8
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Composer/Command/UpdateCommand.php
View File

@ -293,14 +293,14 @@ EOT
{ {
$parser = new VersionParser; $parser = new VersionParser;
$oldPrettyString = $link->getConstraint()->getPrettyString(); $oldPrettyString = $link->getConstraint()->getPrettyString();
$newConstraint = MultiConstraint::create(array($link->getConstraint(), $parser->parseConstraints($constraint))); $newConstraint = MultiConstraint::create(array($link->getConstraint(), $parser->parseConstraints($constraint)), true);
$newConstraint->setPrettyString($oldPrettyString.' && '.$constraint); $newConstraint->setPrettyString($oldPrettyString.', '.$constraint);
return new Link( return new Link(
$link->getSource(), $link->getSource(),
$link->getTarget(), $link->getTarget(),
$newConstraint, $newConstraint,
$link->getDescription(), $link->getDescription(),
$link->getPrettyConstraint() . ' && ' . $constraint $link->getPrettyConstraint() . ', ' . $constraint
); );
} }
} }