Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/cmake/Configuration.cmake

@@ -2,7 +2,7 @@
 Project-wide configuration options and variables that can be configured during
 the configuration phase via GUI or command line:
 
-  cmake -D PHP_OPTION=... -D ZEND_OPTION=... -D EXT_... -S <path-to-source> ...
+  cmake -DPHP_<SOME_OPTION>=[ON|OFF] ... -S <source-dir> -B <build-dir> ...
 
 To see the list of customizable configuration variables with help texts:
   cmake -LH <path-to-source>

cmake/cmake/Testing.cmake

@@ -18,9 +18,9 @@ block()
 
   get_property(extensions GLOBAL PROPERTY PHP_EXTENSIONS)
   foreach(extension IN LISTS extensions)
-    get_target_property(type php_ext_${extension} TYPE)
+    get_target_property(type PHP::ext::${extension} TYPE)
     if(type MATCHES "^(MODULE|SHARED)_LIBRARY$")
-      get_target_property(isZendExtension php_ext_${extension} PHP_ZEND_EXTENSION)
+      get_target_property(isZendExtension PHP::ext::${extension} PHP_ZEND_EXTENSION)
       if(isZendExtension)
         list(APPEND options -d zend_extension=${extension})
       elseif(NOT extension STREQUAL "dl_test")

cmake/cmake/modules/PHP/Extensions.cmake

@@ -79,13 +79,13 @@ function(php_extensions_preprocess)
   foreach(extension IN LISTS extensions)
     string(TOUPPER "${extension}" extensionUpper)
 
-    if(NOT EXT_${extensionUpper})
+    if(NOT PHP_EXT_${extensionUpper})
       continue()
     endif()
 
     # Mark shared option variable as advanced.
-    if(DEFINED EXT_${extensionUpper}_SHARED)
-      mark_as_advanced(EXT_${extensionUpper}_SHARED)
+    if(DEFINED PHP_EXT_${extensionUpper}_SHARED)
+      mark_as_advanced(PHP_EXT_${extensionUpper}_SHARED)
     endif()
 
     _php_extensions_get_dependencies("${extension}" dependencies)
@@ -95,17 +95,20 @@ function(php_extensions_preprocess)
     foreach(dependency IN LISTS dependencies)
       string(TOUPPER "${dependency}" dependencyUpper)
 
-      if(EXT_${dependencyUpper}_SHARED AND NOT EXT_${extensionUpper}_SHARED)
+      if(
+        PHP_EXT_${dependencyUpper}_SHARED
+        AND NOT PHP_EXT_${extensionUpper}_SHARED
+      )
         message(
           WARNING
           "The '${extension}' extension must be built as a shared library as "
           "its dependency '${dependency}' extension is configured as shared. "
-          "The 'EXT_${extensionUpper}_SHARED' option has been automatically "
-          "set to 'ON'."
+          "The 'PHP_EXT_${extensionUpper}_SHARED' option has been "
+          "automatically set to 'ON'."
         )
 
         set(
-          EXT_${extensionUpper}_SHARED
+          PHP_EXT_${extensionUpper}_SHARED
           ON
           CACHE BOOL
           "Build the ${extension} extension as a shared library"
@@ -317,19 +320,19 @@ function(_php_extensions_eval_options directories)
     file(READ ${CMAKE_CURRENT_SOURCE_DIR}/${extension}/CMakeLists.txt content)
     string(TOUPPER "${extension}" extensionUpper)
 
-    # Check if extension has option(EXT_<extension> ...).
+    # Check if extension has option(PHP_EXT_<extension> ...).
     _php_extensions_remove_comments(content)
-    _php_extensions_option_regex("EXT_${extensionUpper}" regex)
+    _php_extensions_option_regex("PHP_EXT_${extensionUpper}" regex)
     string(REGEX MATCH "${regex}" code "${content}")
 
     if(code)
       cmake_language(EVAL CODE "${code}")
       unset(code)
     endif()
 
-    # If extension has cmake_dependent_option(EXT_<extension> ...).
+    # If extension has cmake_dependent_option(PHP_EXT_<extension> ...).
     _php_extensions_cmake_dependent_option_regex(
-      "EXT_${extensionUpper}"
+      "PHP_EXT_${extensionUpper}"
       regex
     )
     string(REGEX MATCH "${regex}" code "${content}")
@@ -340,9 +343,9 @@ function(_php_extensions_eval_options directories)
       unset(code)
     endif()
 
-    # If extension has cmake_dependent_option(EXT_<extension>_SHARED ...).
+    # If extension has cmake_dependent_option(PHP_EXT_<extension>_SHARED ...).
     _php_extensions_cmake_dependent_option_regex(
-      "EXT_${extensionUpper}_SHARED"
+      "PHP_EXT_${extensionUpper}_SHARED"
       regex
     )
 
@@ -382,7 +385,7 @@ function(php_extensions_postconfigure extension)
     string(TOUPPER "${dependency}" dependencyUpper)
 
     if(
-      EXT_${dependencyUpper}
+      PHP_EXT_${dependencyUpper}
       OR dependency IN_LIST alwaysEnabledExtensions
       OR NOT dependency IN_LIST allExtensions
     )
@@ -392,15 +395,15 @@ function(php_extensions_postconfigure extension)
     message(
       WARNING
       "The '${extension}' extension requires the '${dependency}' extension. "
-      "The 'EXT_${dependencyUpper}' option has been automatically set to "
+      "The 'PHP_EXT_${dependencyUpper}' option has been automatically set to "
       "'ON'."
     )
 
-    if(DEFINED CACHE{EXT_${dependencyUpper}})
-      set_property(CACHE EXT_${dependencyUpper} PROPERTY VALUE ON)
+    if(DEFINED CACHE{PHP_EXT_${dependencyUpper}})
+      set_property(CACHE PHP_EXT_${dependencyUpper} PROPERTY VALUE ON)
     else()
       set(
-        EXT_${dependencyUpper}
+        PHP_EXT_${dependencyUpper}
         ON
         CACHE BOOL
         "Enable the ${dependency} extension"
@@ -542,7 +545,7 @@ function(_php_extensions_validate)
           "You've enabled the '${extension}' extension, which depends on the "
           "'${dependency}' extension, but you've either not enabled "
           "'${dependency}', or have disabled it. Please set "
-          "'EXT_${dependencyUpper}' to 'ON' if available."
+          "'PHP_EXT_${dependencyUpper}' to 'ON' if available."
         )
       endif()
 

cmake/cmake/modules/PHP/FeatureSummary.cmake

@@ -249,7 +249,7 @@ function(php_feature_summary)
           APPEND
           sharedExtensionsSummary
           " * ${extension}\n"
-          "   Set 'EXT_${extensionUpper}_SHARED' to 'ON' (its dependency "
+          "   Set 'PHP_EXT_${extensionUpper}_SHARED' to 'ON' (its dependency "
           "${dependency} extension will be built as shared)\n"
         )
       endif()
@@ -266,7 +266,7 @@ function(php_feature_summary)
         APPEND
         message
         " * ${extension}\n"
-        "   Set 'EXT_${extensionUpper}' to 'ON'\n"
+        "   Set 'PHP_EXT_${extensionUpper}' to 'ON'\n"
       )
       list(JOIN _phpFeatureSummaryReason_${extension} ", " reasons)
       string(APPEND message "   (Required by ${reasons})\n")

cmake/cmake/modules/PHP/Stubs.cmake

@@ -16,7 +16,10 @@ function(_php_stubs_get_php_command result)
   # tokenizer extension.
   if(
     NOT PHPSystem_EXECUTABLE
-    AND (NOT TARGET PHP::SAPI::cli OR (TARGET PHP::SAPI::cli AND NOT EXT_TOKENIZER))
+    AND (
+      NOT TARGET PHP::SAPI::cli
+      OR (TARGET PHP::SAPI::cli AND NOT TARGET PHP::ext::tokenizer)
+    )
   )
     return(PROPAGATE ${result})
   endif()
@@ -44,7 +47,8 @@ function(_php_stubs_get_php_command result)
     return(PROPAGATE ${result})
   endif()
 
-  if(EXT_TOKENIZER_SHARED)
+  get_target_property(type PHP::ext::tokenizer TYPE)
+  if(type MATCHES "^(MODULE|SHARED)_LIBRARY$")
     list(
       APPEND
       command

cmake/cmake/presets/all-disabled.json

@@ -8,25 +8,25 @@
       "binaryDir": "${sourceDir}/php-build/all-disabled",
       "installDir": "/tmp",
       "cacheVariables": {
-        "EXT_COM_DOTNET": false,
-        "EXT_CTYPE": false,
-        "EXT_DOM": false,
-        "EXT_FILEINFO": false,
-        "EXT_FILTER": false,
-        "EXT_ICONV": false,
-        "EXT_LIBXML": false,
-        "EXT_OPCACHE": false,
-        "EXT_PDO": false,
-        "EXT_PDO_SQLITE": false,
-        "EXT_PHAR": false,
-        "EXT_POSIX": false,
-        "EXT_SESSION": false,
-        "EXT_SIMPLEXML": false,
-        "EXT_SQLITE3": false,
-        "EXT_TOKENIZER": false,
-        "EXT_XML": false,
-        "EXT_XMLREADER": false,
-        "EXT_XMLWRITER": false,
+        "PHP_EXT_COM_DOTNET": false,
+        "PHP_EXT_CTYPE": false,
+        "PHP_EXT_DOM": false,
+        "PHP_EXT_FILEINFO": false,
+        "PHP_EXT_FILTER": false,
+        "PHP_EXT_ICONV": false,
+        "PHP_EXT_LIBXML": false,
+        "PHP_EXT_OPCACHE": false,
+        "PHP_EXT_PDO": false,
+        "PHP_EXT_PDO_SQLITE": false,
+        "PHP_EXT_PHAR": false,
+        "PHP_EXT_POSIX": false,
+        "PHP_EXT_SESSION": false,
+        "PHP_EXT_SIMPLEXML": false,
+        "PHP_EXT_SQLITE3": false,
+        "PHP_EXT_TOKENIZER": false,
+        "PHP_EXT_XML": false,
+        "PHP_EXT_XMLREADER": false,
+        "PHP_EXT_XMLWRITER": false,
 
         "PHP_SAPI_CGI": false,
         "PHP_SAPI_PHPDBG": false

cmake/cmake/presets/all-enabled.json

@@ -10,61 +10,61 @@
       "cacheVariables": {
         "PHP_PEAR": true,
 
-        "EXT_BCMATH": true,
-        "EXT_BZ2": true,
-        "EXT_CALENDAR": true,
-        "EXT_CURL": true,
-        "EXT_DBA": true,
-        "EXT_DBA_LMDB": true,
-        "EXT_DBA_QDBM": true,
-        "EXT_DBA_TCADB": true,
-        "EXT_DL_TEST": true,
-        "EXT_ENCHANT": true,
-        "EXT_EXIF": true,
-        "EXT_FFI": true,
-        "EXT_FTP": true,
-        "EXT_GD": true,
-        "EXT_GD_AVIF": true,
-        "EXT_GD_WEBP": true,
-        "EXT_GD_JPEG": true,
-        "EXT_GD_XPM": true,
-        "EXT_GD_FREETYPE": true,
-        "EXT_GD_JIS": true,
-        "EXT_GETTEXT": true,
-        "EXT_GMP": true,
-        "EXT_HASH_MHASH": true,
-        "EXT_INTL": true,
-        "EXT_LDAP": true,
-        "EXT_LDAP_SASL": true,
-        "EXT_MBSTRING": true,
-        "EXT_MYSQLI": true,
-        "EXT_MYSQL_SOCKET": true,
-        "EXT_MYSQLND": true,
-        "EXT_ODBC": true,
-        "EXT_OPCACHE_CAPSTONE": true,
-        "EXT_OPENSSL": true,
-        "EXT_PCNTL": true,
-        "EXT_PDO_DBLIB": true,
-        "EXT_PDO_FIREBIRD": true,
-        "EXT_PDO_MYSQL": true,
-        "EXT_PDO_ODBC": true,
-        "EXT_PDO_PGSQL": true,
-        "EXT_PGSQL": true,
-        "EXT_READLINE": true,
-        "EXT_SHMOP": true,
-        "EXT_SNMP": true,
-        "EXT_SOAP": true,
-        "EXT_SOCKETS": true,
-        "EXT_SODIUM": true,
-        "EXT_STANDARD_ARGON2": true,
-        "EXT_SYSVMSG": true,
-        "EXT_SYSVSEM": true,
-        "EXT_SYSVSHM": true,
-        "EXT_TIDY": true,
-        "EXT_XSL": true,
-        "EXT_ZEND_TEST": true,
-        "EXT_ZIP": true,
-        "EXT_ZLIB": true,
+        "PHP_EXT_BCMATH": true,
+        "PHP_EXT_BZ2": true,
+        "PHP_EXT_CALENDAR": true,
+        "PHP_EXT_CURL": true,
+        "PHP_EXT_DBA": true,
+        "PHP_EXT_DBA_LMDB": true,
+        "PHP_EXT_DBA_QDBM": true,
+        "PHP_EXT_DBA_TCADB": true,
+        "PHP_EXT_DL_TEST": true,
+        "PHP_EXT_ENCHANT": true,
+        "PHP_EXT_EXIF": true,
+        "PHP_EXT_FFI": true,
+        "PHP_EXT_FTP": true,
+        "PHP_EXT_GD": true,
+        "PHP_EXT_GD_AVIF": true,
+        "PHP_EXT_GD_WEBP": true,
+        "PHP_EXT_GD_JPEG": true,
+        "PHP_EXT_GD_XPM": true,
+        "PHP_EXT_GD_FREETYPE": true,
+        "PHP_EXT_GD_JIS": true,
+        "PHP_EXT_GETTEXT": true,
+        "PHP_EXT_GMP": true,
+        "PHP_EXT_HASH_MHASH": true,
+        "PHP_EXT_INTL": true,
+        "PHP_EXT_LDAP": true,
+        "PHP_EXT_LDAP_SASL": true,
+        "PHP_EXT_MBSTRING": true,
+        "PHP_EXT_MYSQLI": true,
+        "PHP_EXT_MYSQL_SOCKET": true,
+        "PHP_EXT_MYSQLND": true,
+        "PHP_EXT_ODBC": true,
+        "PHP_EXT_OPCACHE_CAPSTONE": true,
+        "PHP_EXT_OPENSSL": true,
+        "PHP_EXT_PCNTL": true,
+        "PHP_EXT_PDO_DBLIB": true,
+        "PHP_EXT_PDO_FIREBIRD": true,
+        "PHP_EXT_PDO_MYSQL": true,
+        "PHP_EXT_PDO_ODBC": true,
+        "PHP_EXT_PDO_PGSQL": true,
+        "PHP_EXT_PGSQL": true,
+        "PHP_EXT_READLINE": true,
+        "PHP_EXT_SHMOP": true,
+        "PHP_EXT_SNMP": true,
+        "PHP_EXT_SOAP": true,
+        "PHP_EXT_SOCKETS": true,
+        "PHP_EXT_SODIUM": true,
+        "PHP_EXT_STANDARD_ARGON2": true,
+        "PHP_EXT_SYSVMSG": true,
+        "PHP_EXT_SYSVSEM": true,
+        "PHP_EXT_SYSVSHM": true,
+        "PHP_EXT_TIDY": true,
+        "PHP_EXT_XSL": true,
+        "PHP_EXT_ZEND_TEST": true,
+        "PHP_EXT_ZIP": true,
+        "PHP_EXT_ZLIB": true,
 
         "PHP_SAPI_EMBED": true,
         "PHP_SAPI_FPM": true,
@@ -105,13 +105,13 @@
         "PHP_DMALLOC": true,
         "PHP_DTRACE": true,
 
-        "EXT_DBA_CDB_EXTERNAL": true,
-        "EXT_OPENSSL_SYSTEM_CIPHERS": true,
-        "EXT_PCRE_EXTERNAL": true,
-        "EXT_PDO_MYSQL_DRIVER": "mysql",
-        "EXT_SESSION_MM": true,
-        "EXT_STANDARD_CRYPT_EXTERNAL": true,
-        "EXT_XML_EXPAT": true
+        "PHP_EXT_DBA_CDB_EXTERNAL": true,
+        "PHP_EXT_OPENSSL_SYSTEM_CIPHERS": true,
+        "PHP_EXT_PCRE_EXTERNAL": true,
+        "PHP_EXT_PDO_MYSQL_DRIVER": "mysql",
+        "PHP_EXT_SESSION_MM": true,
+        "PHP_EXT_STANDARD_CRYPT_EXTERNAL": true,
+        "PHP_EXT_XML_EXPAT": true
       }
     },
     {

cmake/cmake/toolchains/template.cmake

@@ -173,7 +173,7 @@ set(HAVE_FLUSHIO_EXITCODE 1)
 set(HAVE_FNMATCH_EXITCODE 0)
 
 # Set the exit codes for the algos checks when using external crypt library
-# (EXT_STANDARD_CRYPT_EXTERNAL).
+# (PHP_EXT_STANDARD_CRYPT_EXTERNAL).
 set(_PHP_CRYPT_HAVE_BLOWFISH_EXITCODE 0)
 set(_PHP_CRYPT_HAVE_EXT_DES_EXITCODE 0)
 set(_PHP_CRYPT_HAVE_MD5_EXITCODE 0)