Merge branch 'PHP-8.4'

petk · petk · commit 7348db672a14 · 2025-01-27T23:14:31.000+01:00
diff --git a/cmake/ext/pdo_pgsql/CMakeLists.txt b/cmake/ext/pdo_pgsql/CMakeLists.txt
@@ -96,6 +96,7 @@ if(TARGET PostgreSQL::PostgreSQL)
       )
     endif()
 
+    # Available since PostgreSQL library version 12.
     if(PostgreSQL_VERSION_STRING VERSION_GREATER_EQUAL 12)
       check_symbol_exists(
         PQresultMemorySize
@@ -104,7 +105,7 @@ if(TARGET PostgreSQL::PostgreSQL)
       )
     endif()
 
-    # Available since PostgreSQL 17.
+    # Available since PostgreSQL library version 17.
     if(PostgreSQL_VERSION_STRING VERSION_GREATER_EQUAL 17)
       # Indicates the presence of PQclosePrepared, PQclosePortal, etc.
       check_symbol_exists(
diff --git a/cmake/ext/pgsql/CMakeLists.txt b/cmake/ext/pgsql/CMakeLists.txt
@@ -100,7 +100,7 @@ if(TARGET PostgreSQL::PostgreSQL)
       )
     endif()
 
-    # Available since PostgreSQL 12.
+    # Available since PostgreSQL library version 12.
     if(PostgreSQL_VERSION_STRING VERSION_GREATER_EQUAL 12)
       check_symbol_exists(
         PQresultMemorySize
@@ -114,7 +114,7 @@ if(TARGET PostgreSQL::PostgreSQL)
       ]] HAVE_PQERRORS_SQLSTATE)
     endif()
 
-    # Available since PostgreSQL 17.
+    # Available since PostgreSQL library version 17.
     if(PostgreSQL_VERSION_STRING VERSION_GREATER_EQUAL 17)
       # Indicates the presence of PQchangePassword.
       check_symbol_exists(

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,7 @@ if(TARGET PostgreSQL::PostgreSQL)`
`96`	`96`	`)`
`97`	`97`	`endif()`
`98`	`98`
	`99`	`+ # Available since PostgreSQL library version 12.`
`99`	`100`	`if(PostgreSQL_VERSION_STRING VERSION_GREATER_EQUAL 12)`
`100`	`101`	`check_symbol_exists(`
`101`	`102`	`PQresultMemorySize`
`@@ -104,7 +105,7 @@ if(TARGET PostgreSQL::PostgreSQL)`
`104`	`105`	`)`
`105`	`106`	`endif()`
`106`	`107`
`107`		`- # Available since PostgreSQL 17.`
	`108`	`+ # Available since PostgreSQL library version 17.`
`108`	`109`	`if(PostgreSQL_VERSION_STRING VERSION_GREATER_EQUAL 17)`
`109`	`110`	`# Indicates the presence of PQclosePrepared, PQclosePortal, etc.`
`110`	`111`	`check_symbol_exists(`