diff --git a/src/Composer/IO/ConsoleIO.php b/src/Composer/IO/ConsoleIO.php index 5ad647a20..717c47756 100644 --- a/src/Composer/IO/ConsoleIO.php +++ b/src/Composer/IO/ConsoleIO.php @@ -43,7 +43,7 @@ class ConsoleIO extends BaseIO /** @var float */ private $startTime; - /** @var array */ + /** @var array */ private $verbosityMap; /** @@ -166,11 +166,7 @@ class ConsoleIO extends BaseIO } if ($raw) { - if ($sfVerbosity === OutputInterface::OUTPUT_NORMAL) { - $sfVerbosity = OutputInterface::OUTPUT_RAW; - } else { - $sfVerbosity |= OutputInterface::OUTPUT_RAW; - } + $sfVerbosity |= OutputInterface::OUTPUT_RAW; } if (null !== $this->startTime) { diff --git a/src/Composer/Util/Hg.php b/src/Composer/Util/Hg.php index 8c2412239..76d063dbe 100644 --- a/src/Composer/Util/Hg.php +++ b/src/Composer/Util/Hg.php @@ -107,7 +107,7 @@ class Hg { if (false === self::$version) { self::$version = null; - if (0 === $process->execute('hg --version', $output) && Preg::isMatch('/^.+? (\d+(?:\.\d+)+)\)?\r?\n/', $output, $matches)) { + if (0 === $process->execute('hg --version', $output) && Preg::isMatch('/^.+? (\d+(?:\.\d+)+)(?:\+.*?)?\)?\r?\n/', $output, $matches)) { self::$version = $matches[1]; } }