Skip to content

Commit 5b4b012

Browse files
committed
remove PDO::pgsqlSetNoticeCallback()
Keep only PdoPgsql::setNoticeCallback()
1 parent 2accbe3 commit 5b4b012

6 files changed

+11
-27
lines changed

ext/pdo_pgsql/pgsql_driver.stub.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,4 @@ public function pgsqlGetPid(): int {}
3737
/* Do NOT add new methods here. See https://wiki.php.net/rfc/pdo_driver_specific_subclasses
3838
* Any new feature should be declared only on PdoPgsql.
3939
*/
40-
#if 1
41-
/** @implementation-alias PdoPgsql::setNoticeCallback */
42-
public function pgsqlSetNoticeCallback(?callable $callback): void {}
43-
#endif
4440
}

ext/pdo_pgsql/pgsql_driver_arginfo.h

Lines changed: 1 addition & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ext/pdo_pgsql/tests/issue78621.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
require_once dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
33
require_once dirname(__FILE__) . '/config.inc';
44
if (!isset($db)) {
5-
$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
5+
$db = new PdoPgsql($config['ENV']['PDOTEST_DSN']);
66
}
77
if (!isset($rounds) || empty($rounds)) {
88
$rounds = [ null, 'Re' ];
@@ -25,7 +25,7 @@ echo "Caught TypeError: ".$err->getMessage()."\n";
2525
$db->exec("delete from t");
2626
$db->exec("insert into t values ('ah')");
2727
}
28-
$db->pgsqlSetNoticeCallback(null);
28+
$db->setNoticeCallback(null);
2929
$db->exec("delete from t");
3030
$db->exec("insert into t values ('ah')");
3131
var_dump($db->query("select * from t")->fetchAll(PDO::FETCH_ASSOC));

ext/pdo_pgsql/tests/issue78621.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
pgsqlSetNoticeCallback catches Postgres "raise notice".
2+
PdoPgsql::setNoticeCallback catches Postgres "raise notice".
33
--SKIPIF--
44
<?php
55
if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded');
@@ -13,7 +13,7 @@ function disp($message) { echo trim($message)."\n"; }
1313
function dispRe($message) { echo "Re".trim($message)."\n"; }
1414
function attach($db, $prefix = '')
1515
{
16-
$db->pgsqlSetNoticeCallback('disp'.$prefix);
16+
$db->setNoticeCallback('disp'.$prefix);
1717
}
1818
require dirname(__FILE__) . '/issue78621.inc';
1919
?>

ext/pdo_pgsql/tests/issue78621_closure.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
pgsqlSetNoticeCallback catches Postgres "raise notice".
2+
PdoPgsql::setNoticeCallback catches Postgres "raise notice".
33
--SKIPIF--
44
<?php
55
if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded');
@@ -16,13 +16,13 @@ function attach($db, $prefix = '')
1616
switch($flavor)
1717
{
1818
case 0:
19-
$db->pgsqlSetNoticeCallback(function($message) use($prefix) { echo $prefix.trim($message)."\n"; });
19+
$db->setNoticeCallback(function($message) use($prefix) { echo $prefix.trim($message)."\n"; });
2020
// https://github.com/php/php-src/pull/4823#pullrequestreview-335623806
2121
$eraseCallbackMemoryHere = (object)[1];
2222
break;
2323
case 1:
2424
$closure = function($message) use($prefix) { echo $prefix.'('.get_class($this).')'.trim($message)."\n"; };
25-
$db->pgsqlSetNoticeCallback($closure->bindTo(new \stdClass));
25+
$db->setNoticeCallback($closure->bindTo(new \stdClass));
2626
break;
2727
}
2828
}

ext/pdo_pgsql/tests/issue78621_method.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
pgsqlSetNoticeCallback catches Postgres "raise notice".
2+
PdoPgsql::setNoticeCallback catches Postgres "raise notice".
33
--SKIPIF--
44
<?php
55
if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded');
@@ -27,8 +27,8 @@ function attach($db, $prefix = '')
2727
global $flavor;
2828
switch($flavor)
2929
{
30-
case 0: $db->pgsqlSetNoticeCallback([ $logger, 'disp'.$prefix ]); break;
31-
case 1: $db->pgsqlSetNoticeCallback([ $logger, 'whatever'.$prefix ]); break;
30+
case 0: $db->setNoticeCallback([ $logger, 'disp'.$prefix ]); break;
31+
case 1: $db->setNoticeCallback([ $logger, 'whatever'.$prefix ]); break;
3232
}
3333
}
3434
echo "Testing with method explicitely plugged:\n";

0 commit comments

Comments
 (0)