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

Fix handling of zero-major versions in outdated --major-only flag, fixes #11032

pull/11038/head
Jordi Boggiano 2022-08-30 20:45:07 +02:00
parent 13421f7d66
commit 2d48c7dbb0
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 57 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Composer/Command/ShowCommand.php
View File

@ -1356,8 +1356,8 @@ EOT
}
if ($targetVersion === null) {
if ($majorOnly && Preg::isMatch('{^(\d+)\.}', $package->getVersion(), $match)) {
$targetVersion = '>='.($match[1] + 1).',<9999999-dev';
if ($majorOnly && Preg::isMatch('{^(?P<zero_major>0\.)?(?P<first_meaningful>\d+)\.}', $package->getVersion(), $match)) {
$targetVersion = '>='.$match['zero_major'].($match['first_meaningful'] + 1).',<9999999-dev';
}
if ($minorOnly) {

55
tests/Composer/Test/Command/ShowCommandTest.php
View File

@ -192,6 +192,61 @@ outdated/patch 1.0.0 <highlight>! 1.0.1</highlight>',
}
}
public function testOutdatedWithZeroMajor(): void
{
$this->initTempComposer([
'repositories' => [
'packages' => [
'type' => 'package',
'package' => [
['name' => 'zero/major', 'description' => 'generic description', 'version' => '0.1.0'],
['name' => 'zero/major', 'description' => 'generic description', 'version' => '0.2.0'],
['name' => 'zero/minor', 'description' => 'generic description', 'version' => '0.1.0'],
['name' => 'zero/minor', 'description' => 'generic description', 'version' => '0.1.2'],
['name' => 'zero/patch', 'description' => 'generic description', 'version' => '0.1.2'],
['name' => 'zero/patch', 'description' => 'generic description', 'version' => '0.1.2.1'],
],
],
],
'require' => [
'zero/major' => '^0.1',
'zero/minor' => '^0.1',
'zero/patch' => '^0.1',
],
]);
$this->createInstalledJson([
$this->getPackage('zero/major', '0.1.0'),
$this->getPackage('zero/minor', '0.1.0'),
$this->getPackage('zero/patch', '0.1.2'),
]);
$appTester = $this->getApplicationTester();
$appTester->run(['command' => 'outdated', '--direct' => true, '--patch-only' => true]);
self::assertSame(
'Legend:
! patch or minor release available - update recommended
~ major release available - update possible
zero/patch 0.1.2 <highlight>! 0.1.2.1</highlight>', trim($appTester->getDisplay(true)));
$appTester = $this->getApplicationTester();
$appTester->run(['command' => 'outdated', '--direct' => true, '--minor-only' => true]);
self::assertSame(
'Legend:
! patch or minor release available - update recommended
~ major release available - update possible
zero/minor 0.1.0 <highlight>! 0.1.2 </highlight>
zero/patch 0.1.2 <highlight>! 0.1.2.1</highlight>', trim($appTester->getDisplay(true)));
$appTester = $this->getApplicationTester();
$appTester->run(['command' => 'outdated', '--direct' => true, '--major-only' => true]);
self::assertSame(
'Legend:
! patch or minor release available - update recommended
~ major release available - update possible
zero/major 0.1.0 ~ 0.2.0', trim($appTester->getDisplay(true)));
}
public function testShowAllShowsAllSections(): void
{
$this->initTempComposer([