Add tests to check mismatching function signatures

Author: kocsismate

Zend/tests/arginfo_zpp_mismatch.phpt

@@ -0,0 +1,49 @@
+--TEST--
+Test that there is no arginfo/zpp mismatch
+--FILE--
+<?php
+
+$contents = "<?php\n";
+
+foreach (get_defined_functions()["internal"] as $function) {
+    $contents .= "try {";
+    $contents .= "    {$function}(null, null, null, null, null, null, null, null);\n";
+    $contents .= "} catch (ArgumentCountError|Error) {";
+    $contents .= "}";
+}
+
+file_put_contents("arginfo_zpp_mismatch_generated.php", $contents);
+
+set_error_handler(
+    function (string $code, string $message) {
+        return true;
+    },
+    E_NOTICE | E_WARNING
+);
+
+require_once("arginfo_zpp_mismatch_generated.php");
+
+?>
+--CLEAN--
+<?php
+
+unlink("arginfo_zpp_mismatch_generated.php");
+
+?>
+--EXPECT--
+NULL
+NULL
+NULL
+NULL
+NULL
+NULL
+NULL
+NULL
+NULL
+NULL
+NULL
+NULL
+NULL
+NULL
+NULL
+NULL

ext/opcache/tests/func_info.phpt

@@ -0,0 +1,31 @@
+--TEST--
+Test that return types in zend_func_info.c match return types in stubs
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.optimization_level=-1
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+
+$contents = "<?php\n";
+
+$contents .= "function test() {\n";
+foreach (get_defined_functions()["internal"] as $function) {
+    $contents .= "    {$function}();\n";
+}
+$contents .= "}\n";
+
+file_put_contents("func_info_generated.php", $contents);
+
+require_once("func_info_generated.php");
+
+?>
+--CLEAN--
+<?php
+
+unlink("func_info_generated.php");
+
+?>
+--EXPECT--

ext/session/session.c

@@ -1917,24 +1917,28 @@ PHP_FUNCTION(session_module_name)
 }
 /* }}} */
 
-/* {{{ proto bool session_set_save_handler(string open, string close, string read, string write, string destroy, string gc, string create_sid)
-   Sets user-level functions */
-PHP_FUNCTION(session_set_save_handler)
-{
-	zval *args = NULL;
-	int i, num_args, argc = ZEND_NUM_ARGS();
-	zend_string *ini_name, *ini_val;
-
+static int save_handler_check_session() {
 	if (PS(session_status) == php_session_active) {
 		php_error_docref(NULL, E_WARNING, "Cannot change save handler when session is active");
-		RETURN_FALSE;
+		return FAILURE;
 	}
 
 	if (SG(headers_sent)) {
 		php_error_docref(NULL, E_WARNING, "Cannot change save handler when headers already sent");
-		RETURN_FALSE;
+		return FAILURE;
 	}
 
+	return SUCCESS;
+}
+
+/* {{{ proto bool session_set_save_handler(string open, string close, string read, string write, string destroy, string gc, string create_sid)
+   Sets user-level functions */
+PHP_FUNCTION(session_set_save_handler)
+{
+	zval *args = NULL;
+	int i, num_args, argc = ZEND_NUM_ARGS();
+	zend_string *ini_name, *ini_val;
+
 	if (argc > 0 && argc <= 2) {
 		zval *obj = NULL;
 		zend_string *func_name;
@@ -1945,6 +1949,10 @@ PHP_FUNCTION(session_set_save_handler)
 			RETURN_THROWS();
 		}
 
+		if (save_handler_check_session() == FAILURE) {
+			RETURN_FALSE;
+		}
+
 		/* For compatibility reason, implemented interface is not checked */
 		/* Find implemented methods - SessionHandlerInterface */
 		i = 0;
@@ -2047,6 +2055,10 @@ PHP_FUNCTION(session_set_save_handler)
 		RETURN_THROWS();
 	}
 
+	if (save_handler_check_session() == FAILURE) {
+		RETURN_FALSE;
+	}
+
 	/* remove shutdown function */
 	remove_user_shutdown_function("session_shutdown", sizeof("session_shutdown") - 1);
 

ext/standard/basic_functions.c

@@ -2539,14 +2539,14 @@ PHP_FUNCTION(is_uploaded_file)
 	char *path;
 	size_t path_len;
 
-	if (!SG(rfc1867_uploaded_files)) {
-		RETURN_FALSE;
-	}
-
 	ZEND_PARSE_PARAMETERS_START(1, 1)
 		Z_PARAM_PATH(path, path_len)
 	ZEND_PARSE_PARAMETERS_END();
 
+	if (!SG(rfc1867_uploaded_files)) {
+		RETURN_FALSE;
+	}
+
 	if (zend_hash_str_exists(SG(rfc1867_uploaded_files), path, path_len)) {
 		RETURN_TRUE;
 	} else {
@@ -2567,15 +2567,15 @@ PHP_FUNCTION(move_uploaded_file)
 	int oldmask; int ret;
 #endif
 
-	if (!SG(rfc1867_uploaded_files)) {
-		RETURN_FALSE;
-	}
-
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_STRING(path, path_len)
 		Z_PARAM_PATH(new_path, new_path_len)
 	ZEND_PARSE_PARAMETERS_END();
 
+	if (!SG(rfc1867_uploaded_files)) {
+		RETURN_FALSE;
+	}
+
 	if (!zend_hash_str_exists(SG(rfc1867_uploaded_files), path, path_len)) {
 		RETURN_FALSE;
 	}

ext/standard/basic_functions.stub.php

@@ -357,7 +357,7 @@ function parse_ini_file(string $filename, bool $process_sections = false, int $s
 function parse_ini_string(string $ini_string, bool $process_sections = false, int $scanner_mode = INI_SCANNER_NORMAL): array|false {}
 
 #if ZEND_DEBUG
-function config_get_hash(string $ini_string, bool $process_sections = false, int $scanner_mode = INI_SCANNER_NORMAL): array {}
+function config_get_hash(): array {}
 #endif
 
 #ifdef HAVE_GETLOADAVG

ext/standard/basic_functions_arginfo.h

@@ -578,10 +578,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_parse_ini_string, 0, 1, MAY_BE_A
 ZEND_END_ARG_INFO()
 
 #if ZEND_DEBUG
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_config_get_hash, 0, 1, IS_ARRAY, 0)
-	ZEND_ARG_TYPE_INFO(0, ini_string, IS_STRING, 0)
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, process_sections, _IS_BOOL, 0, "false")
-	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, scanner_mode, IS_LONG, 0, "INI_SCANNER_NORMAL")
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_config_get_hash, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
 #endif