Merge branch 'PHP-8.2'

Author: bwoebi

Zend/zend_execute.c

@@ -1227,8 +1227,8 @@ static zend_never_inline ZEND_ATTRIBUTE_UNUSED bool zend_verify_internal_arg_typ
  * trust that arginfo matches what is enforced by zend_parse_parameters. */
 ZEND_API bool zend_internal_call_should_throw(zend_function *fbc, zend_execute_data *call)
 {
-	if (fbc->internal_function.handler == ZEND_FN(pass)) {
-		/* Be lenient about the special pass function. */
+	if (fbc->internal_function.handler == ZEND_FN(pass) || (fbc->internal_function.fn_flags | ZEND_ACC_FAKE_CLOSURE)) {
+		/* Be lenient about the special pass function and about fake closures. */
 		return 0;
 	}
 

ext/pdo/pdo_dbh.c

@@ -1254,7 +1254,7 @@ bool pdo_hash_methods(pdo_dbh_object_t *dbh_obj, int kind)
 		func.function_name = zend_string_init(funcs->fname, strlen(funcs->fname), dbh->is_persistent);
 		func.scope = dbh_obj->std.ce;
 		func.prototype = NULL;
-		ZEND_MAP_PTR(func.run_time_cache) = rt_cache_size ? pemalloc(rt_cache_size, dbh->is_persistent) : NULL;
+		ZEND_MAP_PTR(func.run_time_cache) = rt_cache_size ? pecalloc(rt_cache_size, 1, dbh->is_persistent) : NULL;
 		func.T = ZEND_OBSERVER_ENABLED;
 		if (funcs->flags) {
 			func.fn_flags = funcs->flags | ZEND_ACC_NEVER_CACHE;

ext/zend_test/tests/observer_sqlite_create_function.phpt

@@ -0,0 +1,51 @@
+--TEST--
+Observer: PDO::sqliteCreateFunction() can be observed
+--EXTENSIONS--
+zend_test
+PDO
+pdo_sqlite
+--INI--
+zend_test.observer.enabled=1
+zend_test.observer.observe_all=1
+--FILE--
+<?php
+
+function returnOne() {
+    return 1;
+}
+
+$db = new PDO('sqlite::memory:');
+$db->sqliteCreateFunction('returnOne', 'returnOne', 0);
+
+foreach ($db->query('SELECT returnOne()') as $row) {
+    var_dump($row);
+}
+
+echo 'Done' . PHP_EOL;
+?>
+--EXPECTF--
+<!-- init '%s' -->
+<file '%s'>
+  <!-- init PDO::__construct() -->
+  <PDO::__construct>
+  </PDO::__construct>
+  <!-- init PDO::sqliteCreateFunction() -->
+  <PDO::sqliteCreateFunction>
+  </PDO::sqliteCreateFunction>
+  <!-- init PDO::query() -->
+  <PDO::query>
+    <!-- init returnOne() -->
+    <returnOne>
+    </returnOne>
+  </PDO::query>
+  <!-- init var_dump() -->
+  <var_dump>
+array(2) {
+  ["returnOne()"]=>
+  int(1)
+  [0]=>
+  int(1)
+}
+  </var_dump>
+Done
+</file '%s'>