changes from review

Author: devnexen

UPGRADING

@@ -187,6 +187,9 @@ PHP 8.3 UPGRADE NOTES
   . Added posix_fpathconf call to get configuration value from a file descriptor.
   . Added posix_eaccess call to check the effective user id's permission for a path.
 
+- PGSQL:
+  . Added pg_set_error_context_visilibity to set the visibility of the context in error messages.
+
 - Random:
   . Added Randomizer::getBytesFromString().
     RFC: https://wiki.php.net/rfc/randomizer_additions

ext/pgsql/pgsql.c

@@ -2840,26 +2840,19 @@ PHP_FUNCTION(pg_set_error_context_visibility)
 	PGconn *pgsql;
 	pgsql_link_handle *link;
 
-	if (ZEND_NUM_ARGS() == 1) {
-		if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &visibility) == FAILURE) {
-			RETURN_THROWS();
-		}
-		link = FETCH_DEFAULT_LINK();
-		CHECK_DEFAULT_LINK(link);
-	} else {
-		if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ol", &pgsql_link, pgsql_link_ce, &visibility) == FAILURE) {
-			RETURN_THROWS();
-		}
-		link = Z_PGSQL_LINK_P(pgsql_link);
-		CHECK_PGSQL_LINK(link);
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ol", &pgsql_link, pgsql_link_ce, &visibility) == FAILURE) {
+		RETURN_THROWS();
 	}
+	link = Z_PGSQL_LINK_P(pgsql_link);
+	CHECK_PGSQL_LINK(link);
 
 	pgsql = link->conn;
 
-	if (visibility & (PQSHOW_CONTEXT_NEVER|PQSHOW_CONTEXT_ERRORS|PQSHOW_CONTEXT_ALWAYS)) {
+	if (visibility == PQSHOW_CONTEXT_NEVER || visibility & (PQSHOW_CONTEXT_ERRORS|PQSHOW_CONTEXT_ALWAYS)) {
 		RETURN_LONG(PQsetErrorContextVisibility(pgsql, visibility));
 	} else {
-		RETURN_FALSE;
+		zend_argument_value_error(2, "must be one of PGSQL_SHOW_CONTEXT_NEVER, PGSQL_SHOW_CONTEXT_ERRORS or PGSQL_SHOW_CONTEXT_ALWAYS");
+		RETURN_THROWS();
 	}
 }
 

ext/pgsql/pgsql.stub.php

@@ -972,7 +972,7 @@ function pg_pipeline_status(PgSql\Connection $connection): int {}
 #endif
 
     /** @param PgSql\Connection|int $connection */
-    function pg_set_error_context_visibility($connection, int $visibility = UNKNOWN): int|false {}
+    function pg_set_error_context_visibility(PgSql\Connection $connection, int $visibility): int {}
 }
 
 namespace PgSql {

ext/pgsql/pgsql_arginfo.h

@@ -21,11 +21,9 @@ if (function_exists('pg_set_error_verbosity')) {
     pg_set_error_verbosity($db, PGSQL_ERRORS_VERBOSE);
     pg_set_error_verbosity($db, PGSQL_ERRORS_SQLSTATE);
 }
-if (function_exists('pg_set_error_context_visibility')) {
-    pg_set_error_context_visibility($db, PGSQL_SHOW_CONTEXT_NEVER);
-    pg_set_error_context_visibility($db, PGSQL_SHOW_CONTEXT_ERRORS);
-    pg_set_error_context_visibility($db, PGSQL_SHOW_CONTEXT_ALWAYS);
-}
+pg_set_error_context_visibility($db, PGSQL_SHOW_CONTEXT_NEVER);
+pg_set_error_context_visibility($db, PGSQL_SHOW_CONTEXT_ERRORS);
+pg_set_error_context_visibility($db, PGSQL_SHOW_CONTEXT_ALWAYS);
 echo "OK";
 ?>
 --EXPECT--