From e208d236b3f8af855e219ea3abc796b8dd9d0d5d Mon Sep 17 00:00:00 2001
From: Craig Duncan <duncan3dc@php.net>
Date: Sun, 27 Oct 2019 22:18:42 +0000
Subject: Convert apache2handler arginfo to php stubs

---
 sapi/apache2handler/php_functions.c         | 59 ++++++-----------------------
 sapi/apache2handler/php_functions.stub.php  | 21 ++++++++++
 sapi/apache2handler/php_functions_arginfo.h | 37 ++++++++++++++++++
 3 files changed, 69 insertions(+), 48 deletions(-)
 create mode 100644 sapi/apache2handler/php_functions.stub.php
 create mode 100644 sapi/apache2handler/php_functions_arginfo.h

(limited to 'sapi/apache2handler')

diff --git a/sapi/apache2handler/php_functions.c b/sapi/apache2handler/php_functions.c
index 3066d0a772..f19253026e 100644
--- a/sapi/apache2handler/php_functions.c
+++ b/sapi/apache2handler/php_functions.c
@@ -43,6 +43,7 @@
 #endif
 
 #include "php_apache.h"
+#include "php_functions_arginfo.h"
 
 #ifdef ZTS
 int php_apache2_info_id;
@@ -475,55 +476,17 @@ PHP_MINFO_FUNCTION(apache)
 	}
 }
 
-/* {{{ arginfo */
-ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_lookup_uri, 0, 0, 1)
-	ZEND_ARG_INFO(0, filename)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_virtual, 0, 0, 1)
-	ZEND_ARG_INFO(0, uri)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_apache2handler_response_headers, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_apache2handler_getallheaders, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_note, 0, 0, 1)
-	ZEND_ARG_INFO(0, note_name)
-	ZEND_ARG_INFO(0, note_value)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_setenv, 0, 0, 2)
-	ZEND_ARG_INFO(0, variable)
-	ZEND_ARG_INFO(0, value)
-	ZEND_ARG_INFO(0, walk_to_top)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_apache2handler_getenv, 0, 0, 1)
-	ZEND_ARG_INFO(0, variable)
-	ZEND_ARG_INFO(0, walk_to_top)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_apache2handler_get_version, 0)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO(arginfo_apache2handler_get_modules, 0)
-ZEND_END_ARG_INFO()
-/* }}} */
-
 static const zend_function_entry apache_functions[] = {
-	PHP_FE(apache_lookup_uri, 		arginfo_apache2handler_lookup_uri)
-	PHP_FE(virtual, 				arginfo_apache2handler_virtual)
-	PHP_FE(apache_request_headers, 	arginfo_apache2handler_getallheaders)
-	PHP_FE(apache_response_headers, arginfo_apache2handler_response_headers)
-	PHP_FE(apache_setenv, 		arginfo_apache2handler_setenv)
-	PHP_FE(apache_getenv, 		arginfo_apache2handler_getenv)
-	PHP_FE(apache_note, 		arginfo_apache2handler_note)
-	PHP_FE(apache_get_version, 	arginfo_apache2handler_get_version)
-	PHP_FE(apache_get_modules, 	arginfo_apache2handler_get_modules)
-	PHP_FALIAS(getallheaders, 	apache_request_headers, arginfo_apache2handler_getallheaders)
+	PHP_FE(apache_lookup_uri, 		arginfo_apache_lookup_uri)
+	PHP_FE(virtual, 				arginfo_virtual)
+	PHP_FE(apache_request_headers, 	arginfo_apache_request_headers)
+	PHP_FE(apache_response_headers, arginfo_apache_response_headers)
+	PHP_FE(apache_setenv, 		arginfo_apache_setenv)
+	PHP_FE(apache_getenv, 		arginfo_apache_getenv)
+	PHP_FE(apache_note, 		arginfo_apache_note)
+	PHP_FE(apache_get_version, 	arginfo_apache_get_version)
+	PHP_FE(apache_get_modules, 	arginfo_apache_get_modules)
+	PHP_FALIAS(getallheaders, 	apache_request_headers, arginfo_getallheaders)
 	{NULL, NULL, NULL}
 };
 
diff --git a/sapi/apache2handler/php_functions.stub.php b/sapi/apache2handler/php_functions.stub.php
new file mode 100644
index 0000000000..5b2835ac3a
--- /dev/null
+++ b/sapi/apache2handler/php_functions.stub.php
@@ -0,0 +1,21 @@
+<?php
+
+function apache_lookup_uri(string $filename): object|false {}
+
+function virtual(string $uri): bool {}
+
+function apache_request_headers(): array {}
+
+function getallheaders(): array {}
+
+function apache_response_headers(): array {}
+
+function apache_note(string $note_name, string $note_value = UNKNOWN): string|false {}
+
+function apache_setenv(string $variable, string $value, bool $walk_to_top = false): bool {}
+
+function apache_getenv(string $variable, bool $walk_to_top = false): string|false {}
+
+function apache_get_version(): string|false {}
+
+function apache_get_modules(): array {}
diff --git a/sapi/apache2handler/php_functions_arginfo.h b/sapi/apache2handler/php_functions_arginfo.h
new file mode 100644
index 0000000000..f5ac0e4c28
--- /dev/null
+++ b/sapi/apache2handler/php_functions_arginfo.h
@@ -0,0 +1,37 @@
+/* This is a generated file, edit the .stub.php file instead. */
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_apache_lookup_uri, 0, 1, MAY_BE_OBJECT|MAY_BE_FALSE)
+	ZEND_ARG_TYPE_INFO(0, filename, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_virtual, 0, 1, _IS_BOOL, 0)
+	ZEND_ARG_TYPE_INFO(0, uri, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_apache_request_headers, 0, 0, IS_ARRAY, 0)
+ZEND_END_ARG_INFO()
+
+#define arginfo_getallheaders arginfo_apache_request_headers
+
+#define arginfo_apache_response_headers arginfo_apache_request_headers
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_apache_note, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
+	ZEND_ARG_TYPE_INFO(0, note_name, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, note_value, IS_STRING, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_apache_setenv, 0, 2, _IS_BOOL, 0)
+	ZEND_ARG_TYPE_INFO(0, variable, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, walk_to_top, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_apache_getenv, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
+	ZEND_ARG_TYPE_INFO(0, variable, IS_STRING, 0)
+	ZEND_ARG_TYPE_INFO(0, walk_to_top, _IS_BOOL, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_apache_get_version, 0, 0, MAY_BE_STRING|MAY_BE_FALSE)
+ZEND_END_ARG_INFO()
+
+#define arginfo_apache_get_modules arginfo_apache_request_headers
-- 
cgit v1.2.1