From 1a2bd387640930442b54058e40d9d39538b5111c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=B2=A0=5F=E0=B2=A0?= Date: Thu, 31 Aug 2023 11:05:49 +0200 Subject: [PATCH] allow bumping for patch level version constraints fixes #11579 (#11590) --- src/Composer/Package/Version/VersionBumper.php | 6 ++++-- tests/Composer/Test/Package/Version/VersionBumperTest.php | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Composer/Package/Version/VersionBumper.php b/src/Composer/Package/Version/VersionBumper.php index 1129efaa0..690dfbeed 100644 --- a/src/Composer/Package/Version/VersionBumper.php +++ b/src/Composer/Package/Version/VersionBumper.php @@ -83,7 +83,7 @@ class VersionBumper (?<=,|\ |\||^) # leading separator (?P \^'.$major.'(?:\.\d+)* # e.g. ^2.anything - | ~'.$major.'(?:\.\d+)? # e.g. ~2 or ~2.2 but no more + | ~'.$major.'(?:\.\d+){0,2} # e.g. ~2 or ~2.2 or ~2.2.2 but no more | '.$major.'(?:\.[*x])+ # e.g. 2.* or 2.*.* or 2.x.x.x etc | >=\d(?:\.\d+)* # e.g. >=2 or >=1.2 etc ) @@ -97,7 +97,9 @@ class VersionBumper if (substr_count($match[0], '.') === 2 && substr_count($versionWithoutSuffix, '.') === 1) { $suffix = '.0'; } - if (str_starts_with($match[0], '>=')) { + if (str_starts_with($match[0], '~') && substr_count($match[0], '.') === 2) { + $replacement = '~'.$versionWithoutSuffix.$suffix; + } elseif (str_starts_with($match[0], '>=')) { $replacement = '>='.$versionWithoutSuffix.$suffix; } else { $replacement = $newPrettyConstraint.$suffix; diff --git a/tests/Composer/Test/Package/Version/VersionBumperTest.php b/tests/Composer/Test/Package/Version/VersionBumperTest.php index 1a53a898d..b8f07844f 100644 --- a/tests/Composer/Test/Package/Version/VersionBumperTest.php +++ b/tests/Composer/Test/Package/Version/VersionBumperTest.php @@ -63,7 +63,8 @@ class VersionBumperTest extends TestCase yield 'leave minor wildcard alone' => ['2.4.*', '2.4.3', '2.4.*']; yield 'leave patch wildcard alone' => ['2.4.3.*', '2.4.3.2', '2.4.3.*']; yield 'upgrade tilde to caret when compatible' => ['~2.2', '2.4.3', '^2.4.3']; - yield 'leave patch-only-tilde alone' => ['~2.2.3', '2.2.6', '~2.2.3']; + yield 'update patch-only-tilde alone' => ['~2.2.3', '2.2.6', '~2.2.6']; + yield 'leave extra-only-tilde alone' => ['~2.2.3.1', '2.2.4.5', '~2.2.3.1']; yield 'upgrade bigger-or-eq to latest' => ['>=3.0', '3.4.5', '>=3.4.5']; yield 'leave bigger-than untouched' => ['>2.2.3', '2.2.6', '>2.2.3']; }