From 2985c78bad0e27c632af992c8548ec78fac526ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Wed, 8 May 2024 10:08:24 +0200 Subject: [PATCH 1/2] fix: getallheaders() must return request headers --- frankenphp.stub.php | 2 +- frankenphp_arginfo.h | 49 ++++++++++++++++++-------------------------- 2 files changed, 21 insertions(+), 30 deletions(-) diff --git a/frankenphp.stub.php b/frankenphp.stub.php index d166dc5d36..6c5a71cb5c 100644 --- a/frankenphp.stub.php +++ b/frankenphp.stub.php @@ -21,7 +21,7 @@ function frankenphp_request_headers(): array {} function apache_request_headers(): array {} /** - * @alias frankenphp_response_headers + * @alias frankenphp_request_headers */ function getallheaders(): array {} diff --git a/frankenphp_arginfo.h b/frankenphp_arginfo.h index c343e9f320..f6501e2fd2 100644 --- a/frankenphp_arginfo.h +++ b/frankenphp_arginfo.h @@ -1,57 +1,48 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 467f1406e17d3b8ca67bba5ea367194e60d8dd27 */ + * Stub hash: 05ebde17137c559e891362fba6524fad1e0a2dfe */ -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_frankenphp_handle_request, 0, 1, - _IS_BOOL, 0) -ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_frankenphp_handle_request, 0, 1, _IS_BOOL, 0) + ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_headers_send, 0, 0, IS_LONG, 0) -ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, status, IS_LONG, 0, "200") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, status, IS_LONG, 0, "200") ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_frankenphp_finish_request, 0, 0, - _IS_BOOL, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_frankenphp_finish_request, 0, 0, _IS_BOOL, 0) ZEND_END_ARG_INFO() #define arginfo_fastcgi_finish_request arginfo_frankenphp_finish_request -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_frankenphp_request_headers, 0, - 0, IS_ARRAY, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_frankenphp_request_headers, 0, 0, IS_ARRAY, 0) ZEND_END_ARG_INFO() #define arginfo_apache_request_headers arginfo_frankenphp_request_headers #define arginfo_getallheaders arginfo_frankenphp_request_headers -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_frankenphp_response_headers, 0, - 0, MAY_BE_ARRAY | MAY_BE_BOOL) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_frankenphp_response_headers, 0, 0, MAY_BE_ARRAY|MAY_BE_BOOL) ZEND_END_ARG_INFO() #define arginfo_apache_response_headers arginfo_frankenphp_response_headers + ZEND_FUNCTION(frankenphp_handle_request); ZEND_FUNCTION(headers_send); ZEND_FUNCTION(frankenphp_finish_request); ZEND_FUNCTION(frankenphp_request_headers); ZEND_FUNCTION(frankenphp_response_headers); + static const zend_function_entry ext_functions[] = { - ZEND_FE(frankenphp_handle_request, arginfo_frankenphp_handle_request) - ZEND_FE(headers_send, arginfo_headers_send) ZEND_FE( - frankenphp_finish_request, arginfo_frankenphp_finish_request) - ZEND_FALIAS(fastcgi_finish_request, frankenphp_finish_request, - arginfo_fastcgi_finish_request) - ZEND_FE(frankenphp_request_headers, - arginfo_frankenphp_request_headers) - ZEND_FALIAS(apache_request_headers, - frankenphp_request_headers, - arginfo_apache_request_headers) - ZEND_FALIAS(getallheaders, frankenphp_response_headers, - arginfo_getallheaders) - ZEND_FE(frankenphp_response_headers, - arginfo_frankenphp_response_headers) - ZEND_FALIAS(apache_response_headers, - frankenphp_response_headers, - arginfo_apache_response_headers) - ZEND_FE_END}; + ZEND_FE(frankenphp_handle_request, arginfo_frankenphp_handle_request) + ZEND_FE(headers_send, arginfo_headers_send) + ZEND_FE(frankenphp_finish_request, arginfo_frankenphp_finish_request) + ZEND_FALIAS(fastcgi_finish_request, frankenphp_finish_request, arginfo_fastcgi_finish_request) + ZEND_FE(frankenphp_request_headers, arginfo_frankenphp_request_headers) + ZEND_FALIAS(apache_request_headers, frankenphp_request_headers, arginfo_apache_request_headers) + ZEND_FALIAS(getallheaders, frankenphp_request_headers, arginfo_getallheaders) + ZEND_FE(frankenphp_response_headers, arginfo_frankenphp_response_headers) + ZEND_FALIAS(apache_response_headers, frankenphp_response_headers, arginfo_apache_response_headers) + ZEND_FE_END +}; From d4af65ccde76a3860f6b68e46e9141f2db553063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Wed, 8 May 2024 10:09:05 +0200 Subject: [PATCH 2/2] cs --- frankenphp_arginfo.h | 47 ++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/frankenphp_arginfo.h b/frankenphp_arginfo.h index f6501e2fd2..ec97502e74 100644 --- a/frankenphp_arginfo.h +++ b/frankenphp_arginfo.h @@ -1,48 +1,57 @@ /* This is a generated file, edit the .stub.php file instead. * Stub hash: 05ebde17137c559e891362fba6524fad1e0a2dfe */ -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_frankenphp_handle_request, 0, 1, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_frankenphp_handle_request, 0, 1, + _IS_BOOL, 0) +ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 0) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_headers_send, 0, 0, IS_LONG, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, status, IS_LONG, 0, "200") +ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, status, IS_LONG, 0, "200") ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_frankenphp_finish_request, 0, 0, _IS_BOOL, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_frankenphp_finish_request, 0, 0, + _IS_BOOL, 0) ZEND_END_ARG_INFO() #define arginfo_fastcgi_finish_request arginfo_frankenphp_finish_request -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_frankenphp_request_headers, 0, 0, IS_ARRAY, 0) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_frankenphp_request_headers, 0, + 0, IS_ARRAY, 0) ZEND_END_ARG_INFO() #define arginfo_apache_request_headers arginfo_frankenphp_request_headers #define arginfo_getallheaders arginfo_frankenphp_request_headers -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_frankenphp_response_headers, 0, 0, MAY_BE_ARRAY|MAY_BE_BOOL) +ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_frankenphp_response_headers, 0, + 0, MAY_BE_ARRAY | MAY_BE_BOOL) ZEND_END_ARG_INFO() #define arginfo_apache_response_headers arginfo_frankenphp_response_headers - ZEND_FUNCTION(frankenphp_handle_request); ZEND_FUNCTION(headers_send); ZEND_FUNCTION(frankenphp_finish_request); ZEND_FUNCTION(frankenphp_request_headers); ZEND_FUNCTION(frankenphp_response_headers); - static const zend_function_entry ext_functions[] = { - ZEND_FE(frankenphp_handle_request, arginfo_frankenphp_handle_request) - ZEND_FE(headers_send, arginfo_headers_send) - ZEND_FE(frankenphp_finish_request, arginfo_frankenphp_finish_request) - ZEND_FALIAS(fastcgi_finish_request, frankenphp_finish_request, arginfo_fastcgi_finish_request) - ZEND_FE(frankenphp_request_headers, arginfo_frankenphp_request_headers) - ZEND_FALIAS(apache_request_headers, frankenphp_request_headers, arginfo_apache_request_headers) - ZEND_FALIAS(getallheaders, frankenphp_request_headers, arginfo_getallheaders) - ZEND_FE(frankenphp_response_headers, arginfo_frankenphp_response_headers) - ZEND_FALIAS(apache_response_headers, frankenphp_response_headers, arginfo_apache_response_headers) - ZEND_FE_END -}; + ZEND_FE(frankenphp_handle_request, arginfo_frankenphp_handle_request) + ZEND_FE(headers_send, arginfo_headers_send) ZEND_FE( + frankenphp_finish_request, arginfo_frankenphp_finish_request) + ZEND_FALIAS(fastcgi_finish_request, frankenphp_finish_request, + arginfo_fastcgi_finish_request) + ZEND_FE(frankenphp_request_headers, + arginfo_frankenphp_request_headers) + ZEND_FALIAS(apache_request_headers, + frankenphp_request_headers, + arginfo_apache_request_headers) + ZEND_FALIAS(getallheaders, frankenphp_request_headers, + arginfo_getallheaders) + ZEND_FE(frankenphp_response_headers, + arginfo_frankenphp_response_headers) + ZEND_FALIAS(apache_response_headers, + frankenphp_response_headers, + arginfo_apache_response_headers) + ZEND_FE_END};