diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-08-24 00:18:51 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-08-24 00:18:51 +0200 |
| commit | 50b20e75ffd8623fd75fd7be55029b1c100f918e (patch) | |
| tree | 7dc05ff21d2b7c3af7f1820248227c64aef65eb6 | |
| parent | 86674b5837bffe4486714f9661620020ee498f3b (diff) | |
| parent | 86966a092b6e8dd27d3851ba0c19d52523d09b58 (diff) | |
| download | php-git-50b20e75ffd8623fd75fd7be55029b1c100f918e.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
this test depends on the simplexml ext, not just on xml
Conflicts:
ext/simplexml/tests/bug62328.phpt
| -rw-r--r-- | ext/simplexml/tests/bug62328.phpt (renamed from ext/xml/tests/bug62328.phpt) | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ext/xml/tests/bug62328.phpt b/ext/simplexml/tests/bug62328.phpt index c59a4aac0c..a6e60e488c 100644 --- a/ext/xml/tests/bug62328.phpt +++ b/ext/simplexml/tests/bug62328.phpt @@ -1,11 +1,7 @@ --TEST-- Bug #62328 (implementing __toString and a cast to string fails) --SKIPIF-- -<?php -require_once("skipif.inc"); -if (!extension_loaded("SimpleXML")) - die("skip: SimpleXML extension not available"); -?> +<?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- <?php class UberSimpleXML extends SimpleXMLElement { |