diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-06-09 22:11:20 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-06-09 22:11:55 -0700 |
| commit | 3a857b95cea35987aaef93fb08e6e9cbd6c6f483 (patch) | |
| tree | e0f8b44e2b65c8c930dec7be8676aa0c00fcb64c /ext/dom/tests | |
| parent | 2fa226f60dd6f0911795dcc2dc8011f78e7655d9 (diff) | |
| parent | f1ffb4b1ade5dc995d7815786ca7956fff34b440 (diff) | |
| download | php-git-PHP-5.4.42.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.4.42php-5.4.42PHP-5.4.42
* PHP-5.4:
add NEWS
Fixed bug #68776
fix test
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 |