From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Thu, 16 Jul 2020 14:08:07 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7e357f470d11aea776947ff4a7f66d1aee6dd503;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Enable further tests on Windows
---

7e357f470d11aea776947ff4a7f66d1aee6dd503
diff --cc ext/standard/tests/strings/bug24098.phpt
index 16d2f7720e,b33571368f..5ae998cf9c
--- a/ext/standard/tests/strings/bug24098.phpt
+++ b/ext/standard/tests/strings/bug24098.phpt
@@@ -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"]=>