Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/CMakePresets.json

@@ -2,7 +2,8 @@
   "version": 4,
   "include": [
     "cmake/presets/all-disabled.json",
-    "cmake/presets/all-enabled.json"
+    "cmake/presets/all-enabled.json",
+    "cmake/presets/windows.json"
   ],
   "configurePresets": [
     {

cmake/cmake/Testing.cmake

@@ -39,7 +39,7 @@ block()
         -d memory_limit=-1
         run-tests.php
           -n
-          -d extension_dir=${PHP_BINARY_DIR}/modules
+          -d extension_dir=${PHP_BINARY_DIR}/modules/$<CONFIG>
           --show-diff
           ${options}
           ${parallel}

cmake/cmake/modules/PHP/Extensions.cmake

@@ -465,10 +465,19 @@ function(php_extensions_postconfigure extension)
   # Set build-phase location for shared extensions.
   get_target_property(location php_ext_${extension} LIBRARY_OUTPUT_DIRECTORY)
   if(NOT location)
-    set_property(
-      TARGET php_ext_${extension}
-      PROPERTY LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/modules"
-    )
+    get_property(isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+
+    if(isMultiConfig)
+      set_property(
+        TARGET php_ext_${extension}
+        PROPERTY LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/modules"
+      )
+    else()
+      set_property(
+        TARGET php_ext_${extension}
+        PROPERTY LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/modules/$<CONFIG>"
+      )
+    endif()
   endif()
 endfunction()
 

cmake/cmake/modules/PHP/Stubs.cmake

@@ -59,7 +59,7 @@ function(_php_stubs_get_php_command result)
     list(
       APPEND
       command
-      -d extension_dir=${PROJECT_BINARY_DIR}/modules
+      -d extension_dir=${PROJECT_BINARY_DIR}/modules/$<CONFIG>
       -d extension=tokenizer
     )
   endif()
@@ -143,8 +143,8 @@ block()
     php_stubs ${targetOptions}
     COMMAND
       ${CMAKE_COMMAND}
+      -D "PHP_COMMAND=${PHP_COMMAND}"
       -P ${PROJECT_BINARY_DIR}/CMakeFiles/PHP/Stubs/StubsGenerator.cmake
     VERBATIM
-    COMMAND_EXPAND_LISTS
   )
 endblock()

cmake/cmake/modules/PHP/Stubs/StubsGenerator.cmake.in

@@ -1,5 +1,9 @@
 #[=============================================================================[
 Script for processing PHP stub sources.
+
+Expected variables:
+
+* PHP_COMMAND
 #]=============================================================================]
 
 cmake_minimum_required(VERSION 3.27...4.0)
@@ -8,8 +12,12 @@ if(NOT CMAKE_SCRIPT_MODE_FILE)
   message(FATAL_ERROR "This is a command-line script.")
 endif()
 
+if(NOT PHP_COMMAND)
+  message(WARNING "StubsGenerator.cmake: No PHP command given.")
+  return()
+endif()
+
 set(sources "@PHP_SOURCES@")
-set(phpCommand "@PHP_COMMAND@")
 set(phpGenStubScriptSource "@PROJECT_SOURCE_DIR@/build/gen_stub.php")
 
 # Ensure sources include only *.stub.php files.
@@ -38,7 +46,7 @@ execute_process(
     ${CMAKE_COMMAND} -E cmake_echo_color --blue --bold
       "Regenerating *_arginfo.h headers from *.stub.php sources"
   COMMAND
-    ${phpCommand} ${CMAKE_CURRENT_LIST_DIR}/gen_stub.php ${stubs}
+    ${PHP_COMMAND} ${CMAKE_CURRENT_LIST_DIR}/gen_stub.php ${stubs}
 )
 
 # Ensure that *_arginfo.h headers are newer than their *.stub.php sources.

cmake/cmake/presets/windows.json

@@ -8,42 +8,42 @@
       "binaryDir": "${sourceDir}/php-build/windows",
       "installDir": "C:/temp",
       "cacheVariables": {
-        "PHP_EXT_COM_DOTNET": false,
-        "PHP_EXT_CTYPE": false,
+        "PHP_EXT_COM_DOTNET": true,
+        "PHP_EXT_CTYPE": true,
         "PHP_EXT_DOM": false,
-        "PHP_EXT_FILEINFO": false,
-        "PHP_EXT_FILTER": false,
+        "PHP_EXT_FILEINFO": true,
+        "PHP_EXT_FILTER": true,
         "PHP_EXT_ICONV": false,
         "PHP_EXT_LIBXML": false,
-        "PHP_EXT_OPCACHE": false,
-        "PHP_EXT_PDO": false,
+        "PHP_EXT_OPCACHE": true,
+        "PHP_EXT_PDO": true,
         "PHP_EXT_PDO_SQLITE": false,
         "PHP_EXT_PHAR": false,
         "PHP_EXT_POSIX": false,
-        "PHP_EXT_SESSION": false,
+        "PHP_EXT_SESSION": true,
         "PHP_EXT_SIMPLEXML": false,
         "PHP_EXT_SQLITE3": false,
-        "PHP_EXT_TOKENIZER": false,
+        "PHP_EXT_TOKENIZER": true,
         "PHP_EXT_XML": false,
         "PHP_EXT_XMLREADER": false,
         "PHP_EXT_XMLWRITER": false,
 
-        "PHP_SAPI_CGI": false,
-        "PHP_SAPI_PHPDBG": false,
+        "PHP_SAPI_CGI": true,
+        "PHP_SAPI_PHPDBG": true,
 
-        "CMAKE_INSTALL_BINDIR": "",
-        "CMAKE_INSTALL_DATADIR": "",
-        "CMAKE_INSTALL_LIBDIR": "",
-        "CMAKE_INSTALL_LOCALSTATEDIR": "",
-        "CMAKE_INSTALL_SBINDIR": "",
-        "CMAKE_INSTALL_SYSCONFDIR": "",
+        "CMAKE_INSTALL_BINDIR": ".",
+        "CMAKE_INSTALL_DATADIR": ".",
+        "CMAKE_INSTALL_LIBDIR": ".",
+        "CMAKE_INSTALL_LOCALSTATEDIR": ".",
+        "CMAKE_INSTALL_SBINDIR": ".",
+        "CMAKE_INSTALL_SYSCONFDIR": ".",
 
         "PHP_EXTENSION_DIR": "ext"
       }
     },
     {
-      "name": "all-disabled-ts",
-      "inherits": "all-disabled",
+      "name": "windows-ts",
+      "inherits": "windows",
       "displayName": "Thread safety (ZTS) with all extensions disabled",
       "description": "PHP thread safe (ZTS) build with all PHP extensions and SAPIs disabled, only with CLI SAPI",
       "binaryDir": "${sourceDir}/php-build/windows-ts",
@@ -52,8 +52,8 @@
       }
     },
     {
-      "name": "all-disabled-ninja",
-      "inherits": "all-disabled",
+      "name": "windows-ninja",
+      "inherits": "windows",
       "displayName": "Ninja generator with all extensions disabled",
       "description": "PHP build using Ninja generator with all PHP extensions and SAPIs disabled, only with CLI SAPI",
       "binaryDir": "${sourceDir}/php-build/windows-ninja",
@@ -62,22 +62,22 @@
   ],
   "buildPresets": [
     {
-      "name": "all-disabled",
-      "configurePreset": "all-disabled"
+      "name": "windows",
+      "configurePreset": "windows"
     },
     {
-      "name": "all-disabled-ts",
-      "configurePreset": "all-disabled-ts"
+      "name": "windows-ts",
+      "configurePreset": "windows-ts"
     },
     {
-      "name": "all-disabled-ninja",
-      "configurePreset": "all-disabled-ninja"
+      "name": "windows-ninja",
+      "configurePreset": "windows-ninja"
     }
   ],
   "testPresets": [
     {
-      "name": "all-disabled",
-      "configurePreset": "all-disabled",
+      "name": "windows",
+      "configurePreset": "windows",
       "environment": {
         "SKIP_IO_CAPTURE_TESTS": "1"
       },
@@ -87,14 +87,14 @@
       }
     },
     {
-      "name": "all-disabled-ts",
-      "configurePreset": "all-disabled-ts",
-      "inherits": "all-disabled"
+      "name": "windows-ts",
+      "configurePreset": "windows-ts",
+      "inherits": "windows"
     },
     {
-      "name": "all-disabled-ninja",
-      "configurePreset": "all-disabled-ninja",
-      "inherits": "all-disabled"
+      "name": "windows-ninja",
+      "configurePreset": "windows-ninja",
+      "inherits": "windows"
     }
   ]
 }

cmake/ext/phar/CMakeLists.txt

@@ -137,7 +137,7 @@ set(pharSharedOptions "")
 if(PHP_EXT_PHAR_SHARED OR BUILD_SHARED_LIBS)
   set(
     pharSharedOptions
-      -d extension_dir=${PHP_BINARY_DIR}/modules
+      -d extension_dir=${PHP_BINARY_DIR}/modules/$<CONFIG>
       -d extension=phar
   )
 endif()

cmake/pear/cmake/InstallPear.cmake

@@ -144,7 +144,7 @@ file(
 )
 
 # Add PHP command-line options for shared dependent extensions.
-set(phpPearOptions -d extension_dir=${PHP_BINARY_DIR}/modules)
+set(phpPearOptions -d extension_dir=${PHP_BINARY_DIR}/modules/$<CONFIG>)
 
 if(PHP_EXT_OPENSSL_SHARED)
   list(APPEND phpPearOptions -d extension=openssl)