Address code review comments

Author: kocsismate

Zend/tests/018.phpt

@@ -18,7 +18,7 @@ var_dump(constant("TEST_CONST2"));
 echo "Done\n";
 ?>
 --EXPECT--
-Undefined constant 
+Undefined constant ""
 int(1)
 string(4) "test"
 Done

Zend/tests/037.phpt

@@ -16,7 +16,7 @@ var_dump($x::$x);
 --EXPECTF--
 int(1)
 
-Fatal error: Uncaught Error: Access to undeclared static property: Closure::$x in %s:%d
+Fatal error: Uncaught Error: Access to undeclared static property "Closure::$x" in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d

Zend/tests/access_modifiers_010.phpt

@@ -28,7 +28,7 @@ new c;
 
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Call to private method d::test2() from context "a" in %s:%d
+Fatal error: Uncaught Error: Call to private method d::test2() from scope a in %s:%d
 Stack trace:
 #0 %s(%d): a->test()
 #1 %s(%d): c->__construct()

Zend/tests/attributes/003_ast_nodes.phpt

@@ -104,6 +104,5 @@ array(1) {
 }
 
 int(1)
-string(30) "Class 'MissingClass' not found"
-string(30) "Class 'MissingClass' not found"
-
+string(30) "Class "MissingClass" not found"
+string(30) "Class "MissingClass" not found"

Zend/tests/attributes/005_objects.phpt

@@ -108,13 +108,13 @@ string(7) "ERROR 2"
 string(74) "A1::__construct(): Argument #1 ($name) must be of type string, array given"
 
 string(7) "ERROR 3"
-string(30) "Attribute class 'A2' not found"
+string(30) "Attribute class "A2" not found"
 
 string(7) "ERROR 4"
-string(50) "Attribute constructor of class 'A3' must be public"
+string(48) "Attribute constructor of class A3 must be public"
 
 string(7) "ERROR 5"
-string(71) "Attribute class 'A4' does not have a constructor, cannot pass arguments"
+string(69) "Attribute class A4 does not have a constructor, cannot pass arguments"
 
 string(7) "ERROR 6"
-string(78) "Attempting to use class 'A5' as attribute that does not have <<PhpAttribute>>."
+string(76) "Attempting to use class A5 as attribute that does not have <<PhpAttribute>>."

Zend/tests/attributes/006_filter.phpt

@@ -109,4 +109,4 @@ Array
 string(7) "ERROR 1"
 string(103) "ReflectionFunctionAbstract::getAttributes(): Argument #2 ($flags) must be a valid attribute filter flag"
 string(7) "ERROR 2"
-string(34) "Class 'SomeMissingClass' not found"
+string(34) "Class "SomeMissingClass" not found"

Zend/tests/attributes/013_class_scope.phpt

@@ -109,7 +109,7 @@ Array
     [1] => bar
 )
 string(7) "ERROR 1"
-string(34) "Undefined class constant self::FOO"
+string(28) "Undefined constant self::FOO"
 
 bool(true)
 string(3) "bar"

Zend/tests/bug30519.phpt

@@ -6,7 +6,7 @@ class test implements a {
 }
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Interface 'a' not found in %s:%d
+Fatal error: Uncaught Error: Interface "a" not found in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d

Zend/tests/bug30922.phpt

@@ -10,7 +10,7 @@ var_dump($a instanceOf A);
 echo "ok\n";
 ?>
 --EXPECTF--
-Fatal error: Uncaught Error: Interface 'RecurisiveFooFar' not found in %s:%d
+Fatal error: Uncaught Error: Interface "RecurisiveFooFar" not found in %s:%d
 Stack trace:
 #0 {main}
   thrown in %s on line %d

Zend/tests/bug31102.phpt

@@ -43,7 +43,7 @@ Caught: Test1::__construct
 Caught: {closure}
 {closure}(Test3,3)
 
-Fatal error: Uncaught Error: Class 'Test3' not found in %sbug31102.php(%d) : eval()'d code:1
+Fatal error: Uncaught Error: Class "Test3" not found in %s:%d
 Stack trace:
 #0 %s(%d): eval()
 #1 {main}