public-mirrors/composer
1
0
Fork 0
mirror of https://github.com/composer/composer synced 2025-05-09 00:22:53 +00:00
Code Activity

Merge branch '1.10'

Browse source
This commit is contained in:
Jordi Boggiano 2020-10-08 14:33:36 +02:00
commit 03b8c3db3f
No known key found for this signature in database
GPG key ID: 7BBD42C429EC80BC
7 changed files with 89 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/Composer/Test/Package/Loader/RootPackageLoaderTest.php
View file

@ -137,7 +137,7 @@ class RootPackageLoaderTest extends TestCase
->expects($this->at(0))
->method('execute')
->willReturnCallback(function ($command, &$output) use ($self) {
$self->assertEquals('git branch --no-color --no-abbrev -v', $command);
$self->assertEquals('git branch -a --no-color --no-abbrev -v', $command);
$output = "* latest-production 38137d2f6c70e775e137b2d8a7a7d3eaebf7c7e5 Commit message\n master 4f6ed96b0bc363d2aa4404c3412de1c011f67c66 Commit message\n";
return 0;
@ -187,7 +187,7 @@ class RootPackageLoaderTest extends TestCase
->expects($this->at(0))
->method('execute')
->willReturnCallback(function ($command, &$output) use ($self) {
$self->assertEquals('git branch --no-color --no-abbrev -v', $command);
$self->assertEquals('git branch -a --no-color --no-abbrev -v', $command);
$output = "* latest-production 38137d2f6c70e775e137b2d8a7a7d3eaebf7c7e5 Commit message\n master 4f6ed96b0bc363d2aa4404c3412de1c011f67c66 Commit message\n";
return 0;