Merge branch 'PHP-8.3' into PHP-8.4

Author: petk

cmake/cmake/modules/FindICU.cmake

@@ -1,21 +1,12 @@
 #[=============================================================================[
 # FindICU
 
-Find the ICU library.
-
 See: https://cmake.org/cmake/help/latest/module/FindICU.html
 
 This module overrides the upstream CMake `FindICU` module with few
 customizations:
 
 * Added pkg-config.
-
-## Usage
-
-```cmake
-# CMakeLists.txt
-find_package(ICU)
-```
 #]=============================================================================]
 
 include(FeatureSummary)

cmake/cmake/modules/PHP/FeatureSummary.cmake

@@ -96,6 +96,12 @@ function(php_feature_summary_preamble result)
 
   get_property(enabledLanguages GLOBAL PROPERTY ENABLED_LANGUAGES)
   foreach(language IN ITEMS ${enabledLanguages})
+    if(language STREQUAL "CXX")
+      set(languageLabel "C++")
+    else()
+      set(languageLabel "${language}")
+    endif()
+
     # Add compiler info.
     if(CMAKE_${language}_COMPILER_LOADED)
       set(compiler "")
@@ -112,7 +118,7 @@ function(php_feature_summary_preamble result)
         string(APPEND compiler "${CMAKE_${language}_COMPILER}")
       endif()
       php_feature_summary_preamble_add_item(
-        "${language} compiler"
+        "${languageLabel} compiler"
         "${compiler}"
         preamble
       )
@@ -134,7 +140,7 @@ function(php_feature_summary_preamble result)
         string(APPEND linker "${CMAKE_${language}_COMPILER_LINKER}")
       endif()
       php_feature_summary_preamble_add_item(
-        "${language} linker"
+        "${languageLabel} linker"
         "${linker}"
         preamble
       )

cmake/ext/intl/CMakeLists.txt

@@ -190,7 +190,12 @@ if(CMAKE_SYSTEM_NAME STREQUAL "CYGWIN")
   )
 endif()
 
-find_package(ICU 50.1 COMPONENTS io uc i18n)
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+  find_package(ICU 50.1 COMPONENTS io uc in)
+else()
+  find_package(ICU 50.1 COMPONENTS io uc i18n)
+endif()
+
 set_package_properties(
   ICU
   PROPERTIES
@@ -204,7 +209,10 @@ else()
   target_compile_features(php_ext_intl PRIVATE cxx_std_11)
 endif()
 
-target_link_libraries(php_ext_intl PRIVATE ICU::io ICU::uc ICU::i18n)
+target_link_libraries(
+  php_ext_intl
+  PRIVATE ICU::io ICU::uc $<IF:$<PLATFORM_ID:Windows>,ICU::in,ICU::i18n>
+)
 
 if(ICU_VERSION VERSION_GREATER_EQUAL 60)
   target_compile_definitions(php_ext_intl PRIVATE U_HIDE_OBSOLETE_UTF_OLD_H=1)