sterling Thu Jul 3 03:18:41 2003 EDT
Modified files:
/php-src/tests/classes bug24399.phpt factory_and_singleton_002.phpt
factory_and_singleton_005.phpt
factory_and_singleton_006.phpt
Log:
fix these tests
Index: php-src/tests/classes/bug24399.phpt
diff -u php-src/tests/classes/bug24399.phpt:1.1 php-src/tests/classes/bug24399.phpt:1.2
--- php-src/tests/classes/bug24399.phpt:1.1 Mon Jun 30 15:40:48 2003
+++ php-src/tests/classes/bug24399.phpt Thu Jul 3 03:18:41 2003
@@ -1,7 +1,5 @@
--TEST--
Bug #24399: is_subclass_of() crashes when parent class doesn't exist.
---SKIPIF--
-<?php if (version_compare(zend_version(), '2.0.0-dev', '<')) die('skip ZendEngine 2
needed'); ?>
--FILE--
<?php
class dooh {
Index: php-src/tests/classes/factory_and_singleton_002.phpt
diff -u php-src/tests/classes/factory_and_singleton_002.phpt:1.2
php-src/tests/classes/factory_and_singleton_002.phpt:1.3
--- php-src/tests/classes/factory_and_singleton_002.phpt:1.2 Wed Jul 2 13:13:27
2003
+++ php-src/tests/classes/factory_and_singleton_002.phpt Thu Jul 3 03:18:41
2003
@@ -19,7 +19,7 @@
}
}
- protected function __construct($x) {
+ function __construct($x) {
test::$cnt++;
$this->x = $x;
}
@@ -28,7 +28,7 @@
test::$test = NULL;
}
- protected function __destruct() {
+ function __destruct() {
test::$cnt--;
}
Index: php-src/tests/classes/factory_and_singleton_005.phpt
diff -u php-src/tests/classes/factory_and_singleton_005.phpt:1.1
php-src/tests/classes/factory_and_singleton_005.phpt:1.2
--- php-src/tests/classes/factory_and_singleton_005.phpt:1.1 Tue Jul 1 15:12:23
2003
+++ php-src/tests/classes/factory_and_singleton_005.phpt Thu Jul 3 03:18:41
2003
@@ -16,4 +16,5 @@
echo "Done\n";
?>
--EXPECTF--
-Fatal error: Call to protected destructor from context ''
%sfactory_and_singleton_005.php on line %d
+Warning: Call to protected destructor from context '' in
%sfactory_and_singleton_005.php on line %d
+Done
Index: php-src/tests/classes/factory_and_singleton_006.phpt
diff -u php-src/tests/classes/factory_and_singleton_006.phpt:1.1
php-src/tests/classes/factory_and_singleton_006.phpt:1.2
--- php-src/tests/classes/factory_and_singleton_006.phpt:1.1 Tue Jul 1 15:12:23
2003
+++ php-src/tests/classes/factory_and_singleton_006.phpt Thu Jul 3 03:18:41
2003
@@ -16,4 +16,5 @@
echo "Done\n";
?>
--EXPECTF--
-Fatal error: Call to private destructor from context ''
%sfactory_and_singleton_006.php on line %d
+Warning: Call to private destructor from context '' in
%sfactory_and_singleton_006.php on line %d
+Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
