Fix handling for double-zero prefix, refs #11032

composer · Aug 31, 2022 · 3177b21 · 3177b21
1 parent 2d48c7d
commit 3177b21
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Composer/Command/ShowCommand.php b/src/Composer/Command/ShowCommand.php
@@ -1356,7 +1356,7 @@ private function findLatestPackage(PackageInterface $package, Composer $composer
         }
 
         if ($targetVersion === null) {
-            if ($majorOnly && Preg::isMatch('{^(?P<zero_major>0\.)?(?P<first_meaningful>\d+)\.}', $package->getVersion(), $match)) {
+            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';
             }
 

diff --git a/tests/Composer/Test/Command/ShowCommandTest.php b/tests/Composer/Test/Command/ShowCommandTest.php
@@ -199,6 +199,8 @@ public function testOutdatedWithZeroMajor(): void
                 'packages' => [
                     'type' => 'package',
                     'package' => [
+                        ['name' => 'zerozero/major', 'description' => 'generic description', 'version' => '0.0.1'],
+                        ['name' => 'zerozero/major', 'description' => 'generic description', 'version' => '0.0.2'],
                         ['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'],
@@ -209,13 +211,15 @@ public function testOutdatedWithZeroMajor(): void
                 ],
             ],
             'require' => [
+                'zerozero/major' => '^0.0.1',
                 'zero/major' => '^0.1',
                 'zero/minor' => '^0.1',
                 'zero/patch' => '^0.1',
             ],
         ]);
 
         $this->createInstalledJson([
+            $this->getPackage('zerozero/major', '0.0.1'),
             $this->getPackage('zero/major', '0.1.0'),
             $this->getPackage('zero/minor', '0.1.0'),
             $this->getPackage('zero/patch', '0.1.2'),
@@ -244,7 +248,8 @@ public function testOutdatedWithZeroMajor(): void
 '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)));
+zero/major     0.1.0 ~ 0.2.0
+zerozero/major 0.0.1 ~ 0.0.2', trim($appTester->getDisplay(true)));
     }
 
     public function testShowAllShowsAllSections(): void