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

Fixup

pull/10893/head
Jordi Boggiano 2022-06-22 13:09:13 +02:00
parent 53680afb85
commit d132b9e6fd
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Composer/Command/DiagnoseCommand.php
View File

@ -238,14 +238,14 @@ EOT
}
$gitVersion = Git::getVersion($this->process);
if (version_compare('2.24.0', $gitVersion, '>')) {
return '<warning>Your git version ('.$gitVersion.') is too old and possibly will cause issues. Please upgrade to git 2.24 or above</>';
}
if (null === $gitVersion) {
return '<comment>No git process found</>';
}
if (version_compare('2.24.0', $gitVersion, '>')) {
return '<warning>Your git version ('.$gitVersion.') is too old and possibly will cause issues. Please upgrade to git 2.24 or above</>';
}
return '<info>OK</> <comment>git version '.$gitVersion.'</>';
}

6
tests/Composer/Test/Command/DiagnoseCommandTest.php
View File

@ -29,8 +29,7 @@ class DiagnoseCommandTest extends TestCase
$this->assertStringContainsString('Checking composer.json: <warning>WARNING</warning>
<warning>No license specified, it is recommended to do so. For closed-source software you may use "proprietary" as license.</warning>', $output);
$this->assertStringContainsString('Checking git settings: OK
Checking http connectivity to packagist: OK
$this->assertStringContainsString('Checking http connectivity to packagist: OK
Checking https connectivity to packagist: OK
Checking github.com rate limit: ', $output);
}
@ -47,8 +46,7 @@ Checking github.com rate limit: ', $output);
$output = $appTester->getDisplay(true);
$this->assertStringContainsString('Checking composer.json: OK', $output);
$this->assertStringContainsString('Checking git settings: OK
Checking http connectivity to packagist: OK
$this->assertStringContainsString('Checking http connectivity to packagist: OK
Checking https connectivity to packagist: OK
Checking github.com rate limit: ', $output);
}