cvs: php-src(PHP_5_2) /ext/spl/tests bug46115.phpt countable_class_basic1.phpt
| From: | Jani Taskinen | Date: | Sat, 01 Nov 2008 22:48:52 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/spl/tests bug46115.phpt countable_class_basic1.phpt | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-53824@lists.php.net to get a copy of this message | ||
jani Sat Nov 1 22:48:52 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/spl/tests bug46115.phpt countable_class_basic1.phpt
Log:
- Fix skip conditions
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/bug46115.phpt?r1=1.2.2.2&r2=1.2.2.3&diff_format=u
Index: php-src/ext/spl/tests/bug46115.phpt
diff -u php-src/ext/spl/tests/bug46115.phpt:1.2.2.2 php-src/ext/spl/tests/bug46115.phpt:1.2.2.3
--- php-src/ext/spl/tests/bug46115.phpt:1.2.2.2 Mon Oct 6 13:45:42 2008
+++ php-src/ext/spl/tests/bug46115.phpt Sat Nov 1 22:48:52 2008
@@ -1,5 +1,7 @@
--TEST--
Bug #46115 (Memory leak when calling a method using Reflection)
+--SKIPIF--
+<?php if (!extension_loaded('reflection')) die('skip Reflection extension not
loaded'); ?>
--FILE--
<?php
$h = new RecursiveArrayIterator(array());
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/countable_class_basic1.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/spl/tests/countable_class_basic1.phpt
diff -u php-src/ext/spl/tests/countable_class_basic1.phpt:1.1.2.1
php-src/ext/spl/tests/countable_class_basic1.phpt:1.1.2.2
--- php-src/ext/spl/tests/countable_class_basic1.phpt:1.1.2.1 Fri Oct 17 14:26:36 2008
+++ php-src/ext/spl/tests/countable_class_basic1.phpt Sat Nov 1 22:48:52 2008
@@ -1,13 +1,7 @@
--TEST--
SPL: Test shape of interface Countable.
--SKIPIF--
-<?php
-// Skip the test case if Standard PHP Library(spl) is not installed
- if( !extension_loaded('spl'))
- {
- die('skip spl is not installed');
- }
-?>
+<?php if (!extension_loaded('spl') || !extension_loaded('reflection')) print
'skip'; ?>
--FILE--
<?php
ReflectionClass::export('Countable');