Remove overlapping individual versions too

ergebnis · Oct 10, 2023 · fd5c06f · fd5c06f
1 parent 5a926b5
commit fd5c06f
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -531,7 +531,7 @@ sections, the `Vendor\Composer\VersionConstraintNormalizer` will ensure that
    {
      "homepage": "https://getcomposer.org/doc/articles/versions.md#version-range",
      "require": {
-  -    "foo/bar": "^1.0 || ^1.1 || ^2.0"
+  -    "foo/bar": "^1.0 || ^1.1 || ^2.0 || ~2.1.0 || 2.4.5"
   +    "foo/bar": "^1.0 || ^2.0"
    }
   ```

diff --git a/src/Vendor/Composer/VersionConstraintNormalizer.php b/src/Vendor/Composer/VersionConstraintNormalizer.php
@@ -173,7 +173,7 @@ private static function removeOverlappingVersionConstraints(string $versionConst
     {
         $orConstraints = self::splitIntoOrConstraints($versionConstraint);
 
-        $regex = '{^[~^]\d+(?:\.\d+)*$}';
+        $regex = '{^[~^]?\d+(?:\.\d+)*$}';
 
         $count = \count($orConstraints);
 

diff --git a/.../Yes/HasNormalizedVersionConstraints/No/Combination/Or/VersionRange/Mixed/normalized.json b/.../Yes/HasNormalizedVersionConstraints/No/Combination/Or/VersionRange/Mixed/normalized.json
@@ -0,0 +1,9 @@
+{
+    "homepage": "https://getcomposer.org/doc/articles/versions.md#version-range",
+    "value-contains-packages-and-version-constraints": {
+        "combination-or-version-range-mixed/01": "^1.2",
+        "combination-or-version-range-mixed/02": "^1.2",
+        "combination-or-version-range-mixed/03": "^1.2",
+        "combination-or-version-range-mixed/04": "1.2.1 || ~1.2.3"
+    }
+}
diff --git a/...es/Yes/HasNormalizedVersionConstraints/No/Combination/Or/VersionRange/Mixed/original.json b/...es/Yes/HasNormalizedVersionConstraints/No/Combination/Or/VersionRange/Mixed/original.json
@@ -0,0 +1,9 @@
+{
+  "homepage": "https://getcomposer.org/doc/articles/versions.md#version-range",
+  "value-contains-packages-and-version-constraints": {
+    "combination-or-version-range-mixed/01": "1.2.3 || ^1.2",
+    "combination-or-version-range-mixed/02": "~1.2.3 || ^1.2",
+    "combination-or-version-range-mixed/03": "1.2.3 || ~1.2.1 || ^1.2",
+    "combination-or-version-range-mixed/04": "~1.2.3 || 1.2.1 || 1.2.4"
+  }
+}