diff options
-rw-r--r-- | tests/classes/bug24399.phpt | 2 | ||||
-rwxr-xr-x | tests/classes/factory_and_singleton_002.phpt | 4 | ||||
-rwxr-xr-x | tests/classes/factory_and_singleton_005.phpt | 3 | ||||
-rwxr-xr-x | tests/classes/factory_and_singleton_006.phpt | 3 |
4 files changed, 6 insertions, 6 deletions
diff --git a/tests/classes/bug24399.phpt b/tests/classes/bug24399.phpt index f0cf9edb7b..230a865ad9 100644 --- a/tests/classes/bug24399.phpt +++ b/tests/classes/bug24399.phpt @@ -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 { diff --git a/tests/classes/factory_and_singleton_002.phpt b/tests/classes/factory_and_singleton_002.phpt index 0c63aed900..8b85a048e0 100755 --- a/tests/classes/factory_and_singleton_002.phpt +++ b/tests/classes/factory_and_singleton_002.phpt @@ -19,7 +19,7 @@ class test { } } - protected function __construct($x) { + function __construct($x) { test::$cnt++; $this->x = $x; } @@ -28,7 +28,7 @@ class test { test::$test = NULL; } - protected function __destruct() { + function __destruct() { test::$cnt--; } diff --git a/tests/classes/factory_and_singleton_005.phpt b/tests/classes/factory_and_singleton_005.phpt index 93f94c1422..fc000b87e2 100755 --- a/tests/classes/factory_and_singleton_005.phpt +++ b/tests/classes/factory_and_singleton_005.phpt @@ -16,4 +16,5 @@ $obj = NULL; 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 diff --git a/tests/classes/factory_and_singleton_006.phpt b/tests/classes/factory_and_singleton_006.phpt index 11655d8ade..5b54b9f0fa 100755 --- a/tests/classes/factory_and_singleton_006.phpt +++ b/tests/classes/factory_and_singleton_006.phpt @@ -16,4 +16,5 @@ $obj = NULL; 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 |