1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 08:12:21 +01:00

Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
  Fix iconv tests skipped on windows
This commit is contained in:
Niels Dossche
2025-06-18 20:47:30 +02:00
2 changed files with 2 additions and 2 deletions

View File

@@ -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

View File

@@ -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