diff options
| author | Anatol Belski <ab@php.net> | 2014-12-13 19:43:45 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-13 19:43:45 +0100 |
| commit | bb66f385d09e7e55390e9f57fcbca08f6b43ff91 (patch) | |
| tree | 54defb44e55c1ebc0afa15aa60758d87a4b9ce3b /ext/simplexml | |
| parent | dfb18b1188492efa48ade07029172c5535f65f93 (diff) | |
| parent | 0ea0b591d79ae0ee18d33533a5c701330836ff6b (diff) | |
| download | php-git-bb66f385d09e7e55390e9f57fcbca08f6b43ff91.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (37 commits)
NEWS
NEWS
Fix bug #68601 buffer read overflow in gd_gif_in.c
Fixed compilation warnings
Removed unnecessary checks
pcntl_signal_dispatch: Speed up by preventing system calls when unnecessary
Merged PR #911.
Removed ZEND_ACC_FINAL_CLASS which is unnecessary. This also fixed some currently defined classes as final which were just not being considered as such before.
Updated NEWS
Updated NEWS
Updated NEWS
Fix bug #68532: convert.base64-encode omits padding bytes
Updated NEWS
Updated NEWS
Updated NEWS
Fixed Bug #65576 (Constructor from trait conflicts with inherited constructor)
Updated NEWS
Updated NEWS
Fix MySQLi tests
Fixed gd test
...
Diffstat (limited to 'ext/simplexml')
| -rw-r--r-- | ext/simplexml/tests/SimpleXMLElement_xpath.phpt | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/ext/simplexml/tests/SimpleXMLElement_xpath.phpt b/ext/simplexml/tests/SimpleXMLElement_xpath.phpt index 4a613c2e51..afdf95b339 100644 --- a/ext/simplexml/tests/SimpleXMLElement_xpath.phpt +++ b/ext/simplexml/tests/SimpleXMLElement_xpath.phpt @@ -1,8 +1,14 @@ --TEST-- Testing xpath() with invalid XML +--SKIPIF-- +<?php PHP_INT_SIZE == 4 or die("skip - 32-bit only"); --FILE-- <?php -$xml = @simplexml_load_string("XXXXXXX^",$x,0x6000000000000001); +$xml = simplexml_load_string("XXXXXXX^",$x,0x6000000000000001); var_dump($xml->xpath("BBBB")); ---EXPECT-- -bool(false) +--EXPECTF-- +Notice: Undefined variable: x in %s on line %d + +Warning: simplexml_load_string() expects parameter 3 to be long, double given in %s on line %d + +Catchable fatal error: Call to a member function xpath() on null in %s on line %d |