Merge branch 'PHP-8.4' into PHP-8.5

* PHP-8.4:
  version_compare: Fix handling of version numbers with a trailing dot (#21689)

Author: TimWolla

NEWS

@@ -2,7 +2,9 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.5.7
 
-
+- Standard:
+  . Fixed bug GH-21689 (version_compare() incorrectly handles versions ending
+    with a dot). (timwolla)
 
 07 May 2026, PHP 8.5.6
 

ext/standard/tests/versioning/version_compare.phpt

@@ -22,6 +22,9 @@ foreach ($special_forms as $f1) {
     test("1.0$f1", "1.0$f2");
     }
 }
+test("1.2.", "1.2.");
+test("1.2..", "1.2..");
+
 print "TESTING OPERATORS\n";
 foreach ($special_forms as $f1) {
     foreach ($special_forms as $f2) {
@@ -106,6 +109,8 @@ TESTING COMPARE
 1.0pl1 > 1.0rc1
 1.0pl1 > 1.0
 1.0pl1 = 1.0pl1
+1.2. = 1.2.
+1.2.. = 1.2..
 TESTING OPERATORS
 1.0-dev lt 1.0-dev : false
 1.0-dev  < 1.0-dev : false

ext/standard/versioning.c

@@ -68,7 +68,15 @@ php_canonicalize_version(const char *version)
 		}
 		lp = *p++;
 	}
-	*q++ = '\0';
+
+	/* Check if the last component is empty (i.e. the last character is a dot)
+	 * and remove it if it is. */
+	if (*(q - 1) == '.') {
+		*(q - 1) = '\0';
+	} else {
+		*q = '\0';
+	}
+
 	return buf;
 }