- Use a common function for normal and frameless implementations

- Add tests for null and not-comparable cases
- Fix object support for frameless clamp function
- Improve NAN handling

Author: kylekatarnls

ext/standard/basic_functions_arginfo.h

@@ -389,31 +389,47 @@ PHP_FUNCTION(round)
 }
 /* }}} */
 
-/* {{{ Return the given value if in range of min and max */
-PHP_FUNCTION(clamp)
+/* Return the given value if in range of min and max */
+static void php_math_clamp(zval *return_value, zval *value, zval *min, zval *max)
 {
-	zval *zvalue, *zmin, *zmax;
+	if (Z_TYPE_P(min) == IS_DOUBLE && UNEXPECTED(zend_isnan(Z_DVAL_P(min)))) {
+		zend_argument_value_error(2, "cannot be NAN");
+		RETURN_THROWS();
+	}
 
-	ZEND_PARSE_PARAMETERS_START(3, 3)
-		Z_PARAM_ZVAL(zvalue)
-		Z_PARAM_ZVAL(zmin)
-		Z_PARAM_ZVAL(zmax)
-	ZEND_PARSE_PARAMETERS_END();
+	if (Z_TYPE_P(max) == IS_DOUBLE && UNEXPECTED(zend_isnan(Z_DVAL_P(max)))) {
+		zend_argument_value_error(3, "cannot be NAN");
+		RETURN_THROWS();
+	}
 
-	if (zend_compare(zmin, zmax) > 0) {
+	if (zend_compare(max, min) == -1) {
 		zend_argument_value_error(2, "must be smaller than or equal to argument #3 ($max)");
 		RETURN_THROWS();
 	}
 
-	if (zend_compare(zmax, zvalue) == -1) {
-		RETURN_COPY(zmax);
+	if (zend_compare(max, value) == -1) {
+		RETURN_COPY(max);
 	}
 
-	if (zend_compare(zvalue, zmin) == -1) {
-		RETURN_COPY(zmin);
+	if (zend_compare(value, min) == -1) {
+		RETURN_COPY(min);
 	}
 
-	RETURN_COPY(zvalue);
+	RETURN_COPY(value);
+}
+
+/* {{{ Return the given value if in range of min and max */
+PHP_FUNCTION(clamp)
+{
+	zval *zvalue, *zmin, *zmax;
+
+	ZEND_PARSE_PARAMETERS_START(3, 3)
+		Z_PARAM_ZVAL(zvalue)
+		Z_PARAM_ZVAL(zmin)
+		Z_PARAM_ZVAL(zmax)
+	ZEND_PARSE_PARAMETERS_END();
+
+	php_math_clamp(return_value, zvalue, zmin, zmax);
 }
 /* }}} */
 
@@ -425,20 +441,7 @@ ZEND_FRAMELESS_FUNCTION(clamp, 3)
 	Z_FLF_PARAM_ZVAL(2, zmin);
 	Z_FLF_PARAM_ZVAL(3, zmax);
 
-	if (zend_compare(zmin, zmax) > 0) {
-		zend_argument_value_error(2, "must be smaller than or equal to argument #3 ($max)");
-		RETURN_THROWS();
-	}
-
-	if (zend_compare(zmax, zvalue) == -1) {
-		RETURN_COPY_VALUE(zmax);
-	}
-
-	if (zend_compare(zvalue, zmin) == -1) {
-		RETURN_COPY_VALUE(zmin);
-	}
-
-	RETURN_COPY_VALUE(zvalue);
+	php_math_clamp(return_value, zvalue, zmin, zmax);
 }
 /* }}} */
 

ext/standard/math.c

@@ -15,16 +15,55 @@ var_dump(clamp(2.5, 1.3, 3.4));
 var_dump(clamp(0, 1.3, 3.4));
 var_dump(clamp(M_PI, -INF, INF));
 var_dump(clamp(NAN, 4, 6));
-var_dump(clamp(4, NAN, 6));
-var_dump(clamp(8, NAN, 6));
-var_dump(clamp(7, 6, NAN));
-var_dump(clamp(4, 6, NAN));
 var_dump(clamp("a", "c", "g"));
 var_dump(clamp("d", "c", "g"));
 echo clamp('2025-08-01', '2025-08-15', '2025-09-15'), "\n";
 echo clamp('2025-08-20', '2025-08-15', '2025-09-15'), "\n";
 echo clamp(new \DateTimeImmutable('2025-08-01'), new \DateTimeImmutable('2025-08-15'), new \DateTimeImmutable('2025-09-15'))->format('Y-m-d'), "\n";
 echo clamp(new \DateTimeImmutable('2025-08-20'), new \DateTimeImmutable('2025-08-15'), new \DateTimeImmutable('2025-09-15'))->format('Y-m-d'), "\n";
+var_dump(clamp(null, -1, 1));
+var_dump(clamp(null, 1, 3));
+var_dump(clamp(null, -3, -1));
+var_dump(clamp(-9999, null, 10));
+var_dump(clamp(12, null, 10));
+
+$a = new \InvalidArgumentException('a');
+$b = new \RuntimeException('b');
+$c = new \LogicException('c');
+echo clamp($a, $b, $c)::class, "\n";
+echo clamp($b, $a, $c)::class, "\n";
+echo clamp($c, $a, $b)::class, "\n";
+
+try {
+    var_dump(clamp(4, NAN, 6));
+} catch (ValueError $error) {
+    echo $error->getMessage(), "\n";
+}
+
+try {
+    var_dump(clamp(7, 6, NAN));
+} catch (ValueError $error) {
+    echo $error->getMessage(), "\n";
+}
+
+try {
+    var_dump(clamp(1, 3, 2));
+} catch (ValueError $error) {
+    echo $error->getMessage(), "\n";
+}
+
+
+try {
+    var_dump(clamp(-9999, 5, null));
+} catch (ValueError $error) {
+    echo $error->getMessage(), "\n";
+}
+
+try {
+    var_dump(clamp(12, -5, null));
+} catch (ValueError $error) {
+    echo $error->getMessage(), "\n";
+}
 
 ?>
 --EXPECT--
@@ -36,14 +75,23 @@ float(2.5)
 float(2.5)
 float(1.3)
 float(3.141592653589793)
-double(NAN)
-int(4)
-int(6)
-int(7)
-int(6)
+float(NAN)
 string(1) "c"
 string(1) "d"
 2025-08-15
 2025-08-20
 2025-08-15
 2025-08-20
+int(-1)
+int(1)
+int(-3)
+int(-9999)
+int(10)
+InvalidArgumentException
+RuntimeException
+LogicException
+clamp(): Argument #2 ($min) cannot be NAN
+clamp(): Argument #3 ($max) cannot be NAN
+clamp(): Argument #2 ($min) must be smaller than or equal to argument #3 ($max)
+clamp(): Argument #2 ($min) must be smaller than or equal to argument #3 ($max)
+clamp(): Argument #2 ($min) must be smaller than or equal to argument #3 ($max)