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

Merge branch '2.3'

pull/10960/head
Jordi Boggiano 2022-07-20 22:47:44 +02:00
parent 26e01abfae e815e0113a
commit 03e4d19266
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Composer/IO/ConsoleIO.php
View File

@ -43,7 +43,7 @@ class ConsoleIO extends BaseIO
/** @var float */
private $startTime;
/** @var array<int, int> */
/** @var array<IOInterface::*, OutputInterface::VERBOSITY_*> */
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) {

2
src/Composer/Util/Hg.php
View File

@ -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];
}
}