]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorChristoph M. Becker <cmbecker69@gmx.de>
Thu, 16 Jul 2020 14:08:07 +0000 (16:08 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Thu, 16 Jul 2020 14:08:07 +0000 (16:08 +0200)
* PHP-7.4:
  Enable further tests on Windows

1  2 
ext/standard/tests/general_functions/parse_ini_file.phpt
ext/standard/tests/network/tcp6loop.phpt
ext/standard/tests/network/udp6loop.phpt
ext/standard/tests/strings/bug24098.phpt

index 16d2f7720e5d41559da3171dff20b1fb42f9e28b,b33571368fc1f6444bab93de5f0634f5ac8920ac..5ae998cf9c9e262f0f39e5e4e741b7684985a82c
@@@ -1,15 -1,13 +1,13 @@@
  --TEST--
  Bug #24098 (pathinfo() crash)
- --SKIPIF--
- <?php if (DIRECTORY_SEPARATOR == '\\') die("skip directory separator won't match expected output"); ?>
  --FILE--
  <?php
 -      var_dump(pathinfo("/dsds.asa"));
 +    var_dump(pathinfo("/dsds.asa"));
  ?>
- --EXPECT--
+ --EXPECTF--
  array(4) {
    ["dirname"]=>
-   string(1) "/"
+   string(1) "%e"
    ["basename"]=>
    string(8) "dsds.asa"
    ["extension"]=>