Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/ext/gd/CMakeLists.txt

@@ -301,8 +301,8 @@ if(NOT PHP_EXT_GD_EXTERNAL)
   target_include_directories(php_ext_gd PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/libgd)
 
   # Add -Wno-strict-prototypes C flag: https://github.com/php/php-src/pull/10803
-  php_check_compiler_flag(C -Wno-strict-prototypes _PHP_HAVE_WNO_STRICT_PROTOTYPES)
-  if(_PHP_HAVE_WNO_STRICT_PROTOTYPES)
+  php_check_compiler_flag(C -Wno-strict-prototypes PHP_HAS_WNO_STRICT_PROTOTYPES)
+  if(PHP_HAS_WNO_STRICT_PROTOTYPES)
     target_compile_options(
       php_ext_gd
       PRIVATE

cmake/ext/hash/CMakeLists.txt

@@ -124,9 +124,9 @@ else()
       php_check_compiler_flag(
         C
         -Wno-implicit-fallthrough
-        _PHP_HAVE_WNO_IMPLICIT_FALLTHROUGH_C
+        PHP_HAS_WNO_IMPLICIT_FALLTHROUGH_C
       )
-      if(_PHP_HAVE_WNO_IMPLICIT_FALLTHROUGH_C)
+      if(PHP_HAS_WNO_IMPLICIT_FALLTHROUGH_C)
         set_property(
           SOURCE ${sha3Dir}/KeccakP-1600-inplace32BI.c
           APPEND

cmake/ext/iconv/CMakeLists.txt

@@ -93,10 +93,10 @@ if(TARGET Iconv::Iconv)
   # Sanity and library type checks.
   if(Iconv_IS_BUILT_IN)
     # When iconv is built into C library, first check if iconv function exists.
-    check_symbol_exists(iconv iconv.h _PHP_HAVE_ICONV)
+    check_symbol_exists(iconv iconv.h PHP_EXT_ICONV_HAS_ICONV)
 
     # And if not, then check for libiconv function.
-    if(NOT _PHP_HAVE_ICONV)
+    if(NOT PHP_EXT_ICONV_HAS_ICONV)
       check_symbol_exists(libiconv iconv.h HAVE_LIBICONV)
     endif()
   else()
@@ -108,12 +108,12 @@ if(TARGET Iconv::Iconv)
       if(HAVE_LIBICONV)
         set(ICONV_ALIASED_LIBICONV TRUE)
       else()
-        check_symbol_exists(iconv iconv.h _PHP_HAVE_ICONV)
+        check_symbol_exists(iconv iconv.h PHP_EXT_ICONV_HAS_ICONV)
       endif()
     cmake_pop_check_state()
   endif()
 
-  if(NOT _PHP_HAVE_ICONV AND NOT HAVE_LIBICONV)
+  if(NOT PHP_EXT_ICONV_HAS_ICONV AND NOT HAVE_LIBICONV)
     message(
       FATAL_ERROR
       "ext/iconv sanity check failed: neither 'iconv()' nor 'libiconv()' "
@@ -127,16 +127,16 @@ if(TARGET Iconv::Iconv)
   cmake_push_check_state(RESET)
     set(CMAKE_REQUIRED_LIBRARIES Iconv::Iconv)
     set(CMAKE_REQUIRED_QUIET TRUE)
-    check_symbol_exists(_libiconv_version iconv.h _PHP_HAVE_GNU_LIBICONV)
+    check_symbol_exists(_libiconv_version iconv.h PHP_EXT_ICONV_HAS_GNU_LIBICONV)
   cmake_pop_check_state()
-  if(_PHP_HAVE_GNU_LIBICONV)
+  if(PHP_EXT_ICONV_HAS_GNU_LIBICONV)
     message(CHECK_PASS "GNU libiconv")
     set(HAVE_LIBICONV TRUE)
     set(PHP_ICONV_IMPL "libiconv")
   endif()
 
   # Check for glibc implementation.
-  if(NOT _PHP_HAVE_GNU_LIBICONV)
+  if(NOT PHP_EXT_ICONV_HAS_GNU_LIBICONV)
     cmake_push_check_state(RESET)
       set(CMAKE_REQUIRED_LIBRARIES Iconv::Iconv)
       set(CMAKE_REQUIRED_QUIET TRUE)
@@ -149,20 +149,24 @@ if(TARGET Iconv::Iconv)
   endif()
 
   # Check for Konstantin Chuguev's iconv implementation.
-  if(NOT _PHP_HAVE_GNU_LIBICONV AND NOT HAVE_GLIBC_ICONV)
+  if(NOT PHP_EXT_ICONV_HAS_GNU_LIBICONV AND NOT HAVE_GLIBC_ICONV)
     cmake_push_check_state(RESET)
       set(CMAKE_REQUIRED_LIBRARIES Iconv::Iconv)
       set(CMAKE_REQUIRED_QUIET TRUE)
-      check_symbol_exists(iconv_ccs_init iconv.h _PHP_HAVE_BSD_ICONV)
+      check_symbol_exists(iconv_ccs_init iconv.h PHP_EXT_ICONV_HAS_BSD_ICONV)
     cmake_pop_check_state()
   endif()
-  if(_PHP_HAVE_BSD_ICONV)
+  if(PHP_EXT_ICONV_HAS_BSD_ICONV)
     message(CHECK_PASS "BSD iconv")
     set(PHP_ICONV_IMPL "BSD iconv")
   endif()
 
   # Check for IBM iconv implementation.
-  if(NOT _PHP_HAVE_GNU_LIBICONV AND NOT HAVE_GLIBC_ICONV AND NOT _PHP_HAVE_BSD_ICONV)
+  if(
+    NOT PHP_EXT_ICONV_HAS_GNU_LIBICONV
+    AND NOT HAVE_GLIBC_ICONV
+    AND NOT PHP_EXT_ICONV_HAS_BSD_ICONV
+  )
     cmake_push_check_state(RESET)
       set(CMAKE_REQUIRED_LIBRARIES Iconv::Iconv)
       set(CMAKE_REQUIRED_QUIET TRUE)

cmake/ext/pcre/CMakeLists.txt

@@ -193,9 +193,9 @@ else()
   php_check_compiler_flag(
     C
     -Wno-implicit-fallthrough
-    _PHP_HAVE_WNO_IMPLICIT_FALLTHROUGH_C
+    PHP_HAS_WNO_IMPLICIT_FALLTHROUGH_C
   )
-  if(_PHP_HAVE_WNO_IMPLICIT_FALLTHROUGH_C)
+  if(PHP_HAS_WNO_IMPLICIT_FALLTHROUGH_C)
     set_property(
       SOURCE pcre2lib/pcre2_jit_compile.c
       APPEND
@@ -228,12 +228,12 @@ else()
     message(CHECK_START "Checking whether Intel CET is enabled")
     cmake_push_check_state(RESET)
       set(CMAKE_REQUIRED_QUIET TRUE)
-      check_symbol_exists(__CET__ "" _PHP_HAVE_PCRE2_INTEL_CET)
+      check_symbol_exists(__CET__ "" PHP_EXT_PCRE_HAS_CET)
     cmake_pop_check_state()
-    if(_PHP_HAVE_PCRE2_INTEL_CET)
+    if(PHP_EXT_PCRE_HAS_CET)
       message(CHECK_PASS "yes")
-      php_check_compiler_flag(C -mshstk _PHP_HAVE_MSHSTK_C)
-      if(_PHP_HAVE_MSHSTK_C)
+      php_check_compiler_flag(C -mshstk PHP_EXT_PCRE_HAS_MSHSTK_C)
+      if(PHP_EXT_PCRE_HAS_MSHSTK_C)
         target_compile_options(php_ext_pcre PRIVATE -mshstk)
       endif()
     else()

cmake/ext/pdo_pgsql/CMakeLists.txt

@@ -111,14 +111,14 @@ if(TARGET PostgreSQL::PostgreSQL)
       check_symbol_exists(
         LIBPQ_HAS_CLOSE_PREPARED
         libpq-fe.h
-        _PHP_HAVE_LIBPQ_HAS_CLOSE_PREPARED
+        PHP_HAS_LIBPQ_HAS_CLOSE_PREPARED
       )
       check_symbol_exists(
         PQclosePrepared
         libpq-fe.h
-        _PHP_HAVE_PQCLOSEPREPARED
+        PHP_HAS_PQCLOSEPREPARED
       )
-      if(_PHP_HAVE_LIBPQ_HAS_CLOSE_PREPARED AND _PHP_HAVE_PQCLOSEPREPARED)
+      if(PHP_HAS_LIBPQ_HAS_CLOSE_PREPARED AND PHP_HAS_PQCLOSEPREPARED)
         set(HAVE_PQCLOSEPREPARED TRUE)
       endif()
     endif()

cmake/ext/pdo_sqlite/CMakeLists.txt

@@ -96,9 +96,9 @@ if(TARGET SQLite::SQLite3)
     check_symbol_exists(
       sqlite3_load_extension
       sqlite3.h
-      _PHP_HAVE_SQLITE3_LOAD_EXTENSION
+      PHP_HAS_SQLITE3_LOAD_EXTENSION
     )
-    if(NOT _PHP_HAVE_SQLITE3_LOAD_EXTENSION)
+    if(NOT PHP_HAS_SQLITE3_LOAD_EXTENSION)
       set(PDO_SQLITE_OMIT_LOAD_EXTENSION TRUE)
     endif()
   cmake_pop_check_state()

cmake/ext/pgsql/CMakeLists.txt

@@ -120,44 +120,44 @@ if(TARGET PostgreSQL::PostgreSQL)
       check_symbol_exists(
         LIBPQ_HAS_CHANGE_PASSWORD
         libpq-fe.h
-        _PHP_HAVE_LIBPQ_HAS_CHANGE_PASSWORD
+        PHP_HAS_LIBPQ_HAS_CHANGE_PASSWORD
       )
       check_symbol_exists(
         PQchangePassword
         libpq-fe.h
-        _PHP_HAVE_PQCHANGEPASSWORD
+        PHP_HAS_PQCHANGEPASSWORD
       )
-      if(_PHP_HAVE_LIBPQ_HAS_CHANGE_PASSWORD AND _PHP_HAVE_PQCHANGEPASSWORD)
+      if(PHP_HAS_LIBPQ_HAS_CHANGE_PASSWORD AND PHP_HAS_PQCHANGEPASSWORD)
         set(HAVE_PG_CHANGE_PASSWORD TRUE)
       endif()
 
       # Indicates the presence of PQsocketPoll, PQgetCurrentTimeUSec.
       check_symbol_exists(
         LIBPQ_HAS_SOCKET_POLL
         libpq-fe.h
-        _PHP_HAVE_LIBPQ_HAS_SOCKET_POLL
+        PHP_HAS_LIBPQ_HAS_SOCKET_POLL
       )
       check_symbol_exists(
         PQsocketPoll
         libpq-fe.h
-        _PHP_HAVE_PQSOCKETPOLL
+        PHP_HAS_PQSOCKETPOLL
       )
-      if(_PHP_HAVE_LIBPQ_HAS_SOCKET_POLL AND _PHP_HAVE_PQSOCKETPOLL)
+      if(PHP_HAS_LIBPQ_HAS_SOCKET_POLL AND PHP_HAS_PQSOCKETPOLL)
         set(HAVE_PG_SOCKET_POLL TRUE)
       endif()
 
       # Indicates the presence of PQsetChunkedRowsMode and PGRES_TUPLES_CHUNK.
       check_symbol_exists(
         LIBPQ_HAS_CHUNK_MODE
         libpq-fe.h
-        _PHP_HAVE_LIBPQ_HAS_CHUNK_MODE
+        PHP_HAS_LIBPQ_HAS_CHUNK_MODE
       )
       check_symbol_exists(
         PQsetChunkedRowsMode
         libpq-fe.h
-        _PHP_HAVE_PQSETCHUNKEDROWSMODE
+        PHP_HAS_PQSETCHUNKEDROWSMODE
       )
-      if(_PHP_HAVE_LIBPQ_HAS_CHUNK_MODE AND _PHP_HAVE_PQSETCHUNKEDROWSMODE)
+      if(PHP_HAS_LIBPQ_HAS_CHUNK_MODE AND PHP_HAS_PQSETCHUNKEDROWSMODE)
         set(HAVE_PG_SET_CHUNKED_ROWS_SIZE TRUE)
       endif()
     endif()

cmake/ext/readline/CMakeLists.txt

@@ -73,8 +73,8 @@ target_sources(
 )
 
 # Add -Wno-strict-prototypes as depends on user libs.
-php_check_compiler_flag(C -Wno-strict-prototypes _PHP_HAVE_WNO_STRICT_PROTOTYPES)
-if(_PHP_HAVE_WNO_STRICT_PROTOTYPES)
+php_check_compiler_flag(C -Wno-strict-prototypes PHP_HAS_WNO_STRICT_PROTOTYPES)
+if(PHP_HAS_WNO_STRICT_PROTOTYPES)
   target_compile_options(
     php_ext_readline
     PRIVATE

cmake/ext/sockets/CMakeLists.txt

@@ -104,8 +104,8 @@ check_include_files(sys/sockio.h HAVE_SYS_SOCKIO_H)
 check_include_files(linux/filter.h HAVE_LINUX_FILTER_H)
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
-  check_include_files(winsock.h _PHP_HAVE_WINSOCK_H)
-  if(NOT _PHP_HAVE_WINSOCK_H)
+  check_include_files(winsock.h PHP_EXT_SOCKETS_HAS_WINSOCK_H)
+  if(NOT PHP_EXT_SOCKETS_HAS_WINSOCK_H)
     message(
       FATAL_ERROR
       "Required file winsock.h is missing for the socket extension."

cmake/ext/sqlite3/CMakeLists.txt

@@ -87,9 +87,9 @@ if(TARGET SQLite::SQLite3)
     check_symbol_exists(
       sqlite3_load_extension
       sqlite3.h
-      _PHP_HAVE_SQLITE3_LOAD_EXTENSION
+      PHP_HAS_SQLITE3_LOAD_EXTENSION
     )
-    if(NOT _PHP_HAVE_SQLITE3_LOAD_EXTENSION)
+    if(NOT PHP_HAS_SQLITE3_LOAD_EXTENSION)
       set(SQLITE_OMIT_LOAD_EXTENSION TRUE)
     endif()
   cmake_pop_check_state()