From 510a9ea44353359b213c3827f5d1abb5405a5bea Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Wed, 8 Nov 2023 08:39:05 +0100
Subject: [PATCH 1/2] Fix GH-12628: The gh11374 test fails on Alpinelinux

---
 ext/pcre/tests/gh11374.phpt  |  6 ++++++
 ext/zend_test/test.c         |  9 +++++++++
 ext/zend_test/test.stub.php  |  2 ++
 ext/zend_test/test_arginfo.h | 10 +++++++---
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/ext/pcre/tests/gh11374.phpt b/ext/pcre/tests/gh11374.phpt
index 07f8f4bccfd0a..29f6485cc0440 100644
--- a/ext/pcre/tests/gh11374.phpt
+++ b/ext/pcre/tests/gh11374.phpt
@@ -1,5 +1,11 @@
 --TEST--
 GH-11374 (PCRE regular expression without JIT enabled gives different result)
+--EXTENSIONS--
+zend_test
+--SKIPIF--
+<?php
+if (!zend_test_is_pcre_bundled() && (PCRE_VERSION_MAJOR == 10 && PCRE_VERSION_MINOR <= 42)) die("skip old pcre version");
+?>
 --FILE--
 <?php
 
diff --git a/ext/zend_test/test.c b/ext/zend_test/test.c
index c1c65450ea907..467acceda1ba3 100644
--- a/ext/zend_test/test.c
+++ b/ext/zend_test/test.c
@@ -364,6 +364,15 @@ static ZEND_FUNCTION(zend_test_crash)
 	php_printf("%s", invalid);
 }
 
+static ZEND_FUNCTION(zend_test_is_pcre_bundled)
+{
+#if HAVE_BUNDLED_PCRE
+	RETURN_TRUE;
+#else
+	RETURN_FALSE;
+#endif
+}
+
 static zend_object *zend_test_class_new(zend_class_entry *class_type)
 {
 	zend_object *obj = zend_objects_new(class_type);
diff --git a/ext/zend_test/test.stub.php b/ext/zend_test/test.stub.php
index 364792a5665e8..07d7fa7e19927 100644
--- a/ext/zend_test/test.stub.php
+++ b/ext/zend_test/test.stub.php
@@ -125,6 +125,8 @@ function zend_test_crash(?string $message = null): void {}
 #if defined(HAVE_LIBXML) && !defined(PHP_WIN32)
 function zend_test_override_libxml_global_state(): void {}
 #endif
+
+    function zend_test_is_pcre_bundled(): bool {}
 }
 
 namespace ZendTestNS {
diff --git a/ext/zend_test/test_arginfo.h b/ext/zend_test/test_arginfo.h
index a8b84cbdeea62..6e3f645e3d143 100644
--- a/ext/zend_test/test_arginfo.h
+++ b/ext/zend_test/test_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 7effabe18579113dbfc4c61231d93c8c262d959a */
+ * Stub hash: ae75eda2b4b40224858d680c3fcf3d7cd2056bb6 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_test_array_return, 0, 0, IS_ARRAY, 0)
 ZEND_END_ARG_INFO()
@@ -91,9 +91,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_test_override_libxml_global
 ZEND_END_ARG_INFO()
 #endif
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ZendTestNS2_ZendSubNS_namespaced_func, 0, 0, _IS_BOOL, 0)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_zend_test_is_pcre_bundled, 0, 0, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
+#define arginfo_ZendTestNS2_ZendSubNS_namespaced_func arginfo_zend_test_is_pcre_bundled
+
 #define arginfo_class__ZendTestClass_is_object arginfo_zend_get_map_ptr_last
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class__ZendTestClass___toString, 0, 0, 0)
@@ -112,7 +114,7 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_class__ZendTestChildClass_returnsThrowable, 0, 0, Exception, 0)
 ZEND_END_ARG_INFO()
 
-#define arginfo_class__ZendTestTrait_testMethod arginfo_ZendTestNS2_ZendSubNS_namespaced_func
+#define arginfo_class__ZendTestTrait_testMethod arginfo_zend_test_is_pcre_bundled
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ZendTestParameterAttribute___construct, 0, 0, 1)
 	ZEND_ARG_TYPE_INFO(0, parameter, IS_STRING, 0)
@@ -156,6 +158,7 @@ static ZEND_FUNCTION(zend_test_crash);
 #if defined(HAVE_LIBXML) && !defined(PHP_WIN32)
 static ZEND_FUNCTION(zend_test_override_libxml_global_state);
 #endif
+static ZEND_FUNCTION(zend_test_is_pcre_bundled);
 static ZEND_FUNCTION(namespaced_func);
 static ZEND_METHOD(_ZendTestClass, is_object);
 static ZEND_METHOD(_ZendTestClass, __toString);
@@ -199,6 +202,7 @@ static const zend_function_entry ext_functions[] = {
 #if defined(HAVE_LIBXML) && !defined(PHP_WIN32)
 	ZEND_FE(zend_test_override_libxml_global_state, arginfo_zend_test_override_libxml_global_state)
 #endif
+	ZEND_FE(zend_test_is_pcre_bundled, arginfo_zend_test_is_pcre_bundled)
 	ZEND_NS_FE("ZendTestNS2\\ZendSubNS", namespaced_func, arginfo_ZendTestNS2_ZendSubNS_namespaced_func)
 	ZEND_FE_END
 };

From 488b47d05287c407ea2a9844921f9149881622c7 Mon Sep 17 00:00:00 2001
From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
Date: Wed, 8 Nov 2023 17:56:35 +0100
Subject: [PATCH 2/2] Fix ZPP arginfo violation

---
 ext/zend_test/test.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ext/zend_test/test.c b/ext/zend_test/test.c
index 467acceda1ba3..2f3ff6d9009e6 100644
--- a/ext/zend_test/test.c
+++ b/ext/zend_test/test.c
@@ -366,6 +366,7 @@ static ZEND_FUNCTION(zend_test_crash)
 
 static ZEND_FUNCTION(zend_test_is_pcre_bundled)
 {
+	ZEND_PARSE_PARAMETERS_NONE();
 #if HAVE_BUNDLED_PCRE
 	RETURN_TRUE;
 #else