Account for 1.x.x usage too

ergebnis · Feb 17, 2024 · 227bf02 · 227bf02
1 parent c412f5b
commit 227bf02
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 4 deletions.
diff --git a/src/Vendor/Composer/VersionConstraintNormalizer.php b/src/Vendor/Composer/VersionConstraintNormalizer.php
@@ -122,6 +122,21 @@ private static function normalizeVersionConstraintSeparators(string $versionCons
 
     private static function replaceWildcardXWithAsterisk(string $versionConstraint): string
     {
+        // '1.x.x' -> '1.*'
+        $versionConstraint = self::applyRegularExpressionReplacementToVersionsInTurn(
+            $versionConstraint,
+            '{^(\d+)\.[xX]\.[xX]$}',
+            '$1.*',
+        );
+
+        // '1.x' -> '1.*'
+        $versionConstraint = self::applyRegularExpressionReplacementToVersionsInTurn(
+            $versionConstraint,
+            '{^(\d+)\.[xX]$}',
+            '$1.*',
+        );
+
+        // 'x' -> '*'
         return self::applyRegularExpressionReplacementToVersionsInTurn(
             $versionConstraint,
             '{^[xX]$}',

diff --git a/...tries/Yes/HasNormalizedVersionConstraints/No/VersionRange/Wildcard/Stable/normalized.json b/...tries/Yes/HasNormalizedVersionConstraints/No/VersionRange/Wildcard/Stable/normalized.json
@@ -8,6 +8,10 @@
         "version-range-wildcard-stable/05-major-minor-patch-trimmed": "~1.2.0",
         "version-range-wildcard-stable/06-major-minor-patch-untrimmed": "~1.2.0",
         "version-range-wildcard-stable/07-major-minor-patch-lower-x": "~1.2.0",
-        "version-range-wildcard-stable/08-major-minor-patch-upper-X": "~1.2.0"
+        "version-range-wildcard-stable/08-major-minor-patch-upper-X": "~1.2.0",
+        "version-range-wildcard-stable/09-major-minor-patch-lower-x": "^1.0",
+        "version-range-wildcard-stable/10-major-minor-patch-upper-X": "^1.0",
+        "version-range-wildcard-stable/11-major-minor-patch-mixed-xX": "^1.0",
+        "version-range-wildcard-stable/12-major-minor-patch-mixed-Xx": "^1.0"
     }
 }
diff --git a/...Entries/Yes/HasNormalizedVersionConstraints/No/VersionRange/Wildcard/Stable/original.json b/...Entries/Yes/HasNormalizedVersionConstraints/No/VersionRange/Wildcard/Stable/original.json
@@ -8,6 +8,10 @@
     "version-range-wildcard-stable/05-major-minor-patch-trimmed": "1.2.*",
     "version-range-wildcard-stable/06-major-minor-patch-untrimmed": " 1.2.* ",
     "version-range-wildcard-stable/07-major-minor-patch-lower-x": "1.2.x",
-    "version-range-wildcard-stable/08-major-minor-patch-upper-X": "1.2.X"
+    "version-range-wildcard-stable/08-major-minor-patch-upper-X": "1.2.X",
+    "version-range-wildcard-stable/09-major-minor-patch-lower-x": "1.x.x",
+    "version-range-wildcard-stable/10-major-minor-patch-upper-X": "1.X.X",
+    "version-range-wildcard-stable/11-major-minor-patch-mixed-xX": "1.x.X",
+    "version-range-wildcard-stable/12-major-minor-patch-mixed-Xx": "1.X.x"
   }
 }
diff --git a/...ies/Yes/HasNormalizedVersionConstraints/No/VersionRange/Wildcard/Unstable/normalized.json b/...ies/Yes/HasNormalizedVersionConstraints/No/VersionRange/Wildcard/Unstable/normalized.json
@@ -8,6 +8,10 @@
         "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/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"
     }
 }
diff --git a/...tries/Yes/HasNormalizedVersionConstraints/No/VersionRange/Wildcard/Unstable/original.json b/...tries/Yes/HasNormalizedVersionConstraints/No/VersionRange/Wildcard/Unstable/original.json
@@ -8,6 +8,10 @@
     "version-range-wildcard-unstable/05-major-minor-patch-trimmed": "0.1.*",
     "version-range-wildcard-unstable/06-major-minor-patch-untrimmed": " 0.1.* ",
     "version-range-wildcard-unstable/07-major-minor-patch-lower-x": "0.1.x",
-    "version-range-wildcard-unstable/08-major-minor-patch-upper-X": "0.1.X"
+    "version-range-wildcard-unstable/08-major-minor-patch-upper-X": "0.1.X",
+    "version-range-wildcard-unstable/09-major-minor-patch-lower-x": "0.x.x",
+    "version-range-wildcard-unstable/10-major-minor-patch-upper-X": "0.X.X",
+    "version-range-wildcard-unstable/11-major-minor-patch-mixed-xX": "0.x.X",
+    "version-range-wildcard-unstable/12-major-minor-patch-mixed-Xx": "0.X.x"
   }
 }