chore: modify error flow and messages of warnings

Author: jorgsowa

ext/session/session.c

@@ -709,19 +709,19 @@ static PHP_INI_MH(OnUpdateCookieLifetime)
 	zend_long lval = 0;
 	int oflow = 0;
 	uint8_t type = is_numeric_string_ex(ZSTR_VAL(new_value), ZSTR_LEN(new_value), &lval, NULL, false, &oflow, NULL);
-	if (type == 0) {
-		php_error_docref(NULL, E_WARNING, "Invalid value for CookieLifetime");
-		return FAILURE;
-	} else if (type == IS_DOUBLE && oflow == 0) {
-		php_error_docref(NULL, E_WARNING, "CookieLifetime must be an integer");
+	if (UNEXPECTED(type != IS_LONG)) {
+		if (oflow != 0) {
+			php_error_docref(NULL, E_WARNING, "session.cookie_lifetime must be between 0 and " ZEND_LONG_FMT, maxcookie);
+		} else {
+			php_error_docref(NULL, E_WARNING, "session.cookie_lifetime must be an integer");
+		}
 		return FAILURE;
 	}
-	zend_long v = lval;
-	if (oflow < 0 || v < 0) {
-		php_error_docref(NULL, E_WARNING, "CookieLifetime cannot be negative");
+	if (lval < 0) {
+		php_error_docref(NULL, E_WARNING, "session.cookie_lifetime must be between 0 and " ZEND_LONG_FMT, maxcookie);
 		return FAILURE;
-	} else if (oflow > 0 || v > maxcookie) {
-		php_error_docref(NULL, E_WARNING, "CookieLifetime value too large, value was set to the maximum of " ZEND_LONG_FMT, maxcookie);
+	} else if (lval > maxcookie) {
+		php_error_docref(NULL, E_WARNING, "session.cookie_lifetime must be between 0 and " ZEND_LONG_FMT ", value clamped to maximum", maxcookie);
 		zend_long *p = ZEND_INI_GET_ADDR();
 		*p = maxcookie;
 		entry->value = zend_long_to_str(maxcookie);

ext/session/tests/gh16290.phpt

@@ -12,5 +12,5 @@ echo "DONE";
 ob_end_flush();
 ?>
 --EXPECTF--
-Warning: session_set_cookie_params(): CookieLifetime value too large, value was set to the maximum of %d in %s on line %d
+Warning: session_set_cookie_params(): session.cookie_lifetime must be between 0 and %d, value clamped to maximum in %s on line %d
 DONE

ext/session/tests/session_cookie_lifetime_invalid.phpt

@@ -30,14 +30,14 @@ var_dump(ini_get("session.cookie_lifetime"));
 ob_end_flush();
 ?>
 --EXPECTF--
-Warning: ini_set(): CookieLifetime must be an integer in %s on line %d
+Warning: ini_set(): session.cookie_lifetime must be an integer in %s on line %d
 string(3) "100"
 
-Warning: ini_set(): Invalid value for CookieLifetime in %s on line %d
+Warning: ini_set(): session.cookie_lifetime must be an integer in %s on line %d
 string(3) "100"
 
-Warning: ini_set(): CookieLifetime cannot be negative in %s on line %d
+Warning: ini_set(): session.cookie_lifetime must be between 0 and %d in %s on line %d
 string(3) "100"
 
-Warning: ini_set(): CookieLifetime cannot be negative in %s on line %d
+Warning: ini_set(): session.cookie_lifetime must be between 0 and %d in %s on line %d
 string(3) "100"

ext/session/tests/session_cookie_lifetime_overflow.phpt

@@ -28,7 +28,7 @@ ob_end_flush();
 --EXPECTF--
 string(3) "100"
 
-Warning: ini_set(): CookieLifetime value too large, value was set to the maximum of %d in %s on line %d
+Warning: ini_set(): session.cookie_lifetime must be between 0 and %d, value clamped to maximum in %s on line %d
 bool(true)
 bool(true)
 string(3) "200"

ext/session/tests/session_set_cookie_params_variation8.phpt

@@ -25,7 +25,7 @@ bool(true)
 string(1) "0"
 string(1) "0"
 
-Warning: session_set_cookie_params(): CookieLifetime cannot be negative in %s on line %d
+Warning: session_set_cookie_params(): session.cookie_lifetime must be between 0 and %d in %s on line %d
 bool(false)
 string(1) "0"
 Done