diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-06-09 17:12:11 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-06-09 17:12:11 -0700 |
| commit | 6b53b7cd84bfb127b774b3d2de2bf215efd6eac1 (patch) | |
| tree | bba6164d36ac596574feea9a1723650042a65757 | |
| parent | 4e2fb470929ab13101c945e76e2ac397a730ba5a (diff) | |
| parent | eee8b6c33fc968ef8c496db8fb54e8c9d9d5a8f9 (diff) | |
| download | php-git-6b53b7cd84bfb127b774b3d2de2bf215efd6eac1.tar.gz | |
Merge branch 'PHp-5.4' into PHP-5.5
* PHp-5.4:
fix test
update NEWS
| -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 |