diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-06-09 17:12:25 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-06-09 17:12:25 -0700 |
| commit | 1346c3df42a281226ec9f771438329594bf45f93 (patch) | |
| tree | eac18360ad58e58a4d17f9bb4bb595d58348339a | |
| parent | 8b1919ed73e89faad682211f12369167581332b4 (diff) | |
| parent | 6b53b7cd84bfb127b774b3d2de2bf215efd6eac1 (diff) | |
| download | php-git-1346c3df42a281226ec9f771438329594bf45f93.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
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 |