Sync with upstream

Author: petk

cmake/ext/intl/CMakeLists.txt

@@ -127,15 +127,15 @@ target_sources(
     formatter/formatter.stub.php
     grapheme/grapheme_string.c
     grapheme/grapheme_util.c
-    idn/idn.c
+    idn/idn.cpp
     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
+    locale/locale_class.cpp
+    locale/locale_methods.cpp
+    locale/locale.cpp
     locale/locale.stub.php
     msgformat/msgformat_attr.c
     msgformat/msgformat_class.c
@@ -164,7 +164,7 @@ target_sources(
     transliterator/transliterator_class.c
     transliterator/transliterator_methods.c
     transliterator/transliterator.stub.php
-    uchar/uchar.c
+    uchar/uchar.cpp
     uchar/uchar.stub.php
 )
 

cmake/ext/openssl/CMakeLists.txt

@@ -197,16 +197,6 @@ if(TARGET OpenSSL::SSL)
   endif()
 
   if(PHP_EXT_OPENSSL_ARGON2)
-    if(PHP_THREAD_SAFETY)
-      message(
-        FATAL_ERROR
-        "The OpenSSL Argon2 password hashing is not supported in thread-safe "
-        "mode for now. Please, disable thread safety (set 'PHP_THREAD_SAFETY' "
-        "to 'OFF'), or build without OpenSSL Argon2 (set "
-        "'PHP_EXT_OPENSSL_ARGON2' to 'OFF')."
-      )
-    endif()
-
     cmake_push_check_state(RESET)
       set(CMAKE_REQUIRED_LIBRARIES OpenSSL::SSL)
       check_symbol_exists(

cmake/ext/standard/CMakeLists.txt

@@ -180,8 +180,6 @@ target_sources(
         php_math.h
         php_net.h
         php_password.h
-        php_smart_string_public.h
-        php_smart_string.h
         php_standard.h
         php_string.h
         php_uuencode.h

docs/evolution.md

@@ -936,7 +936,8 @@ PHP coding standards now use the C11 standard.
 #### Abstract
 
 * ext/phar/php_phar.h is not installed anymore.
-* ext/standard/datetime.h is not installed anymore.
+* ext/standard/datetime.h, ext/standard/php_smart_string.h and
+  ext/standard/php_smart_string_public.h are not installed anymore.
 * Minimum required ICU package version (for ext/intl) has been increased from
   50.1 to 57.1.
 * Minimum required SQLite library version has been increased from 3.7.7 to