Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix tests broken by 633f898f15

ext/reflection/tests/ReflectionClass_getStaticPropertyValue_001_2_4.phpt

@@ -56,6 +56,6 @@ string(13) "default value"
 
 Fatal error: Uncaught exception 'ReflectionException' with message 'Class A does not have a property named ' in %sReflectionClass_getStaticPropertyValue_001_2_4.php:%d
 Stack trace:
-#0 %sReflectionClass_getStaticPropertyValue_001_2_4.php(%d): ReflectionClass->getStaticPropertyValue('?A?privateOverr...')
+#0 %sReflectionClass_getStaticPropertyValue_001_2_4.php(%d): ReflectionClass->getStaticPropertyValue('\x00A\x00privateOverr...')
 #1 {main}
   thrown in %sReflectionClass_getStaticPropertyValue_001_2_4.php on line %d

ext/reflection/tests/ReflectionClass_setStaticPropertyValue_001_2_4.phpt

@@ -56,6 +56,6 @@ Set static values in A:
 
 Fatal error: Uncaught exception 'ReflectionException' with message 'Class A does not have a property named ' in %sReflectionClass_setStaticPropertyValue_001_2_4.php:%d
 Stack trace:
-#0 %sReflectionClass_setStaticPropertyValue_001_2_4.php(%d): ReflectionClass->setStaticPropertyValue('?A?privateOverr...', 'new value 1')
+#0 %sReflectionClass_setStaticPropertyValue_001_2_4.php(%d): ReflectionClass->setStaticPropertyValue('\x00A\x00privateOverr...', 'new value 1')
 #1 {main}
   thrown in %sReflectionClass_setStaticPropertyValue_001_2_4.php on line %d

ext/spl/tests/bug54291.phpt

@@ -7,7 +7,7 @@ $dir->isFile();
 --EXPECTF--
 Fatal error: Uncaught exception 'UnexpectedValueException' with message 'Failed to open directory ""' in %s:%d
 Stack trace:
-#0 %s(%d): DirectoryIterator->__construct('?/abc')
+#0 %s(%d): DirectoryIterator->__construct('\x00/abc')
 #1 {main}
   thrown in %s on line %d