diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-08-24 00:09:00 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-08-24 00:09:00 +0200 |
| commit | a90d05a4304a2ef832afe059dc19c7f14ca86f58 (patch) | |
| tree | c51c8488d1f5d763c9aa51aa85132ab7f31c2109 | |
| parent | c4fb183b9fd6fecf7dfb8df309bfa34ff1ec2e53 (diff) | |
| parent | cb41a7bad1350f1c9bd162abf52eea128a395e0a (diff) | |
| download | php-git-a90d05a4304a2ef832afe059dc19c7f14ca86f58.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
this test depends on the simplexml ext, not just on xml
| -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 { |