diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2015-06-10 10:49:51 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2015-06-10 10:49:51 +0200 |
| commit | dbf30365aa15b9044d75b8f77db570bf8fdf2726 (patch) | |
| tree | e0b4481c39b2852b91037b38fa0ee5ec3776b52b /ext/dom/tests | |
| parent | 9cb8cb47975b044bbaafd2d12287ff52cdd3b0e9 (diff) | |
| parent | 5ff259ebb72c1f5cef45c235ca1a85b8e1523835 (diff) | |
| download | php-git-php-7.0.0alpha1.tar.gz | |
Merge remote-tracking branch 'origin/master' into PHP-7.0.0php-7.0.0alpha1
* origin/master:
add missing NEWS entries
add missing NEWS entries
Fixed bug #69646 (OS command injection vulnerability in escapeshellarg)
add NEWS
Fixed bug #68776
fix test
update NEWS
fix typo
Fix bug #69646 OS command injection vulnerability in escapeshellarg
Fix #69719 - more checks for nulls in paths
fix test description
Fixed Buf #68812 Unchecked return value.
Diffstat (limited to 'ext/dom/tests')
| -rw-r--r-- | ext/dom/tests/DOMDocument_loadHTMLfile_error2.phpt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/dom/tests/DOMDocument_loadHTMLfile_error2.phpt b/ext/dom/tests/DOMDocument_loadHTMLfile_error2.phpt index 75004e2a74..e0d0923642 100644 --- a/ext/dom/tests/DOMDocument_loadHTMLfile_error2.phpt +++ b/ext/dom/tests/DOMDocument_loadHTMLfile_error2.phpt @@ -15,9 +15,9 @@ $result = $doc->loadHTMLFile(""); assert('$result === false'); $doc = new DOMDocument(); $result = $doc->loadHTMLFile("text.html\0something"); -assert('$result === null'); +assert('$result === false'); ?> --EXPECTF-- %r(PHP ){0,1}%rWarning: DOMDocument::loadHTMLFile(): Empty string supplied as input %s -%r(PHP ){0,1}%rWarning: DOMDocument::loadHTMLFile() expects parameter 1 to be a valid path, string given %s +%r(PHP ){0,1}%rWarning: DOMDocument::loadHTMLFile(): Invalid file source %s |