Merge branch 'PHP-8.4'

* PHP-8.4:
  Fix iconv tests skipped on windows

Author: nielsdos

ext/iconv/tests/translit-failure.phpt

@@ -4,7 +4,7 @@ Translit failure
 iconv
 --SKIPIF--
 <?php
-( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\"");
+( ICONV_IMPL != "libiconv" && ICONV_IMPL != "\"libiconv\"" ) and die("skip ICONV_IMPL != \"libiconv\"");
 ?>
 --INI--
 error_reporting=2039

ext/iconv/tests/translit-utf8.phpt

@@ -4,7 +4,7 @@ Translit UTF-8 quotes
 iconv
 --SKIPIF--
 <?php
-( ICONV_IMPL != "libiconv" ) and die("skip ICONV_IMPL != \"libiconv\"");
+( ICONV_IMPL != "libiconv" && ICONV_IMPL != "\"libiconv\"" ) and die("skip ICONV_IMPL != \"libiconv\"");
 ?>
 --INI--
 error_reporting=2047