diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-08-24 00:09:31 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-08-24 00:09:31 +0200 |
| commit | 86966a092b6e8dd27d3851ba0c19d52523d09b58 (patch) | |
| tree | 7ee82c4411faed3813d14422ad72c5d9fa5b82db /ext | |
| parent | ce9bdae33f101ff85c08d32ce5c2c6502a451d62 (diff) | |
| parent | a90d05a4304a2ef832afe059dc19c7f14ca86f58 (diff) | |
| download | php-git-86966a092b6e8dd27d3851ba0c19d52523d09b58.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
this test depends on the simplexml ext, not just on xml
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/simplexml/tests/bug62328.phpt (renamed from ext/xml/tests/bug62328.phpt) | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ext/xml/tests/bug62328.phpt b/ext/simplexml/tests/bug62328.phpt index e4c3c59d37..a6e60e488c 100644 --- a/ext/xml/tests/bug62328.phpt +++ b/ext/simplexml/tests/bug62328.phpt @@ -1,9 +1,7 @@ --TEST-- Bug #62328 (implementing __toString and a cast to string fails) --SKIPIF-- -<?php -require_once("skipif.inc"); -?> +<?php if (!extension_loaded("simplexml")) print "skip"; ?> --FILE-- <?php class UberSimpleXML extends SimpleXMLElement { |