Skip to content

Treat unstable versions with tilde specially #1247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fredden wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Treat unstable versions with tilde specially #1247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion src/Vendor/Composer/VersionConstraintNormalizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,31 @@ private static function replaceWildcardWithTilde(string $versionConstraint): str

private static function replaceTildeWithCaret(string $versionConstraint): string
{
// Remove any leading zeros from tilde version numbers. This simplifies the following steps.
$versionConstraint = self::applyRegularExpressionReplacementToVersionsInTurn(
$versionConstraint,
'{^~0*(\d)}',
'~$1',
);

// ~0 and ^0 are equivalent.
// ~1 and ^1 are equivalent.
$versionConstraint = self::applyRegularExpressionReplacementToVersionsInTurn(
$versionConstraint,
'{^~(\d+)$}',
'^$1',
);

// ~0.1 and ^0.1 are NOT equivalent.
// ~1.1 and ^1.1 are equivalent.
return self::applyRegularExpressionReplacementToVersionsInTurn(
$versionConstraint,
'{^~(\d+(?:\.\d+)?)$}',
'{^~([1-9]\d*\.\d+)$}',
'^$1',
);

// ~0.1.2 and ^0.1.2 are equivalent. HOWEVER, the former is more clear regarding behaviour.
// ~1.2.3 and ^1.2.3 are NOT equivalent.
}

private static function removeDuplicateVersionConstraints(string $versionConstraint): string
Expand Down
4 changes: 2 additions & 2 deletions ...HasEntries/Yes/HasNormalizedVersionConstraints/No/LeadingV/Tilde/Unstable/normalized.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"value-contains-packages-and-version-constraints": {
"leading-v-tilde-unstable/01-major-trimmed": "^0",
"leading-v-tilde-unstable/02-major-untrimmed": "^0",
"leading-v-tilde-unstable/03-major-minor-trimmed": "^0.1",
"leading-v-tilde-unstable/04-major-minor-untrimmed": "^0.1",
"leading-v-tilde-unstable/03-major-minor-trimmed": "~0.1",
"leading-v-tilde-unstable/04-major-minor-untrimmed": "~0.1",
"leading-v-tilde-unstable/05-major-minor-patch-trimmed": "~0.1.2",
"leading-v-tilde-unstable/06-major-minor-patch-untrimmed": "~0.1.2"
}
Expand Down
4 changes: 2 additions & 2 deletions ...Entries/Yes/HasNormalizedVersionConstraints/No/LeadingV/Wildcard/Unstable/normalized.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"homepage": "https://getcomposer.org/doc/articles/versions.md#wildcard-version-range-",
"value-contains-packages-and-version-constraints": {
"leading-v-wildcard-unstable/01-major-minor-trimmed": "^0.0",
"leading-v-wildcard-unstable/02-major-minor-untrimmed": "^0.0",
"leading-v-wildcard-unstable/01-major-minor-trimmed": "~0.0",
"leading-v-wildcard-unstable/02-major-minor-untrimmed": "~0.0",
"leading-v-wildcard-unstable/03-major-minor-patch-trimmed": "~0.1.0",
"leading-v-wildcard-unstable/04-major-minor-patch-untrimmed": "~0.1.0"
}
Expand Down
5 changes: 4 additions & 1 deletion ...sEntries/Yes/HasNormalizedVersionConstraints/No/VersionRange/Tilde/Stable/normalized.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
"version-range-tilde-stable/03-major-minor-trimmed": "^1.2",
"version-range-tilde-stable/04-major-minor-untrimmed": "^1.2",
"version-range-tilde-stable/05-major-minor-patch-trimmed": "~1.2.3",
"version-range-tilde-stable/06-major-minor-patch-untrimmed": "~1.2.3"
"version-range-tilde-stable/06-major-minor-patch-untrimmed": "~1.2.3",
"version-range-tilde-stable/07-leading-zero-major": "^7",
"version-range-tilde-stable/08-leading-zero-minor": "^5.2",
"version-range-tilde-stable/09-leading-zero-patch": "~3.2.1"
}
}
5 changes: 4 additions & 1 deletion ...HasEntries/Yes/HasNormalizedVersionConstraints/No/VersionRange/Tilde/Stable/original.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
"version-range-tilde-stable/03-major-minor-trimmed": " ~1.2 ",
"version-range-tilde-stable/04-major-minor-untrimmed": " ~1.2 ",
"version-range-tilde-stable/05-major-minor-patch-trimmed": "~1.2.3",
"version-range-tilde-stable/06-major-minor-patch-untrimmed": " ~1.2.3 "
"version-range-tilde-stable/06-major-minor-patch-untrimmed": " ~1.2.3 ",
"version-range-tilde-stable/07-leading-zero-major": "~007",
"version-range-tilde-stable/08-leading-zero-minor": "~05.2",
"version-range-tilde-stable/09-leading-zero-patch": "~03.2.1"
}
}
9 changes: 6 additions & 3 deletions ...ntries/Yes/HasNormalizedVersionConstraints/No/VersionRange/Tilde/Unstable/normalized.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@
"value-contains-packages-and-version-constraints": {
"version-range-tilde-unstable/01-major-trimmed": "^0",
"version-range-tilde-unstable/02-major-untrimmed": "^0",
"version-range-tilde-unstable/03-major-minor-trimmed": "^0.1",
"version-range-tilde-unstable/04-major-minor-untrimmed": "^0.1",
"version-range-tilde-unstable/03-major-minor-trimmed": "~0.1",
"version-range-tilde-unstable/04-major-minor-untrimmed": "~0.1",
"version-range-tilde-unstable/05-major-minor-patch-trimmed": "~0.1.2",
"version-range-tilde-unstable/06-major-minor-patch-untrimmed": "~0.1.2"
"version-range-tilde-unstable/06-major-minor-patch-untrimmed": "~0.1.2",
"version-range-tilde-unstable/07-leading-zero-major": "^0",
"version-range-tilde-unstable/08-leading-zero-minor": "~0.1",
"version-range-tilde-unstable/09-leading-zero-patch": "~0.1.2"
}
}
5 changes: 4 additions & 1 deletion ...sEntries/Yes/HasNormalizedVersionConstraints/No/VersionRange/Tilde/Unstable/original.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
"version-range-tilde-unstable/03-major-minor-trimmed": " ~0.1 ",
"version-range-tilde-unstable/04-major-minor-untrimmed": " ~0.1 ",
"version-range-tilde-unstable/05-major-minor-patch-trimmed": "~0.1.2",
"version-range-tilde-unstable/06-major-minor-patch-untrimmed": " ~0.1.2 "
"version-range-tilde-unstable/06-major-minor-patch-untrimmed": " ~0.1.2 ",
"version-range-tilde-unstable/07-leading-zero-major": "~00",
"version-range-tilde-unstable/08-leading-zero-minor": "~00.1",
"version-range-tilde-unstable/09-leading-zero-patch": "~00.1.2"
}
}
16 changes: 8 additions & 8 deletions ...ies/Yes/HasNormalizedVersionConstraints/No/VersionRange/Wildcard/Unstable/normalized.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"homepage": "https://getcomposer.org/doc/articles/versions.md#wildcard-version-range-",
"value-contains-packages-and-version-constraints": {
"version-range-wildcard-unstable/01-major-minor-trimmed": "^0.0",
"version-range-wildcard-unstable/02-major-minor-untrimmed": "^0.0",
"version-range-wildcard-unstable/03-major-minor-lower-x": "^0.0",
"version-range-wildcard-unstable/04-major-minor-upper-X": "^0.0",
"version-range-wildcard-unstable/01-major-minor-trimmed": "~0.0",
"version-range-wildcard-unstable/02-major-minor-untrimmed": "~0.0",
"version-range-wildcard-unstable/03-major-minor-lower-x": "~0.0",
"version-range-wildcard-unstable/04-major-minor-upper-X": "~0.0",
"version-range-wildcard-unstable/05-major-minor-patch-trimmed": "~0.1.0",
"version-range-wildcard-unstable/06-major-minor-patch-untrimmed": "~0.1.0",
"version-range-wildcard-unstable/07-major-minor-patch-lower-x": "~0.1.0",
"version-range-wildcard-unstable/08-major-minor-patch-upper-X": "~0.1.0",
"version-range-wildcard-unstable/09-major-minor-patch-lower-x": "^0.0",
"version-range-wildcard-unstable/10-major-minor-patch-upper-X": "^0.0",
"version-range-wildcard-unstable/11-major-minor-patch-mixed-xX": "^0.0",
"version-range-wildcard-unstable/12-major-minor-patch-mixed-Xx": "^0.0"
"version-range-wildcard-unstable/09-major-minor-patch-lower-x": "~0.0",
"version-range-wildcard-unstable/10-major-minor-patch-upper-X": "~0.0",
"version-range-wildcard-unstable/11-major-minor-patch-mixed-xX": "~0.0",
"version-range-wildcard-unstable/12-major-minor-patch-mixed-Xx": "~0.0"
}
}
Loading