Merge remote-tracking branch 'origin/PHP-8.2' into PHP-8.3

Author: NattyNarwhal

build/php.m4

@@ -1929,9 +1929,8 @@ AC_DEFUN([PHP_SETUP_ICU],[
   ICU_CFLAGS="$ICU_CFLAGS -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1"
   ICU_CXXFLAGS="$ICU_CXXFLAGS -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit"
 
-  if test "$PKG_CONFIG icu-io --atleast-version=60"; then
-    ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1"
-  fi
+  AS_IF([$PKG_CONFIG icu-io --atleast-version=60],
+    [ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1"])
 ])
 
 dnl

ext/intl/config.m4

@@ -82,7 +82,7 @@ if test "$PHP_INTL" != "no"; then
   PHP_REQUIRE_CXX()
 
   AC_MSG_CHECKING([if intl requires -std=gnu++17])
-  AS_IF([test "$PKG_CONFIG icu-uc --atleast-version=74"],[
+  AS_IF([$PKG_CONFIG icu-uc --atleast-version=74],[
     AC_MSG_RESULT([yes])
     PHP_CXX_COMPILE_STDCXX(17, mandatory, PHP_INTL_STDCXX)
   ],[