Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/cmake/ConfigureChecks.cmake

@@ -400,9 +400,6 @@ check_symbol_exists(strlcat "string.h" HAVE_STRLCAT)
 check_symbol_exists(strlcpy "string.h" HAVE_STRLCPY)
 check_symbol_exists(explicit_bzero "string.h" HAVE_EXPLICIT_BZERO)
 
-# Check strptime().
-include(PHP/CheckStrptime)
-
 # Check reentrant functions.
 include(PHP/CheckReentrantFunctions)
 

cmake/cmake/modules/PHP/CheckStrptime.cmake

@@ -21,6 +21,14 @@ include(CheckFunctionExists)
 include(CheckSymbolExists)
 include(CMakePushCheckState)
 
+if(PHP_VERSION VERSION_GREATER_EQUAL 9.0)
+  message(
+    DEPRECATION
+    "PHP/CheckStrptime module is obsolete and should be removed. PHP "
+    "'strptime()' function is deprecated as of PHP 8.1.0."
+  )
+endif()
+
 # Check whether linker sees the strptime and it is declared in time.h.
 cmake_push_check_state(RESET)
   set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)

cmake/ext/standard/CMakeLists.txt

@@ -275,6 +275,9 @@ endif()
 # Configuration checks.
 ################################################################################
 
+# Check strptime().
+include(PHP/CheckStrptime)
+
 # Check if there is a support means of creating a new process and defining which
 # handles it receives.
 message(CHECK_START "Checking if OS can spawn processes with inherited handles")

cmake/ext/standard/config.cmake.h.in

@@ -25,6 +25,9 @@
 /* Define to 1 if you have the 'crypt_r' function. */
 #cmakedefine HAVE_CRYPT_R 1
 
+/* Define to 1 if you have the declaration of 'strptime'. */
+#cmakedefine HAVE_DECL_STRPTIME 1
+
 /* Define to 1 if you have the 'dn_expand' function. */
 #cmakedefine HAVE_DN_EXPAND 1
 
@@ -62,9 +65,12 @@
 /* Define to 1 if you have the 'res_search' function. */
 #cmakedefine HAVE_RES_SEARCH 1
 
-/* Define to 1 if PHP uses its own crypt_r, and to 0 if using the external
-   crypt library. */
-#cmakedefine01 PHP_USE_PHP_CRYPT_R
+/* Define to 1 if you have the 'strptime' function. */
+#cmakedefine HAVE_STRPTIME 1
 
 /* Define to 1 if your system has fork/vfork/CreateProcess. */
 #cmakedefine PHP_CAN_SUPPORT_PROC_OPEN 1
+
+/* Define to 1 if PHP uses its own crypt_r, and to 0 if using the external
+   crypt library. */
+#cmakedefine01 PHP_USE_PHP_CRYPT_R

cmake/main/php_config.cmake.h.in

@@ -114,9 +114,6 @@
 /* Define to 1 if you have the 'ctime_r' function. */
 #cmakedefine HAVE_CTIME_R 1
 
-/* Define to 1 if you have the declaration of 'strptime'. */
-#cmakedefine HAVE_DECL_STRPTIME 1
-
 /* Define to 1 if you have the <dirent.h> header file. */
 #cmakedefine HAVE_DIRENT_H 1
 
@@ -438,9 +435,6 @@
 /* Define to 1 if you have the 'strnlen' function. */
 #cmakedefine HAVE_STRNLEN 1
 
-/* Define to 1 if you have the 'strptime' function. */
-#cmakedefine HAVE_STRPTIME 1
-
 /* Define to 1 if you have the 'strtok_r' function. */
 #cmakedefine HAVE_STRTOK_R 1