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

#11032
composer · Aug 30, 2022 · 2d48c7d · stof · Aug 30, 2022 · Seldaek
1 parent 13421f7
commit 2d48c7d
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 2 deletions.
diff --git a/src/Composer/Command/ShowCommand.php b/src/Composer/Command/ShowCommand.php
@@ -1356,8 +1356,8 @@ private function findLatestPackage(PackageInterface $package, Composer $composer
         }
 
         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) {

diff --git a/tests/Composer/Test/Command/ShowCommandTest.php b/tests/Composer/Test/Command/ShowCommandTest.php
@@ -192,6 +192,61 @@ public function testShowPlatformOnlyShowsPlatformPackages(): void
         }
     }
 
+    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([