PdoPgsql::setNoticeCallback() preferred over PDO::pgsqlSetNoticeCallback()

see php#14299

Author: outtersg

ext/pdo_pgsql/pdo_pgsql.c

@@ -145,6 +145,37 @@ PHP_METHOD(PdoPgsql, getPid)
 	pgsqlGetPid_internal(INTERNAL_FUNCTION_PARAM_PASSTHRU);
 }
 
+/* {{{ Sets a callback to receive DB notices (after client_min_messages has been set) */
+PHP_METHOD(PdoPgsql, setNoticeCallback)
+{
+	zend_fcall_info fci = empty_fcall_info;
+	zend_fcall_info_cache fcc = empty_fcall_info_cache;
+	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "F!", &fci, &fcc)) {
+		RETURN_THROWS();
+	}
+
+	pdo_dbh_t *dbh = Z_PDO_DBH_P(ZEND_THIS);
+	PDO_CONSTRUCT_CHECK_WITH_CLEANUP(cleanup);
+
+	pdo_pgsql_db_handle *H = (pdo_pgsql_db_handle *)dbh->driver_data;
+
+	pdo_pgsql_cleanup_notice_callback(H);
+
+	if (ZEND_FCC_INITIALIZED(fcc)) {
+		H->notice_callback = emalloc(sizeof(zend_fcall_info_cache));
+		zend_fcc_dup(H->notice_callback, &fcc);
+	}
+
+	return;
+
+cleanup:
+	if (ZEND_FCC_INITIALIZED(fcc)) {
+		zend_fcc_dtor(&fcc);
+	}
+	RETURN_THROWS();
+}
+/* }}} */
+
 /* true global environment */
 
 /* {{{ PHP_MINIT_FUNCTION */

ext/pdo_pgsql/pdo_pgsql.stub.php

@@ -53,6 +53,5 @@ public function getNotify(int $fetchMode = PDO::FETCH_DEFAULT, int $timeoutMilli
 
     public function getPid(): int {}
 
-    /** @implementation-alias PDO_PGSql_Ext::pgsqlSetNoticeCallback */
     public function setNoticeCallback(?callable $callback): void {}
 }

ext/pdo_pgsql/pdo_pgsql_arginfo.h

@@ -132,7 +132,7 @@ static void pdo_pgsql_fetch_error_func(pdo_dbh_t *dbh, pdo_stmt_t *stmt, zval *i
 }
 /* }}} */
 
-static void pdo_pgsql_cleanup_notice_callback(pdo_pgsql_db_handle *H) /* {{{ */
+void pdo_pgsql_cleanup_notice_callback(pdo_pgsql_db_handle *H) /* {{{ */
 {
 	if (H->notice_callback) {
 		zend_fcc_dtor(H->notice_callback);
@@ -1242,37 +1242,6 @@ PHP_METHOD(PDO_PGSql_Ext, pgsqlGetPid)
 }
 /* }}} */
 
-/* {{{ Sets a callback to receive DB notices (after client_min_messages has been set) */
-PHP_METHOD(PDO_PGSql_Ext, pgsqlSetNoticeCallback)
-{
-	zend_fcall_info fci = empty_fcall_info;
-	zend_fcall_info_cache fcc = empty_fcall_info_cache;
-	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "F!", &fci, &fcc)) {
-		RETURN_THROWS();
-	}
-	
-	pdo_dbh_t *dbh = Z_PDO_DBH_P(ZEND_THIS);
-	PDO_CONSTRUCT_CHECK_WITH_CLEANUP(cleanup);
-	
-	pdo_pgsql_db_handle *H = (pdo_pgsql_db_handle *)dbh->driver_data;
-	
-	pdo_pgsql_cleanup_notice_callback(H);
-	
-	if (ZEND_FCC_INITIALIZED(fcc)) {
-		H->notice_callback = emalloc(sizeof(zend_fcall_info_cache));
-		zend_fcc_dup(H->notice_callback, &fcc);
-	}
-
-	return;
-
-cleanup:
-	if (ZEND_FCC_INITIALIZED(fcc)) {
-		zend_fcc_dtor(&fcc);
-	}
-	RETURN_THROWS();
-}
-/* }}} */
-
 static const zend_function_entry *pdo_pgsql_get_driver_methods(pdo_dbh_t *dbh, int kind)
 {
 	switch (kind) {

ext/pdo_pgsql/pgsql_driver.c

@@ -34,6 +34,11 @@ public function pgsqlGetNotify(int $fetchMode = PDO::FETCH_DEFAULT, int $timeout
     /** @tentative-return-type */
     public function pgsqlGetPid(): int {}
 
-    /** @tentative-return-type */
+    /* Do NOT add new methods here. See https://wiki.php.net/rfc/pdo_driver_specific_subclasses
+     * Any new feature should be declared only on PdoPgsql.
+     */
+#if 1
+    /** @implementation-alias PdoPgsql::setNoticeCallback */
     public function pgsqlSetNoticeCallback(?callable $callback): void {}
+#endif
 }

ext/pdo_pgsql/pgsql_driver.stub.php

@@ -108,6 +108,8 @@ enum pdo_pgsql_specific_constants {
 php_stream *pdo_pgsql_create_lob_stream(zval *pdh, int lfd, Oid oid);
 extern const php_stream_ops pdo_pgsql_lob_stream_ops;
 
+void pdo_pgsql_cleanup_notice_callback(pdo_pgsql_db_handle *H);
+
 void pdo_libpq_version(char *buf, size_t len);
 void pdo_pgsql_close_lob_streams(pdo_dbh_t *dbh);