Merge branch 'PHP-8.5'

petk · petk · commit 63b1def6054b · 2025-11-28T20:28:46.000+01:00
diff --git a/cmake/cmake/Configuration.cmake b/cmake/cmake/Configuration.cmake
@@ -87,7 +87,7 @@ mark_as_advanced(PHP_INCLUDE_PREFIX)
 
 set(
   CACHE{PHP_CONFIG_FILE_SCAN_DIR}
-  TYPE PATH
+  TYPE STRING
   HELP
     "The path where to scan for additional INI configuration files; By default "
     "it is empty value; Pass it as a relative path inside the install prefix, "
@@ -100,7 +100,7 @@ mark_as_advanced(PHP_CONFIG_FILE_SCAN_DIR)
 if(NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(
     CACHE{PHP_CONFIG_FILE_PATH}
-    TYPE FILEPATH
+    TYPE STRING
     HELP
       "The path in which to look for php.ini; By default, it is set to "
       "SYSCONFDIR (etc); Relative path gets the CMAKE_INSTALL_PREFIX "
@@ -223,7 +223,7 @@ mark_as_advanced(PHP_SYSTEM_GLOB)
 
 set(
   CACHE{PHP_EXTENSION_DIR}
-  TYPE PATH
+  TYPE STRING
   HELP
     "Default directory for dynamically loadable PHP extensions. If left empty, "
     "it is determined automatically. Can be overridden using the PHP "
diff --git a/cmake/ext/mysqli/CMakeLists.txt b/cmake/ext/mysqli/CMakeLists.txt
@@ -79,7 +79,7 @@ mark_as_advanced(PHP_EXT_MYSQL_SOCKET)
 
 php_set(
   PHP_EXT_MYSQL_SOCKET_PATH
-  TYPE FILEPATH
+  TYPE STRING
   IF [[(PHP_EXT_MYSQLI OR PHP_EXT_PDO_MYSQL) AND PHP_EXT_MYSQL_SOCKET]]
   VALUE ""
   DOC
diff --git a/cmake/main/CMakeLists.txt b/cmake/main/CMakeLists.txt
@@ -286,8 +286,8 @@ function(_php_main_configure_build_defs)
   string(CONFIGURE [[
     set(CONFIGURE_COMMAND "cmake")
 
-    if(NOT "@PHP_PEAR_DIR@" STREQUAL "")
-      set(PHP_PEAR_INSTALLDIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,@PHP_PEAR_DIR@,${CMAKE_INSTALL_PREFIX}>")
+    if(NOT "@PHP_PEAR_INSTALL_DIR_VALUE@" STREQUAL "")
+      set(PHP_PEAR_INSTALL_DIR_VALUE "$<PATH:ABSOLUTE_PATH,NORMALIZE,@PHP_PEAR_INSTALL_DIR_VALUE@,${CMAKE_INSTALL_PREFIX}>")
     endif()
 
     set(PHP_BINDIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,@CMAKE_INSTALL_BINDIR@,${CMAKE_INSTALL_PREFIX}>")
@@ -305,9 +305,9 @@ function(_php_main_configure_build_defs)
     set(PHP_EXTENSION_DIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,@PHP_EXTENSION_DIR@,${CMAKE_INSTALL_PREFIX}>")
 
     if("@CMAKE_SYSTEM_NAME@" STREQUAL "Windows")
-      set(PHP_INCLUDE_PATH ".;${PHP_PEAR_INSTALLDIR}")
+      set(PHP_INCLUDE_PATH ".;${PHP_PEAR_INSTALL_DIR_VALUE}")
     else()
-      set(PHP_INCLUDE_PATH ".:${PHP_PEAR_INSTALLDIR}")
+      set(PHP_INCLUDE_PATH ".:${PHP_PEAR_INSTALL_DIR_VALUE}")
     endif()
 
     set(PHP_LIBDIR "$<PATH:ABSOLUTE_PATH,NORMALIZE,@CMAKE_INSTALL_LIBDIR@,${CMAKE_INSTALL_PREFIX}>")
diff --git a/cmake/main/cmake/build-defs.h.in b/cmake/main/cmake/build-defs.h.in
@@ -12,7 +12,7 @@
 #cmakedefine CONFIGURE_COMMAND "@CONFIGURE_COMMAND@"
 
 /* The path to the PEAR installation directory. */
-#define PEAR_INSTALLDIR "@PHP_PEAR_INSTALLDIR@"
+#define PEAR_INSTALLDIR "@PHP_PEAR_INSTALL_DIR_VALUE@"
 
 /* The path to the directory containing command-line executables (bin). */
 #define PHP_BINDIR "@PHP_BINDIR@"
diff --git a/cmake/pear/CMakeLists.txt b/cmake/pear/CMakeLists.txt
@@ -17,14 +17,14 @@ Configure PEAR as part of the PHP installation.
 
 Install PEAR, PHP Extension and Application Repository package manager.
 
-## PHP_PEAR_DIR
+## PHP_PEAR_INSTALL_DIR
 
 :orange_circle: *Deprecated as of PHP 7.4.*
 
 * Default: `DATADIR/pear`
 
-The path where PEAR will be installed to. `CMAKE_INSTALL_PREFIX` is
-automatically prepended when given as a relative path.
+The path where PEAR will be installed to. Relative path is interpreted as being
+relative to the `CMAKE_INSTALL_PREFIX`.
 
 ## PHP_PEAR_TEMP_DIR
 
@@ -33,18 +33,15 @@ automatically prepended when given as a relative path.
 * Default: `tmp/pear` on \*nix and `temp/pear` on Windows
 
 The PEAR temporary directory where PEAR writes temporary files, such as cache,
-downloaded packages artifacts and similar. Pass it as a relative path inside the
-top level system directory, which will be automatically prepended. If given as
-an absolute path, top level directory is not prepended. Relative path is added
-to the top root system directory (`/` on \*nix, or `C:/` on Windows).
+downloaded packages artifacts and similar. Relative path is interpreted as being
+relative to the top root system directory (`/` on \*nix, or `C:/` on Windows).
 
 For example, default PEAR temporary directory after the top level system
-directory is prepended becomes `/tmp/pear` on \*nix and `C:/temp/pear` on
-Windows.
+directory is prepended becomes `/tmp/pear` on Unix-like systems and
+`C:/temp/pear` on Windows.
 #]=============================================================================]
 
 include(FeatureSummary)
-include(PHP/Set)
 
 option(
   PHP_PEAR
@@ -57,26 +54,39 @@ add_feature_info(
   "PHP Extension and Application Repository"
 )
 
-php_set(
-  PHP_PEAR_DIR
-  TYPE PATH
-  IF PHP_PEAR
+set(
+  CACHE{PHP_PEAR_INSTALL_DIR}
+  TYPE STRING
+  HELP "The PEAR installation directory"
   VALUE "${CMAKE_INSTALL_DATADIR}/pear"
-  DOC "The PEAR installation directory"
 )
-mark_as_advanced(PHP_PEAR_DIR)
+mark_as_advanced(PHP_PEAR_INSTALL_DIR)
+
+block()
+  if(NOT PHP_PEAR)
+    set(value "")
+  else()
+    set(value "${PHP_PEAR_INSTALL_DIR}")
+  endif()
+
+  set(
+    CACHE{PHP_PEAR_INSTALL_DIR_VALUE}
+    TYPE INTERNAL
+    HELP "Internal storage buffer for the PEAR installation directory value"
+    VALUE ${value}
+  )
+endblock()
 
 if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
   set(tmp_dir "temp/pear")
 else()
   set(tmp_dir "tmp/pear")
 endif()
-php_set(
-  PHP_PEAR_TEMP_DIR
-  TYPE PATH
-  IF PHP_PEAR
+set(
+  CACHE{PHP_PEAR_TEMP_DIR}
+  TYPE STRING
+  HELP "The PEAR temporary directory. Default: ${tmp_dir}"
   VALUE "${tmp_dir}"
-  DOC "The PEAR temporary directory. Default: ${tmp_dir}"
 )
 mark_as_advanced(PHP_PEAR_TEMP_DIR)
 
@@ -128,7 +138,7 @@ elseif(CMAKE_CROSSCOMPILING AND CMAKE_CROSSCOMPILING_EMULATOR)
 endif()
 
 string(CONFIGURE [[
-  set(php_pear_install_dir "$<PATH:ABSOLUTE_PATH,NORMALIZE,@PHP_PEAR_DIR@,${CMAKE_INSTALL_PREFIX}>")
+  set(php_pear_install_dir "$<PATH:ABSOLUTE_PATH,NORMALIZE,@PHP_PEAR_INSTALL_DIR_VALUE@,${CMAKE_INSTALL_PREFIX}>")
   set(php_pear_install_bin_dir "$<PATH:ABSOLUTE_PATH,NORMALIZE,@CMAKE_INSTALL_BINDIR@,${CMAKE_INSTALL_PREFIX}>")
   set(php_pear_current_source_dir "@CMAKE_CURRENT_SOURCE_DIR@")
   set(php_pear_current_binary_dir "@CMAKE_CURRENT_BINARY_DIR@")
diff --git a/cmake/sapi/apache2handler/CMakeLists.txt b/cmake/sapi/apache2handler/CMakeLists.txt
@@ -69,7 +69,6 @@ set(
   HELP "The path to the Apache modules directory to install PHP Apache module"
   VALUE ""
 )
-set_property(CACHE PHP_SAPI_APACHE2HANDLER_INSTALL_DIR PROPERTY TYPE PATH)
 mark_as_advanced(PHP_SAPI_APACHE2HANDLER_INSTALL_DIR)
 
 if(NOT PHP_SAPI_APACHE2HANDLER)
diff --git a/docs/cmake/cmake.md b/docs/cmake/cmake.md
@@ -863,7 +863,7 @@ PHP CMake-based build system specific installation cache variables:
   The PHP include directory inside the `CMAKE_INSTALL_INCLUDEDIR`.
   Default: `php`
 
-* [`PHP_PEAR_DIR`](/docs/cmake/variables/PHP_PEAR.md)
+* [`PHP_PEAR_INSTALL_DIR`](/docs/cmake/variables/PHP_PEAR.md)
 
   The path where PEAR will be installed to.
 
@@ -908,7 +908,7 @@ PHP installation directory structure when using CMake:
   └─📂 ${CMAKE_INSTALL_DATADIR}       #   └─📂 (share)
     └─📂 php                          #     └─📂 php
       └─📂 fpm                        #       └─📂 fpm
-  ├─📂 ${PHP_PEAR_DIR}                #     └─📂 pear (default: share/pear)
+  ├─📂 ${PHP_PEAR_INSTALL_DIR}        #     └─📂 pear (default: share/pear)
   └─📂 ${CMAKE_INSTALL_LOCALSTATEDIR} #   └─📂 var
     └─📂 log                          #     └─📂 log
   └─📂 ${CMAKE_INSTALL_RUNSTATEDIR}   #   └─📂 var/run
diff --git a/docs/cmake/configuration.md b/docs/cmake/configuration.md
@@ -3411,7 +3411,7 @@ A list of Autoconf `configure` command-line configuration options, Windows
       <td>N/A</td>
       <td>
         PHP_PEAR=ON<br>
-        [PHP_PEAR_DIR=DIR]<br>
+        [PHP_PEAR_INSTALL_DIR=DIR]<br>
         [PHP_PEAR_TEMP_DIR=DIR]<br>
       </td>
       <td></td>
diff --git a/docs/cmake/pear.md b/docs/cmake/pear.md
@@ -19,14 +19,14 @@ Configure PEAR as part of the PHP installation.
 
 Install PEAR, PHP Extension and Application Repository package manager.
 
-## PHP_PEAR_DIR
+## PHP_PEAR_INSTALL_DIR
 
 :orange_circle: *Deprecated as of PHP 7.4.*
 
 * Default: `DATADIR/pear`
 
-The path where PEAR will be installed to. `CMAKE_INSTALL_PREFIX` is
-automatically prepended when given as a relative path.
+The path where PEAR will be installed to. Relative path is interpreted as being
+relative to the `CMAKE_INSTALL_PREFIX`.
 
 ## PHP_PEAR_TEMP_DIR
 
@@ -35,11 +35,9 @@ automatically prepended when given as a relative path.
 * Default: `tmp/pear` on \*nix and `temp/pear` on Windows
 
 The PEAR temporary directory where PEAR writes temporary files, such as cache,
-downloaded packages artifacts and similar. Pass it as a relative path inside the
-top level system directory, which will be automatically prepended. If given as
-an absolute path, top level directory is not prepended. Relative path is added
-to the top root system directory (`/` on \*nix, or `C:/` on Windows).
+downloaded packages artifacts and similar. Relative path is interpreted as being
+relative to the top root system directory (`/` on \*nix, or `C:/` on Windows).
 
 For example, default PEAR temporary directory after the top level system
-directory is prepended becomes `/tmp/pear` on \*nix and `C:/temp/pear` on
-Windows.
+directory is prepended becomes `/tmp/pear` on Unix-like systems and
+`C:/temp/pear` on Windows.

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,6 @@ set(`
`69`	`69`	`HELP "The path to the Apache modules directory to install PHP Apache module"`
`70`	`70`	`VALUE ""`
`71`	`71`	`)`
`72`		`-set_property(CACHE PHP_SAPI_APACHE2HANDLER_INSTALL_DIR PROPERTY TYPE PATH)`
`73`	`72`	`mark_as_advanced(PHP_SAPI_APACHE2HANDLER_INSTALL_DIR)`
`74`	`73`
`75`	`74`	`if(NOT PHP_SAPI_APACHE2HANDLER)`