From ccea1b95a86c39bc19d29ab272a9d3ef257fb3ae Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Wed, 3 Jun 2020 10:43:18 +0200
Subject: [PATCH] Fix pretty constraint for --with overrides

---
 src/Composer/Command/UpdateCommand.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Composer/Command/UpdateCommand.php b/src/Composer/Command/UpdateCommand.php
index 516b6f472..9576b141f 100644
--- a/src/Composer/Command/UpdateCommand.php
+++ b/src/Composer/Command/UpdateCommand.php
@@ -293,14 +293,14 @@ EOT
     {
         $parser = new VersionParser;
         $oldPrettyString = $link->getConstraint()->getPrettyString();
-        $newConstraint = MultiConstraint::create(array($link->getConstraint(), $parser->parseConstraints($constraint)));
-        $newConstraint->setPrettyString($oldPrettyString.' && '.$constraint);
+        $newConstraint = MultiConstraint::create(array($link->getConstraint(), $parser->parseConstraints($constraint)), true);
+        $newConstraint->setPrettyString($oldPrettyString.', '.$constraint);
         return new Link(
             $link->getSource(),
             $link->getTarget(),
             $newConstraint,
             $link->getDescription(),
-            $link->getPrettyConstraint() . ' && ' . $constraint
+            $link->getPrettyConstraint() . ', ' . $constraint
         );
     }
 }