From 459a7d96235527d7cad9ab79ea45efb2982b9232 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Mon, 17 May 2021 14:36:46 +0200
Subject: [PATCH] Use a simpler suggested require version of * to keep things
 simple for extensions which are versioned like PHP, fixes #9483

---
 src/Composer/Package/Version/VersionSelector.php     | 10 ++++++++++
 .../Test/Package/Version/VersionSelectorTest.php     | 12 ++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/Composer/Package/Version/VersionSelector.php b/src/Composer/Package/Version/VersionSelector.php
index 320850a1d..ab5355d1a 100644
--- a/src/Composer/Package/Version/VersionSelector.php
+++ b/src/Composer/Package/Version/VersionSelector.php
@@ -153,6 +153,16 @@ class VersionSelector
      */
     public function findRecommendedRequireVersion(PackageInterface $package)
     {
+        // Extensions which are versioned in sync with PHP should rather be required as "*" to simplify
+        // the requires and have only one required version to change when bumping the php requirement
+        if (0 === strpos($package->getName(), 'ext-')) {
+            $phpVersion = PHP_MAJOR_VERSION . '.' . PHP_MINOR_VERSION . '.' . PHP_RELEASE_VERSION;
+            $extVersion = implode('.', array_slice(explode('.', $package->getVersion()), 0, 3));
+            if ($phpVersion === $extVersion) {
+                return '*';
+            }
+        }
+
         $version = $package->getVersion();
         if (!$package->isDev()) {
             return $this->transformVersion($version, $package->getPrettyVersion(), $package->getStability());
diff --git a/tests/Composer/Test/Package/Version/VersionSelectorTest.php b/tests/Composer/Test/Package/Version/VersionSelectorTest.php
index 2aff79fcc..2dc840793 100644
--- a/tests/Composer/Test/Package/Version/VersionSelectorTest.php
+++ b/tests/Composer/Test/Package/Version/VersionSelectorTest.php
@@ -270,7 +270,7 @@ class VersionSelectorTest extends TestCase
     /**
      * @dataProvider getRecommendedRequireVersionPackages
      */
-    public function testFindRecommendedRequireVersion($prettyVersion, $isDev, $stability, $expectedVersion, $branchAlias = null)
+    public function testFindRecommendedRequireVersion($prettyVersion, $isDev, $stability, $expectedVersion, $branchAlias = null, $packageName = null)
     {
         $repositorySet = $this->createMockRepositorySet();
         $versionSelector = new VersionSelector($repositorySet);
@@ -281,6 +281,10 @@ class VersionSelectorTest extends TestCase
             ->expects($this->any())
             ->method('getPrettyVersion')
             ->will($this->returnValue($prettyVersion));
+        $package
+            ->expects($this->any())
+            ->method('getName')
+            ->will($this->returnValue($packageName));
         $package
             ->expects($this->any())
             ->method('getVersion')
@@ -312,7 +316,7 @@ class VersionSelectorTest extends TestCase
     public function getRecommendedRequireVersionPackages()
     {
         return array(
-            // real version, is dev package, stability, expected recommendation, [branch-alias]
+            // real version, is dev package, stability, expected recommendation, [branch-alias], [pkg name]
             array('1.2.1', false, 'stable', '^1.2'),
             array('1.2', false, 'stable', '^1.2'),
             array('v1.2.1', false, 'stable', '^1.2'),
@@ -342,6 +346,10 @@ class VersionSelectorTest extends TestCase
             // numeric alias
             array('3.x-dev', true, 'dev', '^3.0@dev', '3.0.x-dev'),
             array('3.x-dev', true, 'dev', '^3.0@dev', '3.0-dev'),
+            // ext in sync with php
+            array(PHP_MAJOR_VERSION . '.' . PHP_MINOR_VERSION . '.' . PHP_RELEASE_VERSION, false, 'stable', '*', null, 'ext-filter'),
+            // ext versioned individually
+            array('3.0.5', false, 'stable', '^3.0', null, 'ext-xdebug'),
         );
     }