Sync with upstream

- ext/intl new source files
- new configuration option PHP_SYSTEM_GLOB
- headers and source files synced
- changelogs updated
- added checks for issetugid() and reallocarray().

Author: petk

CHANGELOG.md

@@ -6,7 +6,10 @@ repository.
 ## PHP 8.5
 
 * C11 standard
-* ...
+
+New configuration variables:
+
+* PHP_SYSTEM_GLOB
 
 ## PHP 8.4
 

cmake/Zend/CMakeLists.txt

@@ -265,6 +265,7 @@ target_sources(
         zend_ptr_stack.h
         zend_range_check.h
         zend_signal.h
+        zend_simd.h
         zend_smart_str_public.h
         zend_smart_str.h
         zend_smart_string_public.h

cmake/cmake/Configuration.cmake

@@ -160,6 +160,15 @@ mark_as_advanced(PHP_LIBGCC)
 option(PHP_CCACHE "Use ccache if available on the system" ON)
 mark_as_advanced(PHP_CCACHE)
 
+cmake_dependent_option(
+  PHP_SYSTEM_GLOB
+  "Use the system glob() function instead of the PHP provided replacement"
+  OFF
+  [[NOT CMAKE_SYSTEM_NAME STREQUAL "Windows"]]
+  OFF
+)
+mark_as_advanced(PHP_SYSTEM_GLOB)
+
 ################################################################################
 # Set PHP_EXTENSION_DIR.
 ################################################################################

cmake/cmake/ConfigureChecks.cmake

@@ -303,6 +303,7 @@ check_symbol_exists(getgrnam_r "grp.h" HAVE_GETGRNAM_R)
 check_symbol_exists(getpwuid_r "pwd.h" HAVE_GETPWUID_R)
 check_symbol_exists(getwd "unistd.h" HAVE_GETWD)
 check_symbol_exists(glob "glob.h" HAVE_GLOB)
+check_symbol_exists(issetugid "unistd.h" HAVE_ISSETUGID)
 check_symbol_exists(lchown "unistd.h" HAVE_LCHOWN)
 check_symbol_exists(memcntl "sys/mman.h" HAVE_MEMCNTL)
 
@@ -324,6 +325,7 @@ check_symbol_exists(
   HAVE_PTHREAD_JIT_WRITE_PROTECT_NP
 )
 check_symbol_exists(putenv "stdlib.h" HAVE_PUTENV)
+check_symbol_exists(reallocarray "stdlib.h" HAVE_REALLOCARRAY)
 check_symbol_exists(scandir "dirent.h" HAVE_SCANDIR)
 check_symbol_exists(setitimer "sys/time.h" HAVE_SETITIMER)
 check_symbol_exists(setenv "stdlib.h" HAVE_SETENV)

cmake/ext/intl/CMakeLists.txt

@@ -118,6 +118,8 @@ target_sources(
     intl_convert.c
     intl_convertcpp.cpp
     intl_error.c
+    listformatter/listformatter_class.c
+    listformatter/listformatter.stub.php
     locale/locale_class.c
     locale/locale_methods.c
     locale/locale.c

cmake/main/CMakeLists.txt

@@ -27,6 +27,7 @@ target_sources(
     network.c
     output.c
     php_content_types.c
+    php_glob.c
     php_ini_builder.c
     php_ini.c
     php_odbc_utils.c
@@ -57,13 +58,15 @@ target_sources(
   PUBLIC
     FILE_SET HEADERS
       FILES
+        charclass.h
         fastcgi.h
         fopen_wrappers.h
         http_status_codes.h
         main_arginfo.h
         php_compat.h
         php_content_types.h
         php_getopt.h
+        php_glob.h
         php_globals.h
         php_ini_builder.h
         php_ini.h

cmake/main/cmake/php_config.h.in

@@ -222,6 +222,9 @@
 /* Define to 1 if IPv6 is enabled and supported. */
 #cmakedefine HAVE_IPV6 1
 
+/* Define to 1 if you have the 'issetugid' function. */
+#cmakedefine HAVE_ISSETUGID 1
+
 /* Define to 1 if you have the <langinfo.h> header file. */
 #cmakedefine HAVE_LANGINFO_H 1
 
@@ -300,6 +303,9 @@
 /* Define to 1 if you have the <pwd.h> header file. */
 #cmakedefine HAVE_PWD_H 1
 
+/* Define to 1 if you have the 'reallocarray' function. */
+#cmakedefine HAVE_REALLOCARRAY 1
+
 /* Define to 1 if you have the <resolv.h> header file. */
 #cmakedefine HAVE_RESOLV_H 1
 
@@ -597,6 +603,10 @@
 /* Define to 1 if PHP uses its own SIGCHLD handler, and to 0 if not. */
 #cmakedefine01 PHP_SIGCHILD
 
+/* Define to 1 if PHP uses the system glob() function instead of
+   php_glob(). */
+#cmakedefine PHP_SYSTEM_GLOB 1
+
 /* The 'uname -a' output. */
 #cmakedefine PHP_UNAME "@PHP_UNAME@"
 

cmake/win32/CMakeLists.txt

@@ -21,7 +21,6 @@ target_sources(
     fnmatch.c
     ftok.c
     getrusage.c
-    glob.c
     globals.c
     ioutil.c
     nice.c
@@ -37,12 +36,10 @@ target_sources(
   PUBLIC
     FILE_SET HEADERS
       FILES
-        charclass.h
         codepage.h
         console.h
         fnmatch.h
         getrusage.h
-        glob.h
         ioutil.h
         ipc.h
         nice.h

docs/cmake/configuration.md

@@ -192,6 +192,7 @@ documentation.
 * [`PHP_LIBGCC`](/docs/cmake/variables/PHP_LIBGCC.md)
 * [`PHP_RE2C_COMPUTED_GOTOS`](/docs/cmake/variables/PHP_RE2C_COMPUTED_GOTOS.md)
 * [`PHP_SIGCHILD`](/docs/cmake/variables/PHP_SIGCHILD.md)
+* [`PHP_SYSTEM_GLOB`](/docs/cmake/variables/PHP_SYSTEM_GLOB.md)
 * [`PHP_THREAD_SAFETY`](/docs/cmake/variables/PHP_THREAD_SAFETY.md)
 * [`PHP_UNDEFINED_SANITIZER`](/docs/variables/_PHP_UNDEFINED_SANITIZER.md)
 * [`PHP_USE_RTLD_NOW`](/docs/cmake/variables/PHP_USE_RTLD_NOW.md)
@@ -669,6 +670,18 @@ A list of Autoconf `configure` command-line configuration options, Windows
       <td>PHP_LIBGCC=ON</td>
       <td></td>
     </tr>
+    <tr>
+      <td>--disable-system-glob</td>
+      <td>N/A</td>
+      <td>PHP_SYSTEM_GLOB=OFF</td>
+      <td>default, PHP &gt;= 8.5</td>
+    </tr>
+    <tr>
+      <td>&emsp;--enable-system-glob</td>
+      <td>N/A</td>
+      <td>PHP_SYSTEM_GLOB=ON</td>
+      <td>PHP &gt;= 8.5</td>
+    </tr>
     <tr>
       <td>--enable-all</td>
       <td>--enable-snapshot-build</td>

docs/cmake/variables/PHP_SYSTEM_GLOB.md

@@ -0,0 +1,12 @@
+# `PHP_SYSTEM_GLOB`
+
+:green_circle: *New in PHP 8.5.*
+
+* Default: `OFF`
+* Values: `ON|OFF`
+
+When enabled, system `glob()` function will be used for PHP glob functionality
+instead of the PHP `php_glob()` built-in implementation.
+
+> [!NOTE]
+> This option is not available when the target system is Windows.