PdoPgsql::setNoticeCallback(): test with unimplemented trampoline

Add a test with a runtime BadMethodCallException.
Streamline issue78621_method.phpt.

Author: outtersg

ext/pdo_pgsql/tests/issue78621.inc

@@ -19,11 +19,15 @@ $db->exec("insert into t values ('ah')");
 while (count($rounds)) {
     try {
         attach($db, array_shift($rounds));
-    } catch (TypeError $err) {
-        echo "Caught TypeError: ".$err->getMessage()."\n";
+    } catch (Throwable $err) {
+        echo "Caught ".get_class($err).": ".$err->getMessage()."\n";
+    }
+    try {
+        $db->exec("delete from t");
+        $db->exec("insert into t values ('ah')");
+    } catch (Throwable $err) {
+        echo "Caught ".get_class($err)." ".$err->getMessage()."\n";
     }
-    $db->exec("delete from t");
-    $db->exec("insert into t values ('ah')");
 }
 $db->setNoticeCallback(null);
 $db->exec("delete from t");

ext/pdo_pgsql/tests/issue78621_method.phpt

@@ -16,26 +16,24 @@ class Logger
     public function __call(string $method, array $args)
     {
         $realMethod = strtr($method, [ 'whatever' => 'disp' ]);
+        if (!method_exists($this, $realMethod)) {
+            throw new BadMethodCallException('Call to undefined method '.__CLASS__.'::'.$realMethod);
+        }
         echo "$method trampoline for $realMethod\n";
         return call_user_func_array([ $this, $realMethod ], $args);
     }
 }
 $logger = new Logger();
-function attach($db, $prefix = '')
+function attach($db, $method)
 {
     global $logger;
-    global $flavor;
-    switch($flavor)
-    {
-        case 0: $db->setNoticeCallback([ $logger, 'disp'.$prefix ]); break;
-        case 1: $db->setNoticeCallback([ $logger, 'whatever'.$prefix ]); break;
-    }
+    $db->setNoticeCallback([ $logger, $method ]);
 }
 echo "Testing with method explicitely plugged:\n";
-$flavor = 0;
+$rounds = [ 'disp', 'dispRe' ];
 require dirname(__FILE__) . '/issue78621.inc';
 echo "Testing with a bit of magic:\n";
-++$flavor;
+$rounds = [ 'whatever', 'whateverRe', 'unexisting' ];
 require dirname(__FILE__) . '/issue78621.inc';
 ?>
 --EXPECT--
@@ -55,6 +53,7 @@ whatever trampoline for disp
 NOTICE:  I tampered your data, did you know?
 whateverRe trampoline for dispRe
 ReNOTICE:  I tampered your data, did you know?
+Caught BadMethodCallException Call to undefined method Logger::unexisting
 array(1) {
   [0]=>
   array(1) {

ext/pdo_pgsql/tests/pdopgsql_setNoticeCallback_trampoline_no_leak.phpt

@@ -0,0 +1,46 @@
+--TEST--
+PdoPgsql::setNoticeCallback() use F ZPP for trampoline callback and does not leak
+--EXTENSIONS--
+pdo
+pdo_pgsql
+--SKIPIF--
+<?php
+require __DIR__ . '/config.inc';
+require dirname(__DIR__, 2) . '/pdo/tests/pdo_test.inc';
+PDOTest::skip();
+?>
+--FILE--
+<?php
+
+require_once __DIR__ . "/config.inc";
+
+$db = new PdoPgsql($config['ENV']['PDOTEST_DSN']);
+
+function disp($message) { echo trim($message)."\n"; }
+function attach($db, $callback) { $db->setNoticeCallback($callback); }
+
+class T { public function z($m) { echo $m."\n"; } public function __call($m, $p) { echo "bah $m\n"; } }
+$t = new T;
+$rounds = [
+    [ $t, 'disp' ],
+    3, // Error, so the old callback is kept, and will be used in the call that follows the caught error.
+    null, // No callback. Hopefully this clears everything.
+    'wouldAnyoneNameAFunctionThatWay', // So this one will crash and *no output will follow*.
+];
+require __DIR__ . '/issue78621.inc';
+
+?>
+--EXPECTF--
+bah disp
+Caught TypeError: %s: Argument #1 ($callback) %s
+bah disp
+Caught TypeError: %s: Argument #1 ($callback) %s
+array(1) {
+  [0]=>
+  array(1) {
+    ["a"]=>
+    string(2) "oh"
+  }
+}
+Done
+