refine some error messages

Author: withinboredom

Zend/zend_vm_def.h

@@ -1812,7 +1812,7 @@ ZEND_VM_HANDLER(210, ZEND_FETCH_INNER_CLASS, CONST|TMPVAR|UNUSED, CONST, CACHE_S
 		zval *outer_class_zv = RT_CONSTANT(opline, opline->op1);
 		outer_ce = zend_lookup_class(Z_STR_P(outer_class_zv));
 		if (!outer_ce) {
-			zend_error(E_ERROR, "Class '%s' not found", Z_STRVAL_P(outer_class_zv));
+			zend_error(E_ERROR, "Outer class '%s' not found for inner class %s:>%s", Z_STRVAL_P(outer_class_zv), Z_STRVAL_P(outer_class_zv), Z_STRVAL_P(RT_CONSTANT(opline, opline->op2)));
 			HANDLE_EXCEPTION();
 		}
 	} else if (OP1_TYPE == IS_UNUSED) {
@@ -1864,7 +1864,7 @@ ZEND_VM_HANDLER(210, ZEND_FETCH_INNER_CLASS, CONST|TMPVAR|UNUSED, CONST, CACHE_S
 
 	inner_ce = zend_lookup_class(full_class_name);
 	if (!inner_ce) {
-		zend_error(E_ERROR, "Class '%s' not found", ZSTR_VAL(full_class_name));
+		zend_error(E_ERROR, "Inner class '%s' not found in outer class %s", ZSTR_VAL(full_class_name), ZSTR_VAL(outer_ce->name));
 		HANDLE_EXCEPTION();
 	}
 
@@ -1874,15 +1874,15 @@ ZEND_VM_HANDLER(210, ZEND_FETCH_INNER_CLASS, CONST|TMPVAR|UNUSED, CONST, CACHE_S
 			if (scope != NULL && (inner_ce->required_scope == scope || scope->lexical_scope == inner_ce->required_scope)) {
 				// we are in the correct scope
 			} else {
-				zend_error(E_ERROR, "Class '%s' is private", ZSTR_VAL(full_class_name));
+				zend_error(E_ERROR, "Cannot access private inner class '%s'", ZSTR_VAL(full_class_name));
 				HANDLE_EXCEPTION();
 			}
 		} else {
 			// for protected classes, we check if the scope is an instance of the required scope
 			if (scope != NULL && (instanceof_function(scope, inner_ce->required_scope) || instanceof_function(scope->lexical_scope, inner_ce->required_scope))) {
 				// we are in the correct scope
 			} else {
-				zend_error(E_ERROR, "Class '%s' is protected", ZSTR_VAL(full_class_name));
+				zend_error(E_ERROR, "Cannot access protected inner class '%s'", ZSTR_VAL(full_class_name));
 				HANDLE_EXCEPTION();
 			}
 		}
@@ -4529,15 +4529,15 @@ ZEND_VM_COLD_CONST_HANDLER(124, ZEND_VERIFY_RETURN_TYPE, CONST|TMP|VAR|UNUSED|CV
 		if (Z_OBJCE_P(retval_ptr)->required_scope) {
 			if (EX(func)->common.fn_flags & ZEND_ACC_PUBLIC) {
 				if (Z_OBJCE_P(retval_ptr)->required_scope_absolute) {
-					zend_type_error("Method %s is public but returns a private class: %s", ZSTR_VAL(EX(func)->common.function_name), ZSTR_VAL(Z_OBJCE_P(retval_ptr)->name));
+					zend_type_error("Public method %s cannot return private class %s", ZSTR_VAL(EX(func)->common.function_name), ZSTR_VAL(Z_OBJCE_P(retval_ptr)->name));
 					HANDLE_EXCEPTION();
 				} else {
-					zend_type_error("Method %s is public but returns a protected class: %s", ZSTR_VAL(EX(func)->common.function_name), ZSTR_VAL(Z_OBJCE_P(retval_ptr)->name));
+					zend_type_error("Public method %s cannot return protected class %s", ZSTR_VAL(EX(func)->common.function_name), ZSTR_VAL(Z_OBJCE_P(retval_ptr)->name));
 					HANDLE_EXCEPTION();
 				}
 			} else if (EX(func)->common.fn_flags & ZEND_ACC_PROTECTED) {
 				if (Z_OBJCE_P(retval_ptr)->required_scope_absolute && Z_OBJCE_P(retval_ptr)->required_scope != EX(func)->common.scope) {
-					zend_type_error("Method %s is protected but returns a private class: %s", ZSTR_VAL(EX(func)->common.function_name), ZSTR_VAL(Z_OBJCE_P(retval_ptr)->name));
+					zend_type_error("Protected method %s cannot return private class %s", ZSTR_VAL(EX(func)->common.function_name), ZSTR_VAL(Z_OBJCE_P(retval_ptr)->name));
 					HANDLE_EXCEPTION();
 				}
 			}

Zend/zend_vm_execute.h

@@ -13,4 +13,4 @@ var_dump($line);
 --EXPECTF--
 autoload(inner_classes)
 
-Fatal error: Class 'inner_classes:>Line' is private in %s on line %d
+Fatal error: Cannot access private inner class 'inner_classes:>Line' in %s

tests/classes/inner_classes/autoload_002.phpt

@@ -0,0 +1,9 @@
+--TEST--
+no outer class
+--FILE--
+<?php
+
+new Outer:>Inner();
+?>
+--EXPECTF--
+Fatal error: Outer class 'Outer' not found for inner class Outer:>Inner in %s on line %d

tests/classes/inner_classes/errors_001.phpt

@@ -0,0 +1,12 @@
+--TEST--
+inner class not found
+--FILE--
+<?php
+
+class Outer {
+}
+
+new Outer:>Inner();
+?>
+--EXPECTF--
+Fatal error: Inner class 'Outer:>Inner' not found in outer class Outer in %s on line %d

tests/classes/inner_classes/errors_002.phpt

@@ -29,4 +29,4 @@ var_dump($outer->getInner());
 object(Outer:>Inner)#2 (0) {
 }
 
-Fatal error: Class 'Outer:>Inner' is private in %s on line %d
+Fatal error: Cannot access private inner class 'Outer:>Inner' in %s on line %d

tests/classes/inner_classes/return_types_002.phpt

@@ -26,7 +26,7 @@ var_dump(new Outer:>Inner());
 object(Outer:>Inner)#2 (0) {
 }
 
-Fatal error: Uncaught TypeError: Method getInner is public but returns a protected class: Outer:>Inner in %s:%d
+Fatal error: Uncaught TypeError: Public method getInner cannot return protected class Outer:>Inner in %s:%d
 Stack trace:
 #0 %s(%d): Foo->getInner()
 #1 {main}

tests/classes/inner_classes/return_types_003.phpt

@@ -19,7 +19,7 @@ var_dump($r);
 test($r);
 ?>
 --EXPECTF--
-Fatal error: Uncaught TypeError: Method getInner is public but returns a private class: Outer:>Inner in %s:%d
+Fatal error: Uncaught TypeError: Public method getInner cannot return private class Outer:>Inner in %s:%d
 Stack trace:
 #0 %s(%d): Outer::getInner()
 #1 {main}

tests/classes/inner_classes/return_types_004.phpt

@@ -19,7 +19,7 @@ var_dump($r);
 test($r);
 ?>
 --EXPECTF--
-Fatal error: Uncaught TypeError: Method getInner is public but returns a protected class: Outer:>Inner in %s:%d
+Fatal error: Uncaught TypeError: Public method getInner cannot return protected class Outer:>Inner in %s:%d
 Stack trace:
 #0 %s(%d): Outer::getInner()
 #1 {main}