Merge branch 'PHP-8.2' into PHP-8.3

* PHP-8.2:
  Fix GH-12633: sqlite3_defensive.phpt fails with sqlite 3.44.0
  Fix GH-12628: The gh11374 test fails on Alpinelinux

Author: ndossche

NEWS

@@ -2,9 +2,16 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? ????, PHP 8.3.0
 
+- PCRE:
+  . Fixed bug GH-12628 (The gh11374 test fails on Alpinelinux). (nielsdos)
+
 - Standard:
   . Fix memory leak in syslog device handling. (danog)
 
+- SQLite3:
+  . Fixed bug GH-12633 (sqlite3_defensive.phpt fails with sqlite 3.44.0).
+    (SakiTakamachi)
+
 09 Nov 2023, PHP 8.3.0RC6
 
 - Core:

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
 

ext/sqlite3/tests/sqlite3_defensive.phpt

@@ -20,7 +20,6 @@ var_dump($db->exec('CREATE TABLE test (a, b);'));
 
 // This does not generate an error!
 var_dump($db->exec('PRAGMA writable_schema = ON;'));
-var_dump($db->querySingle('PRAGMA writable_schema;'));
 
 // Should be 1
 var_dump($db->querySingle('SELECT COUNT(*) FROM sqlite_master;'));
@@ -35,7 +34,6 @@ var_dump($db->querySingle('SELECT COUNT(*) FROM sqlite_master;'));
 bool(true)
 bool(true)
 int(1)
-int(1)
 
 Warning: SQLite3::querySingle(): Unable to prepare statement: table sqlite_master may not be modified in %s on line %d
 bool(false)

ext/zend_test/test.c

@@ -655,6 +655,16 @@ static ZEND_FUNCTION(get_open_basedir)
 	}
 }
 
+static ZEND_FUNCTION(zend_test_is_pcre_bundled)
+{
+	ZEND_PARSE_PARAMETERS_NONE();
+#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);

ext/zend_test/test.stub.php

@@ -239,6 +239,8 @@ function get_open_basedir(): ?string {}
 #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 {