From df07a1d22efbb52f84c687acf5ded264506a565e Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Tue, 6 May 2025 12:05:12 -0700
Subject: [PATCH] Ensure releases and RCs always have a corresponding pair

Also, adjust the way `versions.json` gets written for more human-powered field ordering.
---
 versions.json | 36 ++++++++++++++++++------------------
 versions.sh   | 31 +++++++++++++++----------------
 2 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/versions.json b/versions.json
index de14ba8c..b6f6596e 100644
--- a/versions.json
+++ b/versions.json
@@ -1,8 +1,9 @@
 {
   "8.1": {
+    "version": "8.1.32",
+    "url": "https://www.php.net/distributions/php-8.1.32.tar.xz",
     "ascUrl": "https://www.php.net/distributions/php-8.1.32.tar.xz.asc",
     "sha256": "c582ac682a280bbc69bc2186c21eb7e3313cc73099be61a6bc1d2cd337cbf383",
-    "url": "https://www.php.net/distributions/php-8.1.32.tar.xz",
     "variants": [
       "bookworm/cli",
       "bookworm/apache",
@@ -18,14 +19,14 @@
       "alpine3.20/cli",
       "alpine3.20/fpm",
       "alpine3.20/zts"
-    ],
-    "version": "8.1.32"
+    ]
   },
   "8.1-rc": null,
   "8.2": {
+    "version": "8.2.28",
+    "url": "https://www.php.net/distributions/php-8.2.28.tar.xz",
     "ascUrl": "https://www.php.net/distributions/php-8.2.28.tar.xz.asc",
     "sha256": "af8c9153153a7f489153b7a74f2f29a5ee36f5cb2c6c6929c98411a577e89c91",
-    "url": "https://www.php.net/distributions/php-8.2.28.tar.xz",
     "variants": [
       "bookworm/cli",
       "bookworm/apache",
@@ -41,14 +42,14 @@
       "alpine3.20/cli",
       "alpine3.20/fpm",
       "alpine3.20/zts"
-    ],
-    "version": "8.2.28"
+    ]
   },
   "8.2-rc": null,
   "8.3": {
+    "version": "8.3.20",
+    "url": "https://www.php.net/distributions/php-8.3.20.tar.xz",
     "ascUrl": "https://www.php.net/distributions/php-8.3.20.tar.xz.asc",
     "sha256": "f15914e071b5bddaf1475b5f2ba68107e8b8846655f9e89690fb7cd410b0db6c",
-    "url": "https://www.php.net/distributions/php-8.3.20.tar.xz",
     "variants": [
       "bookworm/cli",
       "bookworm/apache",
@@ -64,13 +65,13 @@
       "alpine3.20/cli",
       "alpine3.20/fpm",
       "alpine3.20/zts"
-    ],
-    "version": "8.3.20"
+    ]
   },
   "8.3-rc": {
+    "version": "8.3.21RC1",
+    "url": "https://downloads.php.net/~eric/php-8.3.21RC1.tar.xz",
     "ascUrl": "https://downloads.php.net/~eric/php-8.3.21RC1.tar.xz.asc",
     "sha256": "6d8bf25e0584cfcb83243fd7d1a90c06d428f1204eea93bb3c027c6e3344a23e",
-    "url": "https://downloads.php.net/~eric/php-8.3.21RC1.tar.xz",
     "variants": [
       "bookworm/cli",
       "bookworm/apache",
@@ -86,13 +87,13 @@
       "alpine3.20/cli",
       "alpine3.20/fpm",
       "alpine3.20/zts"
-    ],
-    "version": "8.3.21RC1"
+    ]
   },
   "8.4": {
+    "version": "8.4.6",
+    "url": "https://www.php.net/distributions/php-8.4.6.tar.xz",
     "ascUrl": "https://www.php.net/distributions/php-8.4.6.tar.xz.asc",
     "sha256": "089b08a5efef02313483325f3bacd8c4fe311cf1e1e56749d5cc7d059e225631",
-    "url": "https://www.php.net/distributions/php-8.4.6.tar.xz",
     "variants": [
       "bookworm/cli",
       "bookworm/apache",
@@ -108,13 +109,13 @@
       "alpine3.20/cli",
       "alpine3.20/fpm",
       "alpine3.20/zts"
-    ],
-    "version": "8.4.6"
+    ]
   },
   "8.4-rc": {
+    "version": "8.4.7RC1",
+    "url": "https://downloads.php.net/~saki/php-8.4.7RC1.tar.xz",
     "ascUrl": "https://downloads.php.net/~saki/php-8.4.7RC1.tar.xz.asc",
     "sha256": "6cb37632eb65ee311cb4427ad070b6ab27fdaf13e8f0103701b2b78907326c93",
-    "url": "https://downloads.php.net/~saki/php-8.4.7RC1.tar.xz",
     "variants": [
       "bookworm/cli",
       "bookworm/apache",
@@ -130,7 +131,6 @@
       "alpine3.20/cli",
       "alpine3.20/fpm",
       "alpine3.20/zts"
-    ],
-    "version": "8.4.7RC1"
+    ]
   }
 }
diff --git a/versions.sh b/versions.sh
index 67880665..bbe8cf2c 100755
--- a/versions.sh
+++ b/versions.sh
@@ -3,6 +3,8 @@ set -Eeuo pipefail
 
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
+# TODO consume https://www.php.net/releases/branches.php and https://www.php.net/release-candidates.php?format=json here like in Go, Julia, etc (so we can have a canonical "here's all the versions possible" mode, and more automated metadata like EOL 👀)
+
 versions=( "$@" )
 if [ ${#versions[@]} -eq 0 ]; then
 	versions=( */ )
@@ -52,16 +54,9 @@ for version in "${versions[@]}"; do
 	unset IFS
 
 	if [ "${#possibles[@]}" -eq 0 ]; then
-		if [ "$rcVersion" = "$version" ]; then
-			echo >&2
-			echo >&2 "error: unable to determine available releases of $version"
-			echo >&2
-			exit 1
-		else
-			echo >&2 "warning: skipping/removing '$version' (does not appear to exist upstream)"
-			json="$(jq <<<"$json" -c '.[env.version] = null')"
-			continue
-		fi
+		echo >&2 "warning: skipping/removing '$version' (does not appear to exist upstream)"
+		json="$(jq <<<"$json" -c '.[env.version] = null')"
+		continue
 	fi
 
 	# format of "possibles" array entries is "VERSION URL.TAR.XZ URL.TAR.XZ.ASC SHA256" (each value shell quoted)
@@ -116,11 +111,15 @@ for version in "${versions[@]}"; do
 		'
 	)"
 
-	if [ "$version" = "$rcVersion" ]; then
-		json="$(jq <<<"$json" -c '
-			.[env.version + "-rc"] //= null
-		')"
-	fi
+	# make sure RCs and releases have corresponding pairs
+	json="$(jq <<<"$json" -c '
+		.[
+			env.version
+			+ if env.version == env.rcVersion then
+				"-rc"
+			else "" end
+		] //= null
+	')"
 done
 
-jq <<<"$json" -S . > versions.json
+jq <<<"$json" 'to_entries | sort_by(.key) | from_entries' > versions.json