Be more strict with Composer version constraints

CHANGELOG.md

@@ -11,6 +11,7 @@ For a full diff see [`4.1.0...main`][4.1.0...main].
 ### Changed
 
 - Dropped support for PHP 8.0 ([#917]), by [@localheinz]
+- Adjusted `Vendor\Composer\VersionConstraintNormalizer` to prefer tilde operators (`~`) over wildcard operators (`*`), and caret operators (`^`) over tilde operators (`~`) ([#756]), by [@fredden]
 
 ## [`4.1.0`][4.1.0]
 
@@ -592,6 +593,7 @@ For a full diff see [`5d8b3e2...0.1.0`][5d8b3e2...0.1.0].
 [#698]: https://github.com/ergebnis/json-normalizer/pull/698
 [#705]: https://github.com/ergebnis/json-normalizer/pull/705
 [#723]: https://github.com/ergebnis/json-normalizer/pull/723
+[#756]: https://github.com/ergebnis/json-normalizer/pull/756
 [#757]: https://github.com/ergebnis/json-normalizer/pull/757
 [#772]: https://github.com/ergebnis/json-normalizer/pull/772
 [#774]: https://github.com/ergebnis/json-normalizer/pull/774

README.md

@@ -534,6 +534,31 @@ sections, the `Vendor\Composer\VersionConstraintNormalizer` will ensure that
    }
   ```
 
+- tilde operators (`~`) are preferred over wildcard (`*`) version ranges
+
+  ```diff
+   {
+     "homepage": "https://getcomposer.org/doc/articles/versions.md#version-range",
+     "require": {
+       "foo/bar": "*",
+  -    "foo/baz": "1.0.*"
+  +    "foo/baz": "~1.0.0"
+   }
+  ```
+
+- caret operators are preferred over tilde operators
+
+  ```diff
+   {
+     "homepage": "https://getcomposer.org/doc/articles/versions.md#version-range",
+     "require": {
+  -    "foo/bar": "~1",
+  -    "foo/baz": "~1.3"
+  +    "foo/bar": "^1.0",
+  +    "foo/baz": "^1.3"
+   }
+  ```
+
 - version numbers are sorted in ascending order
 
   ```diff

src/Vendor/Composer/VersionConstraintNormalizer.php

@@ -82,6 +82,8 @@ private function normalizeVersionConstraint(string $versionConstraint): string
         }
 
         $normalized = self::normalizeVersionConstraintSeparators($normalized);
+        $normalized = self::replaceWildcardWithTilde($normalized);
+        $normalized = self::replaceTildeWithCaret($normalized);
         $normalized = self::removeDuplicateVersionConstraints($normalized);
         $normalized = self::removeOverlappingVersionConstraints($normalized);
         $normalized = self::removeUselessInlineAliases($normalized);
@@ -114,6 +116,28 @@ private static function normalizeVersionConstraintSeparators(string $versionCons
         }, $orConstraints));
     }
 
+    private static function replaceWildcardWithTilde(string $versionConstraint): string
+    {
+        $split = \explode(' ', $versionConstraint);
+
+        foreach ($split as &$part) {
+            $part = \preg_replace('{^(\d+(?:\.\d+)*)\.\*$}', '~$1.0', $part);
+        }
+
+        return \implode(' ', $split);
+    }
+
+    private static function replaceTildeWithCaret(string $versionConstraint): string
+    {
+        $split = \explode(' ', $versionConstraint);
+
+        foreach ($split as &$part) {
+            $part = \preg_replace('{^~(\d+(?:\.\d+)?)$}', '^$1', $part);
+        }
+
+        return \implode(' ', $split);
+    }
+
     private static function removeDuplicateVersionConstraints(string $versionConstraint): string
     {
         $orConstraints = self::splitIntoOrConstraints($versionConstraint);

test/Template/Vendor/Composer/ComposerJsonNormalizer/NormalizeNormalizesJson/Json/IsObject/HasEntries/Yes/HasProperty/ValueContainsPackagesAndVersionConstraints/HasEntries/Yes/HasNormalizedVersionConstraints/No/Combination/Or/VersionRange/Tilde/Duplicate/normalized.json

@@ -1,11 +1,11 @@
 {
     "homepage": "https://getcomposer.org/doc/articles/versions.md#version-range",
     "value-contains-packages-and-version-constraints": {
-        "combination-or-version-range-tilde-duplicate/01-without-spaces-trimmed": "~0 || ~1.2 || ~2.3.4",
-        "combination-or-version-range-tilde-duplicate/02-without-spaces-untrimmed": "~0 || ~1.2 || ~2.3.4",
-        "combination-or-version-range-tilde-duplicate/03-with-single-space-trimmed": "~0 || ~1.2 || ~2.3.4",
-        "combination-or-version-range-tilde-duplicate/04-with-single-space-untrimmed": "~0 || ~1.2 || ~2.3.4",
-        "combination-or-version-range-tilde-duplicate/05-with-double-space-trimmed": "~0 || ~1.2 || ~2.3.4",
-        "combination-or-version-range-tilde-duplicate/06-with-double-space-untrimmed": "~0 || ~1.2 || ~2.3.4"
+        "combination-or-version-range-tilde-duplicate/01-without-spaces-trimmed": "^0 || ^1.2 || ~2.3.4",
+        "combination-or-version-range-tilde-duplicate/02-without-spaces-untrimmed": "^0 || ^1.2 || ~2.3.4",
+        "combination-or-version-range-tilde-duplicate/03-with-single-space-trimmed": "^0 || ^1.2 || ~2.3.4",
+        "combination-or-version-range-tilde-duplicate/04-with-single-space-untrimmed": "^0 || ^1.2 || ~2.3.4",
+        "combination-or-version-range-tilde-duplicate/05-with-double-space-trimmed": "^0 || ^1.2 || ~2.3.4",
+        "combination-or-version-range-tilde-duplicate/06-with-double-space-untrimmed": "^0 || ^1.2 || ~2.3.4"
     }
 }

test/Template/Vendor/Composer/ComposerJsonNormalizer/NormalizeNormalizesJson/Json/IsObject/HasEntries/Yes/HasProperty/ValueContainsPackagesAndVersionConstraints/HasEntries/Yes/HasNormalizedVersionConstraints/No/Combination/Or/VersionRange/Tilde/NotOverlapping/normalized.json

@@ -1,11 +1,11 @@
 {
     "homepage": "https://getcomposer.org/doc/articles/versions.md#version-range",
     "value-contains-packages-and-version-constraints": {
-        "combination-or-version-range-tilde-not-overlapping/01-without-spaces-trimmed": "~0 || ~1.2 || ~2.3.4",
-        "combination-or-version-range-tilde-not-overlapping/02-without-spaces-untrimmed": "~0 || ~1.2 || ~2.3.4",
-        "combination-or-version-range-tilde-not-overlapping/03-with-single-space-trimmed": "~0 || ~1.2 || ~2.3.4",
-        "combination-or-version-range-tilde-not-overlapping/04-with-single-space-untrimmed": "~0 || ~1.2 || ~2.3.4",
-        "combination-or-version-range-tilde-not-overlapping/05-with-double-space-trimmed": "~0 || ~1.2 || ~2.3.4",
-        "combination-or-version-range-tilde-not-overlapping/06-with-double-space-untrimmed": "~0 || ~1.2 || ~2.3.4"
+        "combination-or-version-range-tilde-not-overlapping/01-without-spaces-trimmed": "^0 || ^1.2 || ~2.3.4",
+        "combination-or-version-range-tilde-not-overlapping/02-without-spaces-untrimmed": "^0 || ^1.2 || ~2.3.4",
+        "combination-or-version-range-tilde-not-overlapping/03-with-single-space-trimmed": "^0 || ^1.2 || ~2.3.4",
+        "combination-or-version-range-tilde-not-overlapping/04-with-single-space-untrimmed": "^0 || ^1.2 || ~2.3.4",
+        "combination-or-version-range-tilde-not-overlapping/05-with-double-space-trimmed": "^0 || ^1.2 || ~2.3.4",
+        "combination-or-version-range-tilde-not-overlapping/06-with-double-space-untrimmed": "^0 || ^1.2 || ~2.3.4"
     }
 }

test/Template/Vendor/Composer/ComposerJsonNormalizer/NormalizeNormalizesJson/Json/IsObject/HasEntries/Yes/HasProperty/ValueContainsPackagesAndVersionConstraints/HasEntries/Yes/HasNormalizedVersionConstraints/No/Combination/Or/VersionRange/Tilde/Overlapping/normalized.json

@@ -1,11 +1,11 @@
 {
     "homepage": "https://getcomposer.org/doc/articles/versions.md#version-range",
     "value-contains-packages-and-version-constraints": {
-        "combination-or-version-range-tilde-overlapping/01-without-spaces-trimmed": "~0 || ~1.2 || ~2.3.4",
-        "combination-or-version-range-tilde-overlapping/02-without-spaces-untrimmed": "~0 || ~1.2 || ~2.3.4",
-        "combination-or-version-range-tilde-overlapping/03-with-single-space-trimmed": "~0 || ~1.2 || ~2.3.4",
-        "combination-or-version-range-tilde-overlapping/04-with-single-space-untrimmed": "~0 || ~1.2 || ~2.3.4",
-        "combination-or-version-range-tilde-overlapping/05-with-double-space-trimmed": "~0 || ~1.2 || ~2.3.4",
-        "combination-or-version-range-tilde-overlapping/06-with-double-space-untrimmed": "~0 || ~1.2 || ~2.3.4"
+        "combination-or-version-range-tilde-overlapping/01-without-spaces-trimmed": "^0 || ^1.2 || ~2.3.4",
+        "combination-or-version-range-tilde-overlapping/02-without-spaces-untrimmed": "^0 || ^1.2 || ~2.3.4",
+        "combination-or-version-range-tilde-overlapping/03-with-single-space-trimmed": "^0 || ^1.2 || ~2.3.4",
+        "combination-or-version-range-tilde-overlapping/04-with-single-space-untrimmed": "^0 || ^1.2 || ~2.3.4",
+        "combination-or-version-range-tilde-overlapping/05-with-double-space-trimmed": "^0 || ^1.2 || ~2.3.4",
+        "combination-or-version-range-tilde-overlapping/06-with-double-space-untrimmed": "^0 || ^1.2 || ~2.3.4"
     }
 }

test/Template/Vendor/Composer/ComposerJsonNormalizer/NormalizeNormalizesJson/Json/IsObject/HasEntries/Yes/HasProperty/ValueContainsPackagesAndVersionConstraints/HasEntries/Yes/HasNormalizedVersionConstraints/No/Combination/Or/VersionRange/Tilde/Unique/normalized.json

@@ -1,11 +1,11 @@
 {
     "homepage": "https://getcomposer.org/doc/articles/versions.md#version-range",
     "value-contains-packages-and-version-constraints": {
-        "combination-or-version-range-tilde-unique/01-without-spaces-trimmed": "~0 || ~1.2 || ~2.3.4",
-        "combination-or-version-range-tilde-unique/02-without-spaces-untrimmed": "~0 || ~1.2 || ~2.3.4",
-        "combination-or-version-range-tilde-unique/03-with-single-space-trimmed": "~0 || ~1.2 || ~2.3.4",
-        "combination-or-version-range-tilde-unique/04-with-single-space-untrimmed": "~0 || ~1.2 || ~2.3.4",
-        "combination-or-version-range-tilde-unique/05-with-double-space-trimmed": "~0 || ~1.2 || ~2.3.4",
-        "combination-or-version-range-tilde-unique/06-with-double-space-untrimmed": "~0 || ~1.2 || ~2.3.4"
+        "combination-or-version-range-tilde-unique/01-without-spaces-trimmed": "^0 || ^1.2 || ~2.3.4",
+        "combination-or-version-range-tilde-unique/02-without-spaces-untrimmed": "^0 || ^1.2 || ~2.3.4",
+        "combination-or-version-range-tilde-unique/03-with-single-space-trimmed": "^0 || ^1.2 || ~2.3.4",
+        "combination-or-version-range-tilde-unique/04-with-single-space-untrimmed": "^0 || ^1.2 || ~2.3.4",
+        "combination-or-version-range-tilde-unique/05-with-double-space-trimmed": "^0 || ^1.2 || ~2.3.4",
+        "combination-or-version-range-tilde-unique/06-with-double-space-untrimmed": "^0 || ^1.2 || ~2.3.4"
     }
 }

test/Template/Vendor/Composer/ComposerJsonNormalizer/NormalizeNormalizesJson/Json/IsObject/HasEntries/Yes/HasProperty/ValueContainsPackagesAndVersionConstraints/HasEntries/Yes/HasNormalizedVersionConstraints/No/Combination/Or/VersionRange/Tilde/Unsorted/normalized.json

@@ -1,11 +1,11 @@
 {
     "homepage": "https://getcomposer.org/doc/articles/versions.md#version-range",
     "value-contains-packages-and-version-constraints": {
-        "combination-or-version-range-tilde-unsorted/01-without-spaces-trimmed": "~0 || ~1.2 || ~2.3.4 || ~12.3.4",
-        "combination-or-version-range-tilde-unsorted/02-without-spaces-untrimmed": "~0 || ~1.2 || ~2.3.4 || ~12.3.4",
-        "combination-or-version-range-tilde-unsorted/03-with-single-space-trimmed": "~0 || ~1.2 || ~2.3.4 || ~12.3.4",
-        "combination-or-version-range-tilde-unsorted/04-with-single-space-untrimmed": "~0 || ~1.2 || ~2.3.4 || ~12.3.4",
-        "combination-or-version-range-tilde-unsorted/05-with-double-space-trimmed": "~0 || ~1.2 || ~2.3.4 || ~12.3.4",
-        "combination-or-version-range-tilde-unsorted/06-with-double-space-untrimmed": "~0 || ~1.2 || ~2.3.4 || ~12.3.4"
+        "combination-or-version-range-tilde-unsorted/01-without-spaces-trimmed": "^0 || ^1.2 || ~2.3.4 || ~12.3.4",
+        "combination-or-version-range-tilde-unsorted/02-without-spaces-untrimmed": "^0 || ^1.2 || ~2.3.4 || ~12.3.4",
+        "combination-or-version-range-tilde-unsorted/03-with-single-space-trimmed": "^0 || ^1.2 || ~2.3.4 || ~12.3.4",
+        "combination-or-version-range-tilde-unsorted/04-with-single-space-untrimmed": "^0 || ^1.2 || ~2.3.4 || ~12.3.4",
+        "combination-or-version-range-tilde-unsorted/05-with-double-space-trimmed": "^0 || ^1.2 || ~2.3.4 || ~12.3.4",
+        "combination-or-version-range-tilde-unsorted/06-with-double-space-untrimmed": "^0 || ^1.2 || ~2.3.4 || ~12.3.4"
     }
 }

test/Template/Vendor/Composer/ComposerJsonNormalizer/NormalizeNormalizesJson/Json/IsObject/HasEntries/Yes/HasProperty/ValueContainsPackagesAndVersionConstraints/HasEntries/Yes/HasNormalizedVersionConstraints/No/Combination/Or/VersionRange/Wildcard/normalized.json

@@ -1,11 +1,11 @@
 {
     "homepage": "https://getcomposer.org/doc/articles/versions.md#version-range",
     "value-contains-packages-and-version-constraints": {
-        "combination-or-version-range-wildcard/01-without-spaces-trimmed": "1.* || 2.3.*",
-        "combination-or-version-range-wildcard/02-without-spaces-untrimmed": "1.* || 2.3.*",
-        "combination-or-version-range-wildcard/03-with-single-space-trimmed": "1.* || 2.3.*",
-        "combination-or-version-range-wildcard/04-with-single-space-untrimmed": "1.* || 2.3.*",
-        "combination-or-version-range-wildcard/05-with-double-space-trimmed": "1.* || 2.3.*",
-        "combination-or-version-range-wildcard/06-with-double-space-untrimmed": "1.* || 2.3.*"
+        "combination-or-version-range-wildcard/01-without-spaces-trimmed": "^1.0 || ~2.3.0",
+        "combination-or-version-range-wildcard/02-without-spaces-untrimmed": "^1.0 || ~2.3.0",
+        "combination-or-version-range-wildcard/03-with-single-space-trimmed": "^1.0 || ~2.3.0",
+        "combination-or-version-range-wildcard/04-with-single-space-untrimmed": "^1.0 || ~2.3.0",
+        "combination-or-version-range-wildcard/05-with-double-space-trimmed": "^1.0 || ~2.3.0",
+        "combination-or-version-range-wildcard/06-with-double-space-untrimmed": "^1.0 || ~2.3.0"
     }
 }

test/Template/Vendor/Composer/ComposerJsonNormalizer/NormalizeNormalizesJson/Json/IsObject/HasEntries/Yes/HasProperty/ValueContainsPackagesAndVersionConstraints/HasEntries/Yes/HasNormalizedVersionConstraints/No/VersionRange/Tilde/Stable/normalized.json

@@ -1,10 +1,10 @@
 {
     "homepage": "https://getcomposer.org/doc/articles/versions.md#tilde-version-range-",
     "value-contains-packages-and-version-constraints": {
-        "version-range-tilde-stable/01-major-trimmed": "~1",
-        "version-range-tilde-stable/02-major-untrimmed": "~1",
-        "version-range-tilde-stable/03-major-minor-trimmed": "~1.2",
-        "version-range-tilde-stable/04-major-minor-untrimmed": "~1.2",
+        "version-range-tilde-stable/01-major-trimmed": "^1",
+        "version-range-tilde-stable/02-major-untrimmed": "^1",
+        "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"
     }

test/Template/Vendor/Composer/ComposerJsonNormalizer/NormalizeNormalizesJson/Json/IsObject/HasEntries/Yes/HasProperty/ValueContainsPackagesAndVersionConstraints/HasEntries/Yes/HasNormalizedVersionConstraints/No/VersionRange/Tilde/Unstable/normalized.json

@@ -1,10 +1,10 @@
 {
     "homepage": "https://getcomposer.org/doc/articles/versions.md#tilde-version-range-",
     "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/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/05-major-minor-patch-trimmed": "~0.1.2",
         "version-range-tilde-unstable/06-major-minor-patch-untrimmed": "~0.1.2"
     }

test/Template/Vendor/Composer/ComposerJsonNormalizer/NormalizeNormalizesJson/Json/IsObject/HasEntries/Yes/HasProperty/ValueContainsPackagesAndVersionConstraints/HasEntries/Yes/HasNormalizedVersionConstraints/No/VersionRange/Wildcard/Stable/normalized.json

@@ -1,9 +1,9 @@
 {
     "homepage": "https://getcomposer.org/doc/articles/versions.md#wildcard-version-range-",
     "value-contains-packages-and-version-constraints": {
-        "version-range-wildcard-stable/01-major-minor-trimmed": "1.*",
-        "version-range-wildcard-stable/02-major-minor-untrimmed": "1.*",
-        "version-range-wildcard-stable/03-major-minor-patch-trimmed": "1.2.*",
-        "version-range-wildcard-stable/04-major-minor-patch-untrimmed": "1.2.*"
+        "version-range-wildcard-stable/01-major-minor-trimmed": "^1.0",
+        "version-range-wildcard-stable/02-major-minor-untrimmed": "^1.0",
+        "version-range-wildcard-stable/03-major-minor-patch-trimmed": "~1.2.0",
+        "version-range-wildcard-stable/04-major-minor-patch-untrimmed": "~1.2.0"
     }
 }

test/Template/Vendor/Composer/ComposerJsonNormalizer/NormalizeNormalizesJson/Json/IsObject/HasEntries/Yes/HasProperty/ValueContainsPackagesAndVersionConstraints/HasEntries/Yes/HasNormalizedVersionConstraints/No/VersionRange/Wildcard/Unstable/normalized.json

@@ -1,9 +1,9 @@
 {
     "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.*",
-        "version-range-wildcard-unstable/02-major-minor-untrimmed": "0.*",
-        "version-range-wildcard-unstable/03-major-minor-patch-trimmed": "0.1.*",
-        "version-range-wildcard-unstable/04-major-minor-patch-untrimmed": "0.1.*"
+        "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-patch-trimmed": "~0.1.0",
+        "version-range-wildcard-unstable/04-major-minor-patch-untrimmed": "~0.1.0"
     }
 }