Merge branch 'PHP-8.5' into PHP-8.6

* PHP-8.5:
  ext/pgsql: Removed `pg_service()`, unavailable with any released libpq

# Conflicts:
#	ext/pgsql/pgsql.c
#	ext/pgsql/pgsql_arginfo.h

ext/pgsql/config.m4

@@ -31,9 +31,6 @@ if test "$PHP_PGSQL" != "no"; then
   PHP_CHECK_LIBRARY([pq], [PQclosePrepared],
     [AC_DEFINE([HAVE_PG_CLOSE_STMT], [1], [PostgreSQL 17 or later])],,
     [$PGSQL_LIBS])
-  PHP_CHECK_LIBRARY([pq], [PQservice],
-    [AC_DEFINE([HAVE_PG_SERVICE], [1], [PostgreSQL 18 or later])],,
-    [$PGSQL_LIBS])
 
   old_CFLAGS=$CFLAGS
   CFLAGS="$CFLAGS $PGSQL_CFLAGS"

ext/pgsql/pgsql.c

@@ -908,7 +908,6 @@ PHP_FUNCTION(pg_close)
 #define PHP_PG_HOST 6
 #define PHP_PG_VERSION 7
 #define PHP_PG_JIT 8
-#define PHP_PG_SERVICE 9
 
 /* php_pgsql_get_link_info */
 static void php_pgsql_get_link_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type)
@@ -993,12 +992,6 @@ static void php_pgsql_get_link_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type
 			PQclear(res);
 			return;
 		}
-#if defined(HAVE_PG_SERVICE)
-		case PHP_PG_SERVICE: {
-			result = PQservice(pgsql);
-			break;
-		}
-#endif
 		default: ZEND_UNREACHABLE();
 	}
 	if (result) {
@@ -1055,13 +1048,6 @@ PHP_FUNCTION(pg_jit)
 	php_pgsql_get_link_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_PG_JIT);
 }
 
-#if defined(HAVE_PG_SERVICE)
-PHP_FUNCTION(pg_service)
-{
-	php_pgsql_get_link_info(INTERNAL_FUNCTION_PARAM_PASSTHRU,PHP_PG_SERVICE);
-}
-#endif
-
 /* Returns the value of a server parameter */
 PHP_FUNCTION(pg_parameter_status)
 {

ext/pgsql/pgsql.stub.php

@@ -490,9 +490,6 @@ namespace {
      */
     function pg_jit(?PgSql\Connection $connection = null): array {}
 
-#ifdef HAVE_PG_SERVICE
-    function pg_service(?PgSql\Connection $connection = null): string {}
-#endif
     /**
      * @param PgSql\Connection|string $connection
      * @refcount 1

ext/pgsql/pgsql_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit pgsql.stub.php instead.
- * Stub hash: fa7cd778f4e791b15ffc8f1786384332449bda5a */
+ * Stub hash: 479126d506a84c7196796f4980d1e9e471ca71ae */
 
 #include "zend_attributes.h"
 #include "zend_constants.h"
@@ -41,12 +41,6 @@ ZEND_END_ARG_INFO()
 
 #define arginfo_pg_jit arginfo_pg_version
 
-#if defined(HAVE_PG_SERVICE)
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_pg_service, 0, 0, IS_STRING, 0)
-	ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(0, connection, PgSql\\Connection, 1, "null")
-ZEND_END_ARG_INFO()
-#endif
-
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_pg_parameter_status, 0, 1, MAY_BE_STRING|MAY_BE_FALSE)
 	ZEND_ARG_INFO(0, connection)
 	ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0)
@@ -523,9 +517,6 @@ ZEND_FUNCTION(pg_tty);
 ZEND_FUNCTION(pg_host);
 ZEND_FUNCTION(pg_version);
 ZEND_FUNCTION(pg_jit);
-#if defined(HAVE_PG_SERVICE)
-ZEND_FUNCTION(pg_service);
-#endif
 ZEND_FUNCTION(pg_parameter_status);
 ZEND_FUNCTION(pg_ping);
 ZEND_FUNCTION(pg_query);
@@ -635,9 +626,6 @@ static const zend_function_entry ext_functions[] = {
 	ZEND_FE(pg_host, arginfo_pg_host)
 	ZEND_FE(pg_version, arginfo_pg_version)
 	ZEND_FE(pg_jit, arginfo_pg_jit)
-#if defined(HAVE_PG_SERVICE)
-	ZEND_FE(pg_service, arginfo_pg_service)
-#endif
 	ZEND_FE(pg_parameter_status, arginfo_pg_parameter_status)
 	ZEND_FE(pg_ping, arginfo_pg_ping)
 	ZEND_FE(pg_query, arginfo_pg_query)

ext/pgsql/tests/pg_service.phpt

@@ -1,19 +0,0 @@
---TEST--
-PostgreSQL connection service field support
---EXTENSIONS--
-pgsql
---SKIPIF--
-<?php 
-include("inc/skipif.inc"); 
-if (!function_exists("pg_service")) die("skip pg_service unsupported");
-?>
---FILE--
-<?php
-include('inc/config.inc');
-
-$db = pg_connect($conn_str);
-var_dump(pg_service($db));
-pg_close($db);
-?>
---EXPECTF--
-string(%d) "%A"