summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2013-12-02 11:53:35 +0400
committerDmitry Stogov <dmitry@zend.com>2013-12-02 11:53:35 +0400
commitedbefd1d5c5c466f1e32461f3a7298b588038cb5 (patch)
tree3d0ce89b83bd4cf2a32a1c0c1c1b8e740b16ad68
parent9ed605892de40bf4b005198199139d5207957e6b (diff)
downloadphp-git-edbefd1d5c5c466f1e32461f3a7298b588038cb5.tar.gz
Fixed tests
-rw-r--r--ext/spl/tests/class_implements_variation.phpt10
-rw-r--r--ext/spl/tests/class_uses_variation.phpt10
-rw-r--r--ext/standard/tests/class_object/class_exists_variation_001.phpt5
-rw-r--r--ext/standard/tests/class_object/trait_exists_variation_001.phpt5
4 files changed, 10 insertions, 20 deletions
diff --git a/ext/spl/tests/class_implements_variation.phpt b/ext/spl/tests/class_implements_variation.phpt
index 52fdbcaf70..84a52ab2da 100644
--- a/ext/spl/tests/class_implements_variation.phpt
+++ b/ext/spl/tests/class_implements_variation.phpt
@@ -16,8 +16,8 @@ var_dump(class_implements(new fs));
var_dump(class_implements('fs'));
echo "\n--- testing autoload ---\n";
-var_dump(class_implements('non-existent'));
-var_dump(class_implements('non-existent2', false));
+var_dump(class_implements('non_existent'));
+var_dump(class_implements('non_existent2', false));
function __autoload($classname) {
@@ -35,11 +35,11 @@ array(0) {
}
--- testing autoload ---
-attempting to autoload non-existent
+attempting to autoload non_existent
-Warning: class_implements(): Class non-existent does not exist and could not be loaded in %s on line %d
+Warning: class_implements(): Class non_existent does not exist and could not be loaded in %s on line %d
bool(false)
-Warning: class_implements(): Class non-existent2 does not exist in %s on line %d
+Warning: class_implements(): Class non_existent2 does not exist in %s on line %d
bool(false)
===DONE===
diff --git a/ext/spl/tests/class_uses_variation.phpt b/ext/spl/tests/class_uses_variation.phpt
index 9c21521c60..1a13521eaf 100644
--- a/ext/spl/tests/class_uses_variation.phpt
+++ b/ext/spl/tests/class_uses_variation.phpt
@@ -16,8 +16,8 @@ var_dump(class_uses(new fs));
var_dump(class_uses('fs'));
echo "\n--- testing autoload ---\n";
-var_dump(class_uses('non-existent'));
-var_dump(class_uses('non-existent2', false));
+var_dump(class_uses('non_existent'));
+var_dump(class_uses('non_existent2', false));
function __autoload($classname) {
@@ -35,11 +35,11 @@ array(0) {
}
--- testing autoload ---
-attempting to autoload non-existent
+attempting to autoload non_existent
-Warning: class_uses(): Class non-existent does not exist and could not be loaded in %s on line %d
+Warning: class_uses(): Class non_existent does not exist and could not be loaded in %s on line %d
bool(false)
-Warning: class_uses(): Class non-existent2 does not exist in %s on line %d
+Warning: class_uses(): Class non_existent2 does not exist in %s on line %d
bool(false)
===DONE===
diff --git a/ext/standard/tests/class_object/class_exists_variation_001.phpt b/ext/standard/tests/class_object/class_exists_variation_001.phpt
index 52a3584763..5f51b4bd93 100644
--- a/ext/standard/tests/class_object/class_exists_variation_001.phpt
+++ b/ext/standard/tests/class_object/class_exists_variation_001.phpt
@@ -100,15 +100,12 @@ In __autoload(12345)
bool(false)
Arg value -2345
-In __autoload(-2345)
bool(false)
Arg value 10.5
-In __autoload(10.5)
bool(false)
Arg value -10.5
-In __autoload(-10.5)
bool(false)
Arg value 101234567000
@@ -116,11 +113,9 @@ In __autoload(101234567000)
bool(false)
Arg value 1.07654321E-9
-In __autoload(1.07654321E-9)
bool(false)
Arg value 0.5
-In __autoload(0.5)
bool(false)
Error: 8 - Array to string conversion, %sclass_exists_variation_001.php(%d)
diff --git a/ext/standard/tests/class_object/trait_exists_variation_001.phpt b/ext/standard/tests/class_object/trait_exists_variation_001.phpt
index e7fa4afd1e..81df711cfa 100644
--- a/ext/standard/tests/class_object/trait_exists_variation_001.phpt
+++ b/ext/standard/tests/class_object/trait_exists_variation_001.phpt
@@ -100,15 +100,12 @@ In __autoload(12345)
bool(false)
Arg value -2345
-In __autoload(-2345)
bool(false)
Arg value 10.5
-In __autoload(10.5)
bool(false)
Arg value -10.5
-In __autoload(-10.5)
bool(false)
Arg value 101234567000
@@ -116,11 +113,9 @@ In __autoload(101234567000)
bool(false)
Arg value 1.07654321E-9
-In __autoload(1.07654321E-9)
bool(false)
Arg value 0.5
-In __autoload(0.5)
bool(false)
Error: 8 - Array to string conversion, %strait_exists_variation_001.php(%d)