diff options
author | Aaron Piotrowski <aaron@trowski.com> | 2015-05-17 16:15:35 -0500 |
---|---|---|
committer | Aaron Piotrowski <aaron@trowski.com> | 2015-05-17 16:15:35 -0500 |
commit | fb7206e452008f72f8bf185ca658a9c306de23b6 (patch) | |
tree | b454c6bb6439dbb605b15c11825df2e47966b5ef /ext/simplexml | |
parent | 0eba6f597aecf5febcdf8468fb80550d05643b4b (diff) | |
parent | 440481fb3e15d78d0d92432c3adba9067989f43a (diff) | |
download | php-git-fb7206e452008f72f8bf185ca658a9c306de23b6.tar.gz |
Merge branch 'master' into throwable-interface
Diffstat (limited to 'ext/simplexml')
-rw-r--r-- | ext/simplexml/tests/SimpleXMLElement_xpath.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/simplexml/tests/SimpleXMLElement_xpath.phpt b/ext/simplexml/tests/SimpleXMLElement_xpath.phpt index d32be19208..7926ceb6e1 100644 --- a/ext/simplexml/tests/SimpleXMLElement_xpath.phpt +++ b/ext/simplexml/tests/SimpleXMLElement_xpath.phpt @@ -11,7 +11,7 @@ Notice: Undefined variable: x in %s on line %d Warning: simplexml_load_string() expects parameter 3 to be integer, float given in %s on line %d -Fatal error: Uncaught exception 'Error' with message 'Call to a member function xpath() on null' in %s:%d +Fatal error: Uncaught EngineException: Call to a member function xpath() on null in %s:%d Stack trace: #0 {main} thrown in %s on line %d |