Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed tests

Author: dstogov

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===

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===

ext/standard/tests/class_object/class_exists_variation_001.phpt

@@ -100,27 +100,22 @@ 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 
 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)
 

ext/standard/tests/class_object/trait_exists_variation_001.phpt

@@ -100,27 +100,22 @@ 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 
 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)