Merge branch 'PHP-8.3' into PHP-8.4

petk · petk · commit 410503ed234f · 2025-06-24T01:01:48.000+02:00
diff --git a/cmake/ext/bcmath/CMakeLists.txt b/cmake/ext/bcmath/CMakeLists.txt
@@ -51,7 +51,7 @@ if(NOT PHP_EXT_BCMATH)
 endif()
 
 if(PHP_EXT_BCMATH_SHARED)
-  add_library(php_ext_bcmath SHARED)
+  add_library(php_ext_bcmath MODULE)
 else()
   add_library(php_ext_bcmath)
 endif()
diff --git a/cmake/ext/bz2/CMakeLists.txt b/cmake/ext/bz2/CMakeLists.txt
@@ -54,7 +54,7 @@ if(NOT PHP_EXT_BZ2)
 endif()
 
 if(PHP_EXT_BZ2_SHARED)
-  add_library(php_ext_bz2 SHARED)
+  add_library(php_ext_bz2 MODULE)
 else()
   add_library(php_ext_bz2)
 endif()
diff --git a/cmake/ext/calendar/CMakeLists.txt b/cmake/ext/calendar/CMakeLists.txt
@@ -51,7 +51,7 @@ if(NOT PHP_EXT_CALENDAR)
 endif()
 
 if(PHP_EXT_CALENDAR_SHARED)
-  add_library(php_ext_calendar SHARED)
+  add_library(php_ext_calendar MODULE)
 else()
   add_library(php_ext_calendar)
 endif()
diff --git a/cmake/ext/com_dotnet/CMakeLists.txt b/cmake/ext/com_dotnet/CMakeLists.txt
@@ -59,7 +59,7 @@ if(NOT PHP_EXT_COM_DOTNET)
 endif()
 
 if(PHP_EXT_COM_DOTNET_SHARED)
-  add_library(php_ext_com_dotnet SHARED)
+  add_library(php_ext_com_dotnet MODULE)
 else()
   add_library(php_ext_com_dotnet)
 endif()
diff --git a/cmake/ext/ctype/CMakeLists.txt b/cmake/ext/ctype/CMakeLists.txt
@@ -52,7 +52,7 @@ if(NOT PHP_EXT_CTYPE)
 endif()
 
 if(PHP_EXT_CTYPE_SHARED)
-  add_library(php_ext_ctype SHARED)
+  add_library(php_ext_ctype MODULE)
 else()
   add_library(php_ext_ctype)
 endif()
diff --git a/cmake/ext/curl/CMakeLists.txt b/cmake/ext/curl/CMakeLists.txt
@@ -54,7 +54,7 @@ if(NOT PHP_EXT_CURL)
 endif()
 
 if(PHP_EXT_CURL_SHARED)
-  add_library(php_ext_curl SHARED)
+  add_library(php_ext_curl MODULE)
 else()
   add_library(php_ext_curl)
 endif()
diff --git a/cmake/ext/dba/CMakeLists.txt b/cmake/ext/dba/CMakeLists.txt
@@ -290,7 +290,7 @@ if(NOT PHP_EXT_DBA)
 endif()
 
 if(PHP_EXT_DBA_SHARED)
-  add_library(php_ext_dba SHARED)
+  add_library(php_ext_dba MODULE)
 else()
   add_library(php_ext_dba)
 endif()
diff --git a/cmake/ext/dl_test/CMakeLists.txt b/cmake/ext/dl_test/CMakeLists.txt
@@ -38,7 +38,7 @@ if(NOT PHP_EXT_DL_TEST)
 endif()
 
 # The dl_test extension can be built only as a shared library.
-add_library(php_ext_dl_test SHARED)
+add_library(php_ext_dl_test MODULE)
 target_sources(
   php_ext_dl_test
   PRIVATE
diff --git a/cmake/ext/dom/CMakeLists.txt b/cmake/ext/dom/CMakeLists.txt
@@ -52,7 +52,7 @@ if(NOT PHP_EXT_DOM)
 endif()
 
 if(PHP_EXT_DOM_SHARED)
-  add_library(php_ext_dom SHARED)
+  add_library(php_ext_dom MODULE)
 else()
   add_library(php_ext_dom)
 endif()
diff --git a/cmake/ext/enchant/CMakeLists.txt b/cmake/ext/enchant/CMakeLists.txt
@@ -53,7 +53,7 @@ if(NOT PHP_EXT_ENCHANT)
 endif()
 
 if(PHP_EXT_ENCHANT_SHARED)
-  add_library(php_ext_enchant SHARED)
+  add_library(php_ext_enchant MODULE)
 else()
   add_library(php_ext_enchant)
 endif()
diff --git a/cmake/ext/exif/CMakeLists.txt b/cmake/ext/exif/CMakeLists.txt
@@ -51,7 +51,7 @@ if(NOT PHP_EXT_EXIF)
 endif()
 
 if(PHP_EXT_EXIF_SHARED)
-  add_library(php_ext_exif SHARED)
+  add_library(php_ext_exif MODULE)
 else()
   add_library(php_ext_exif)
 endif()
diff --git a/cmake/ext/ffi/CMakeLists.txt b/cmake/ext/ffi/CMakeLists.txt
@@ -55,7 +55,7 @@ if(NOT PHP_EXT_FFI)
 endif()
 
 if(PHP_EXT_FFI_SHARED)
-  add_library(php_ext_ffi SHARED)
+  add_library(php_ext_ffi MODULE)
 else()
   add_library(php_ext_ffi)
 endif()
diff --git a/cmake/ext/fileinfo/CMakeLists.txt b/cmake/ext/fileinfo/CMakeLists.txt
@@ -54,7 +54,7 @@ if(NOT PHP_EXT_FILEINFO)
 endif()
 
 if(PHP_EXT_FILEINFO_SHARED)
-  add_library(php_ext_fileinfo SHARED)
+  add_library(php_ext_fileinfo MODULE)
 else()
   add_library(php_ext_fileinfo)
 endif()
diff --git a/cmake/ext/filter/CMakeLists.txt b/cmake/ext/filter/CMakeLists.txt
@@ -51,7 +51,7 @@ if(NOT PHP_EXT_FILTER)
 endif()
 
 if(PHP_EXT_FILTER_SHARED)
-  add_library(php_ext_filter SHARED)
+  add_library(php_ext_filter MODULE)
 else()
   add_library(php_ext_filter)
 endif()
diff --git a/cmake/ext/ftp/CMakeLists.txt b/cmake/ext/ftp/CMakeLists.txt
@@ -66,7 +66,7 @@ if(NOT PHP_EXT_FTP)
 endif()
 
 if(PHP_EXT_FTP_SHARED)
-  add_library(php_ext_ftp SHARED)
+  add_library(php_ext_ftp MODULE)
 else()
   add_library(php_ext_ftp)
 endif()
diff --git a/cmake/ext/gd/CMakeLists.txt b/cmake/ext/gd/CMakeLists.txt
@@ -204,7 +204,7 @@ if(NOT PHP_EXT_GD)
 endif()
 
 if(PHP_EXT_GD_SHARED)
-  add_library(php_ext_gd SHARED)
+  add_library(php_ext_gd MODULE)
 else()
   add_library(php_ext_gd)
 endif()
diff --git a/cmake/ext/gettext/CMakeLists.txt b/cmake/ext/gettext/CMakeLists.txt
@@ -54,7 +54,7 @@ if(NOT PHP_EXT_GETTEXT)
 endif()
 
 if(PHP_EXT_GETTEXT_SHARED)
-  add_library(php_ext_gettext SHARED)
+  add_library(php_ext_gettext MODULE)
 else()
   add_library(php_ext_gettext)
 endif()
diff --git a/cmake/ext/gmp/CMakeLists.txt b/cmake/ext/gmp/CMakeLists.txt
@@ -51,7 +51,7 @@ if(NOT PHP_EXT_GMP)
 endif()
 
 if(PHP_EXT_GMP_SHARED)
-  add_library(php_ext_gmp SHARED)
+  add_library(php_ext_gmp MODULE)
 else()
   add_library(php_ext_gmp)
 endif()
diff --git a/cmake/ext/iconv/CMakeLists.txt b/cmake/ext/iconv/CMakeLists.txt
@@ -55,7 +55,7 @@ if(NOT PHP_EXT_ICONV)
 endif()
 
 if(PHP_EXT_ICONV_SHARED)
-  add_library(php_ext_iconv SHARED)
+  add_library(php_ext_iconv MODULE)
 else()
   add_library(php_ext_iconv)
 endif()
diff --git a/cmake/ext/intl/CMakeLists.txt b/cmake/ext/intl/CMakeLists.txt
@@ -55,7 +55,7 @@ endif()
 enable_language(CXX)
 
 if(PHP_EXT_INTL_SHARED)
-  add_library(php_ext_intl SHARED)
+  add_library(php_ext_intl MODULE)
 else()
   add_library(php_ext_intl)
 endif()
diff --git a/cmake/ext/ldap/CMakeLists.txt b/cmake/ext/ldap/CMakeLists.txt
@@ -70,7 +70,7 @@ if(NOT PHP_EXT_LDAP)
 endif()
 
 if(PHP_EXT_LDAP_SHARED)
-  add_library(php_ext_ldap SHARED)
+  add_library(php_ext_ldap MODULE)
 else()
   add_library(php_ext_ldap)
 endif()
diff --git a/cmake/ext/mbstring/CMakeLists.txt b/cmake/ext/mbstring/CMakeLists.txt
@@ -78,7 +78,7 @@ endif()
 ################################################################################
 
 if(PHP_EXT_MBSTRING_SHARED)
-  add_library(php_ext_mbstring SHARED)
+  add_library(php_ext_mbstring MODULE)
 else()
   add_library(php_ext_mbstring)
 endif()
diff --git a/cmake/ext/mysqli/CMakeLists.txt b/cmake/ext/mysqli/CMakeLists.txt
@@ -93,7 +93,7 @@ if(NOT PHP_EXT_MYSQLI)
 endif()
 
 if(PHP_EXT_MYSQLI_SHARED)
-  add_library(php_ext_mysqli SHARED)
+  add_library(php_ext_mysqli MODULE)
 else()
   add_library(php_ext_mysqli)
 endif()
diff --git a/cmake/ext/mysqlnd/CMakeLists.txt b/cmake/ext/mysqlnd/CMakeLists.txt
@@ -99,7 +99,7 @@ if(NOT PHP_EXT_MYSQLND)
 endif()
 
 if(PHP_EXT_MYSQLND_SHARED)
-  add_library(php_ext_mysqlnd SHARED)
+  add_library(php_ext_mysqlnd MODULE)
 else()
   add_library(php_ext_mysqlnd)
 endif()
diff --git a/cmake/ext/odbc/CMakeLists.txt b/cmake/ext/odbc/CMakeLists.txt
@@ -278,7 +278,7 @@ if(NOT PHP_EXT_ODBC)
 endif()
 
 if(PHP_EXT_ODBC_SHARED)
-  add_library(php_ext_odbc SHARED)
+  add_library(php_ext_odbc MODULE)
 else()
   add_library(php_ext_odbc)
 endif()
diff --git a/cmake/ext/opcache/CMakeLists.txt b/cmake/ext/opcache/CMakeLists.txt
@@ -83,7 +83,7 @@ endif()
 # Add library.
 ################################################################################
 
-add_library(php_ext_opcache SHARED)
+add_library(php_ext_opcache MODULE)
 
 target_sources(
   php_ext_opcache
diff --git a/cmake/ext/openssl/CMakeLists.txt b/cmake/ext/openssl/CMakeLists.txt
@@ -144,7 +144,7 @@ if(NOT PHP_EXT_OPENSSL)
 endif()
 
 if(PHP_EXT_OPENSSL_SHARED)
-  add_library(php_ext_openssl SHARED)
+  add_library(php_ext_openssl MODULE)
 else()
   add_library(php_ext_openssl)
 endif()
diff --git a/cmake/ext/pcntl/CMakeLists.txt b/cmake/ext/pcntl/CMakeLists.txt
@@ -68,7 +68,7 @@ if(NOT PHP_EXT_PCNTL)
 endif()
 
 if(PHP_EXT_PCNTL_SHARED)
-  add_library(php_ext_pcntl SHARED)
+  add_library(php_ext_pcntl MODULE)
 else()
   add_library(php_ext_pcntl)
 endif()
diff --git a/cmake/ext/pdo/CMakeLists.txt b/cmake/ext/pdo/CMakeLists.txt
@@ -51,7 +51,7 @@ if(NOT PHP_EXT_PDO)
 endif()
 
 if(PHP_EXT_PDO_SHARED)
-  add_library(php_ext_pdo SHARED)
+  add_library(php_ext_pdo MODULE)
 else()
   add_library(php_ext_pdo)
 endif()
diff --git a/cmake/ext/pdo_dblib/CMakeLists.txt b/cmake/ext/pdo_dblib/CMakeLists.txt
@@ -52,7 +52,7 @@ if(NOT PHP_EXT_PDO_DBLIB)
 endif()
 
 if(PHP_EXT_PDO_DBLIB_SHARED)
-  add_library(php_ext_pdo_dblib SHARED)
+  add_library(php_ext_pdo_dblib MODULE)
 else()
   add_library(php_ext_pdo_dblib)
 endif()
diff --git a/cmake/ext/pdo_firebird/CMakeLists.txt b/cmake/ext/pdo_firebird/CMakeLists.txt
@@ -55,7 +55,7 @@ endif()
 enable_language(CXX)
 
 if(PHP_EXT_PDO_FIREBIRD_SHARED)
-  add_library(php_ext_pdo_firebird SHARED)
+  add_library(php_ext_pdo_firebird MODULE)
 else()
   add_library(php_ext_pdo_firebird)
 endif()
diff --git a/cmake/ext/pdo_mysql/CMakeLists.txt b/cmake/ext/pdo_mysql/CMakeLists.txt
@@ -78,7 +78,7 @@ if(NOT PHP_EXT_PDO_MYSQL)
 endif()
 
 if(PHP_EXT_PDO_MYSQL_SHARED)
-  add_library(php_ext_pdo_mysql SHARED)
+  add_library(php_ext_pdo_mysql MODULE)
 else()
   add_library(php_ext_pdo_mysql)
 endif()
diff --git a/cmake/ext/pdo_odbc/CMakeLists.txt b/cmake/ext/pdo_odbc/CMakeLists.txt
@@ -136,7 +136,7 @@ if(NOT PHP_EXT_PDO_ODBC)
 endif()
 
 if(PHP_EXT_PDO_ODBC_SHARED)
-  add_library(php_ext_pdo_odbc SHARED)
+  add_library(php_ext_pdo_odbc MODULE)
 else()
   add_library(php_ext_pdo_odbc)
 endif()
diff --git a/cmake/ext/pdo_pgsql/CMakeLists.txt b/cmake/ext/pdo_pgsql/CMakeLists.txt
@@ -53,7 +53,7 @@ if(NOT PHP_EXT_PDO_PGSQL)
 endif()
 
 if(PHP_EXT_PDO_PGSQL_SHARED)
-  add_library(php_ext_pdo_pgsql SHARED)
+  add_library(php_ext_pdo_pgsql MODULE)
 else()
   add_library(php_ext_pdo_pgsql)
 endif()
diff --git a/cmake/ext/pdo_sqlite/CMakeLists.txt b/cmake/ext/pdo_sqlite/CMakeLists.txt
@@ -53,7 +53,7 @@ if(NOT PHP_EXT_PDO_SQLITE)
 endif()
 
 if(PHP_EXT_PDO_SQLITE_SHARED)
-  add_library(php_ext_pdo_sqlite SHARED)
+  add_library(php_ext_pdo_sqlite MODULE)
 else()
   add_library(php_ext_pdo_sqlite)
 endif()
diff --git a/cmake/ext/pgsql/CMakeLists.txt b/cmake/ext/pgsql/CMakeLists.txt
@@ -54,7 +54,7 @@ if(NOT PHP_EXT_PGSQL)
 endif()
 
 if(PHP_EXT_PGSQL_SHARED)
-  add_library(php_ext_pgsql SHARED)
+  add_library(php_ext_pgsql MODULE)
 else()
   add_library(php_ext_pgsql)
 endif()
diff --git a/cmake/ext/phar/CMakeLists.txt b/cmake/ext/phar/CMakeLists.txt
@@ -55,7 +55,7 @@ endif()
 ################################################################################
 
 if(PHP_EXT_PHAR_SHARED)
-  add_library(php_ext_phar SHARED)
+  add_library(php_ext_phar MODULE)
 else()
   add_library(php_ext_phar)
 endif()
diff --git a/cmake/ext/posix/CMakeLists.txt b/cmake/ext/posix/CMakeLists.txt
@@ -62,7 +62,7 @@ if(NOT PHP_EXT_POSIX)
 endif()
 
 if(PHP_EXT_POSIX_SHARED)
-  add_library(php_ext_posix SHARED)
+  add_library(php_ext_posix MODULE)
 else()
   add_library(php_ext_posix)
 endif()
diff --git a/cmake/ext/readline/CMakeLists.txt b/cmake/ext/readline/CMakeLists.txt
@@ -57,7 +57,7 @@ if(NOT PHP_EXT_READLINE)
 endif()
 
 if(PHP_EXT_READLINE_SHARED)
-  add_library(php_ext_readline SHARED)
+  add_library(php_ext_readline MODULE)
 else()
   add_library(php_ext_readline)
 endif()
diff --git a/cmake/ext/session/CMakeLists.txt b/cmake/ext/session/CMakeLists.txt
@@ -73,7 +73,7 @@ if(NOT PHP_EXT_SESSION)
 endif()
 
 if(PHP_EXT_SESSION_SHARED)
-  add_library(php_ext_session SHARED)
+  add_library(php_ext_session MODULE)
 else()
   add_library(php_ext_session)
 endif()
diff --git a/cmake/ext/shmop/CMakeLists.txt b/cmake/ext/shmop/CMakeLists.txt
@@ -51,7 +51,7 @@ if(NOT PHP_EXT_SHMOP)
 endif()
 
 if(PHP_EXT_SHMOP_SHARED)
-  add_library(php_ext_shmop SHARED)
+  add_library(php_ext_shmop MODULE)
 else()
   add_library(php_ext_shmop)
 endif()
diff --git a/cmake/ext/simplexml/CMakeLists.txt b/cmake/ext/simplexml/CMakeLists.txt
@@ -51,7 +51,7 @@ if(NOT PHP_EXT_SIMPLEXML)
 endif()
 
 if(PHP_EXT_SIMPLEXML_SHARED)
-  add_library(php_ext_simplexml SHARED)
+  add_library(php_ext_simplexml MODULE)
 else()
   add_library(php_ext_simplexml)
 endif()
diff --git a/cmake/ext/skeleton/CMakeLists.txt.in b/cmake/ext/skeleton/CMakeLists.txt.in
@@ -67,9 +67,10 @@ if(NOT PHP_EXT_%EXTNAMECAPS%)
   return()
 endif()
 
-# Add a target to be built as a SHARED or STATIC library.
+# Add a target to be built as a dynamically loadable module (shared extension),
+# or statically.
 if(PHP_EXT_%EXTNAMECAPS%_SHARED)
-  add_library(php_ext_%EXTNAME% SHARED)
+  add_library(php_ext_%EXTNAME% MODULE)
 else()
   add_library(php_ext_%EXTNAME%)
 endif()
diff --git a/cmake/ext/snmp/CMakeLists.txt b/cmake/ext/snmp/CMakeLists.txt
@@ -53,7 +53,7 @@ if(NOT PHP_EXT_SNMP)
 endif()
 
 if(PHP_EXT_SNMP_SHARED)
-  add_library(php_ext_snmp SHARED)
+  add_library(php_ext_snmp MODULE)
 else()
   add_library(php_ext_snmp)
 endif()
diff --git a/cmake/ext/soap/CMakeLists.txt b/cmake/ext/soap/CMakeLists.txt
diff --git a/cmake/ext/sockets/CMakeLists.txt b/cmake/ext/sockets/CMakeLists.txt
diff --git a/cmake/ext/sodium/CMakeLists.txt b/cmake/ext/sodium/CMakeLists.txt
diff --git a/cmake/ext/sqlite3/CMakeLists.txt b/cmake/ext/sqlite3/CMakeLists.txt
diff --git a/cmake/ext/sysvmsg/CMakeLists.txt b/cmake/ext/sysvmsg/CMakeLists.txt
diff --git a/cmake/ext/sysvsem/CMakeLists.txt b/cmake/ext/sysvsem/CMakeLists.txt
diff --git a/cmake/ext/sysvshm/CMakeLists.txt b/cmake/ext/sysvshm/CMakeLists.txt
diff --git a/cmake/ext/tidy/CMakeLists.txt b/cmake/ext/tidy/CMakeLists.txt
diff --git a/cmake/ext/tokenizer/CMakeLists.txt b/cmake/ext/tokenizer/CMakeLists.txt
diff --git a/cmake/ext/xml/CMakeLists.txt b/cmake/ext/xml/CMakeLists.txt
diff --git a/cmake/ext/xmlreader/CMakeLists.txt b/cmake/ext/xmlreader/CMakeLists.txt
diff --git a/cmake/ext/xmlwriter/CMakeLists.txt b/cmake/ext/xmlwriter/CMakeLists.txt
diff --git a/cmake/ext/xsl/CMakeLists.txt b/cmake/ext/xsl/CMakeLists.txt
diff --git a/cmake/ext/zend_test/CMakeLists.txt b/cmake/ext/zend_test/CMakeLists.txt
diff --git a/cmake/ext/zip/CMakeLists.txt b/cmake/ext/zip/CMakeLists.txt
diff --git a/cmake/ext/zlib/CMakeLists.txt b/cmake/ext/zlib/CMakeLists.txt
