Improve error message for invalid property read

kocsismate · kocsismate · commit 61f399a13927 · 2020-04-26T14:46:40.000+02:00
diff --git a/Zend/tests/024.phpt b/Zend/tests/024.phpt
@@ -41,17 +41,17 @@ NULL
 Warning: Undefined variable $b in %s on line %d
 int(1)
 
-Warning: Trying to get property '1' of non-object in %s on line %d
+Warning: Access to property '1' on int in %s on line %d
 NULL
 
-Warning: Trying to get property '1' of non-object in %s on line %d
+Warning: Access to property '1' on int in %s on line %d
 NULL
 
 Warning: Undefined variable $c in %s on line %d
 
 Warning: Trying to access array offset on value of type null in %s on line %d
 
-Warning: Trying to get property '1' of non-object in %s on line %d
+Warning: Access to property '1' on int in %s on line %d
 
-Warning: Trying to get property '' of non-object in %s on line %d
+Warning: Access to property '' on null in %s on line %d
 NULL
diff --git a/Zend/tests/026.phpt b/Zend/tests/026.phpt
@@ -22,7 +22,7 @@ print "ok\n";
 
 ?>
 --EXPECTF--
-Warning: Trying to get property 'a' of non-object in %s on line %d
+Warning: Access to property 'a' on null in %s on line %d
 ok
 Attempt to assign property 'a' of non-object
 ok
diff --git a/Zend/tests/033.phpt b/Zend/tests/033.phpt
@@ -61,6 +61,6 @@ Warning: Trying to access array offset on value of type null in %s on line %d
 
 Warning: Trying to access array offset on value of type null in %s on line %d
 
-Warning: Trying to get property 'foo' of non-object in %s on line %d
+Warning: Access to property 'foo' on null in %s on line %d
 Attempt to assign property 'foo' of non-object
 Attempt to assign property 'bar' of non-object
diff --git a/Zend/tests/bug31098.phpt b/Zend/tests/bug31098.phpt
@@ -44,7 +44,7 @@ ok
 ok
 ok
 
-Warning: Trying to get property 'wrong' of non-object in %s on line %d
+Warning: Access to property 'wrong' on string in %s on line %d
 ok
 
 Warning: Illegal string offset 'wrong' in %s on line %d
diff --git a/Zend/tests/bug44660.phpt b/Zend/tests/bug44660.phpt
@@ -48,7 +48,7 @@ var_dump($a);
 ?>
 --EXPECTF--
 --> read access: 
-Warning: Trying to get property 'p' of non-object in %s on line %d
+Warning: Access to property 'p' on bool in %s on line %d
 
 --> direct assignment:
 Attempt to assign property 'p' of non-object
diff --git a/Zend/tests/bug47109.phpt b/Zend/tests/bug47109.phpt
@@ -7,4 +7,4 @@ $a->{"a"."b"};
 --EXPECTF--
 Warning: Undefined variable $a in %s on line %d
 
-Warning: Trying to get property 'ab' of non-object in %s on line %d
+Warning: Access to property 'ab' on null in %s on line %d
diff --git a/Zend/tests/bug76667.phpt b/Zend/tests/bug76667.phpt
@@ -13,26 +13,26 @@ class T {
     {
         return $this->$v /= 0;
     }
-};
+}
 
 $x = new T;
 $x->x = 1;
 ?>
 --EXPECTF--
 Warning: Undefined variable $undefined in %s on line %d
 
-Warning: Trying to get property '1' of non-object in %s on line %d
+Warning: Access to property '1' on null in %s on line %d
 
 Warning: Division by zero in %sbug76667.php on line %d
 
 Warning: Undefined variable $undefined in %s on line %d
 
-Warning: Trying to get property 'NAN' of non-object in %s on line %d
+Warning: Access to property 'NAN' on null in %s on line %d
 
 Warning: Division by zero in %sbug76667.php on line %d
 
 Warning: Undefined variable $undefined in %s on line %d
 
-Warning: Trying to get property 'NAN' of non-object in %s on line %d
+Warning: Access to property 'NAN' on null in %s on line %d
 
 Warning: Division by zero in %sbug76667.php on line %d
diff --git a/Zend/tests/dereference_014.phpt b/Zend/tests/dereference_014.phpt
@@ -29,10 +29,10 @@ var_dump($h);
 --EXPECTF--
 Warning: Trying to access array offset on value of type null in %s on line %d
 
-Warning: Trying to get property 'a' of non-object in %s on line %d
+Warning: Access to property 'a' on null in %s on line %d
 NULL
 
 Warning: Trying to access array offset on value of type null in %s on line %d
 
-Warning: Trying to get property 'b' of non-object in %s on line %d
+Warning: Access to property 'b' on null in %s on line %d
 NULL
diff --git a/Zend/tests/isset_003.phpt b/Zend/tests/isset_003.phpt
@@ -35,7 +35,7 @@ Warning: Undefined variable $d in %s on line %d
 
 Warning: Trying to access array offset on value of type null in %s on line %d
 
-Warning: Trying to get property '' of non-object in %s on line %d
+Warning: Access to property '' on string in %s on line %d
 bool(false)
 bool(true)
 bool(false)
diff --git a/Zend/tests/varSyntax/encapsed_string_deref.phpt b/Zend/tests/varSyntax/encapsed_string_deref.phpt
@@ -22,7 +22,7 @@ var_dump("foo$bar"());
 --EXPECTF--
 string(1) "f"
 
-Warning: Trying to get property 'prop' of non-object in %s on line %d
+Warning: Access to property 'prop' on string in %s on line %d
 NULL
 Call to a member function method() on string
 int(42)
diff --git a/Zend/tests/varSyntax/magic_const_deref.phpt b/Zend/tests/varSyntax/magic_const_deref.phpt
@@ -19,6 +19,6 @@ test();
 --EXPECTF--
 string(1) "t"
 
-Warning: Trying to get property 'prop' of non-object in %s on line %d
+Warning: Access to property 'prop' on string in %s on line %d
 NULL
 Call to a member function method() on string
diff --git a/Zend/tests/varSyntax/propertyOfStringError.phpt b/Zend/tests/varSyntax/propertyOfStringError.phpt
@@ -7,4 +7,4 @@ Cannot take property of a string
 
 ?>
 --EXPECTF--
-Warning: Trying to get property 'bar' of non-object in %s on line %d
+Warning: Access to property 'bar' on string in %s on line %d
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -1494,11 +1494,13 @@ static zend_never_inline ZEND_COLD void zend_wrong_string_offset(EXECUTE_DATA_D)
 	zend_throw_error(NULL, "%s", msg);
 }
 
-static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_wrong_property_read(zval *property)
+static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_wrong_property_read(zval *object, zval *property)
 {
 	zend_string *tmp_property_name;
 	zend_string *property_name = zval_get_tmp_string(property, &tmp_property_name);
-	zend_error(E_WARNING, "Trying to get property '%s' of non-object", ZSTR_VAL(property_name));
+	zend_error(E_WARNING, "Access to property '%s' on %s",
+		ZSTR_VAL(property_name), zend_get_type_by_const(Z_TYPE_P(object) == IS_UNDEF ? IS_NULL : Z_TYPE_P(object))
+	);
 	zend_tmp_string_release(tmp_property_name);
 }
 
@@ -1919,7 +1921,9 @@ static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_undefined_method(cons
 
 static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_invalid_method_call(zval *object, zval *function_name)
 {
-	zend_throw_error(NULL, "Call to a member function %s() on %s", Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object)));
+	zend_throw_error(NULL, "Call to a member function %s() on %s",
+		Z_STRVAL_P(function_name), zend_get_type_by_const(Z_TYPE_P(object) == IS_UNDEF ? IS_NULL : Z_TYPE_P(object))
+	);
 }
 
 static zend_never_inline ZEND_COLD void ZEND_FASTCALL zend_non_static_method_call(const zend_function *fbc)
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -2014,7 +2014,7 @@ ZEND_VM_HOT_OBJ_HANDLER(82, ZEND_FETCH_OBJ_R, CONST|TMPVAR|UNUSED|THIS|CV, CONST
 			if (OP2_TYPE == IS_CV && UNEXPECTED(Z_TYPE_P(offset) == IS_UNDEF)) {
 				ZVAL_UNDEFINED_OP2();
 			}
-			zend_wrong_property_read(offset);
+			zend_wrong_property_read(container, offset);
 			ZVAL_NULL(EX_VAR(opline->result.var));
 			ZEND_VM_C_GOTO(fetch_obj_r_finish);
 		} while (0);
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
@@ -5220,7 +5220,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_
 			if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(offset) == IS_UNDEF)) {
 				ZVAL_UNDEFINED_OP2();
 			}
-			zend_wrong_property_read(offset);
+			zend_wrong_property_read(container, offset);
 			ZVAL_NULL(EX_VAR(opline->result.var));
 			goto fetch_obj_r_finish;
 		} while (0);
@@ -7395,7 +7395,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_
 			if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(offset) == IS_UNDEF)) {
 				ZVAL_UNDEFINED_OP2();
 			}
-			zend_wrong_property_read(offset);
+			zend_wrong_property_read(container, offset);
 			ZVAL_NULL(EX_VAR(opline->result.var));
 			goto fetch_obj_r_finish;
 		} while (0);
@@ -9651,7 +9651,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_
 			if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(offset) == IS_UNDEF)) {
 				ZVAL_UNDEFINED_OP2();
 			}
-			zend_wrong_property_read(offset);
+			zend_wrong_property_read(container, offset);
 			ZVAL_NULL(EX_VAR(opline->result.var));
 			goto fetch_obj_r_finish;
 		} while (0);
@@ -13971,7 +13971,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_TMPVAR_CONST_
 			if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(offset) == IS_UNDEF)) {
 				ZVAL_UNDEFINED_OP2();
 			}
-			zend_wrong_property_read(offset);
+			zend_wrong_property_read(container, offset);
 			ZVAL_NULL(EX_VAR(opline->result.var));
 			goto fetch_obj_r_finish;
 		} while (0);
@@ -15352,7 +15352,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_TMPVAR_TMPVAR
 			if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(offset) == IS_UNDEF)) {
 				ZVAL_UNDEFINED_OP2();
 			}
-			zend_wrong_property_read(offset);
+			zend_wrong_property_read(container, offset);
 			ZVAL_NULL(EX_VAR(opline->result.var));
 			goto fetch_obj_r_finish;
 		} while (0);
@@ -16627,7 +16627,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_TMPVAR_CV_HAN
 			if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(offset) == IS_UNDEF)) {
 				ZVAL_UNDEFINED_OP2();
 			}
-			zend_wrong_property_read(offset);
+			zend_wrong_property_read(container, offset);
 			ZVAL_NULL(EX_VAR(opline->result.var));
 			goto fetch_obj_r_finish;
 		} while (0);
@@ -29418,7 +29418,7 @@ static zend_always_inline ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R
 			if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(offset) == IS_UNDEF)) {
 				ZVAL_UNDEFINED_OP2();
 			}
-			zend_wrong_property_read(offset);
+			zend_wrong_property_read(container, offset);
 			ZVAL_NULL(EX_VAR(opline->result.var));
 			goto fetch_obj_r_finish;
 		} while (0);
@@ -31290,7 +31290,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_UNUSED_TMPVAR
 			if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(offset) == IS_UNDEF)) {
 				ZVAL_UNDEFINED_OP2();
 			}
-			zend_wrong_property_read(offset);
+			zend_wrong_property_read(container, offset);
 			ZVAL_NULL(EX_VAR(opline->result.var));
 			goto fetch_obj_r_finish;
 		} while (0);
@@ -33685,7 +33685,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_UNUSED_CV_HAN
 			if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(offset) == IS_UNDEF)) {
 				ZVAL_UNDEFINED_OP2();
 			}
-			zend_wrong_property_read(offset);
+			zend_wrong_property_read(container, offset);
 			ZVAL_NULL(EX_VAR(opline->result.var));
 			goto fetch_obj_r_finish;
 		} while (0);
@@ -37992,7 +37992,7 @@ static zend_always_inline ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R
 			if (IS_CONST == IS_CV && UNEXPECTED(Z_TYPE_P(offset) == IS_UNDEF)) {
 				ZVAL_UNDEFINED_OP2();
 			}
-			zend_wrong_property_read(offset);
+			zend_wrong_property_read(container, offset);
 			ZVAL_NULL(EX_VAR(opline->result.var));
 			goto fetch_obj_r_finish;
 		} while (0);
@@ -41474,7 +41474,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CV_TMPVAR_HAN
 			if ((IS_TMP_VAR|IS_VAR) == IS_CV && UNEXPECTED(Z_TYPE_P(offset) == IS_UNDEF)) {
 				ZVAL_UNDEFINED_OP2();
 			}
-			zend_wrong_property_read(offset);
+			zend_wrong_property_read(container, offset);
 			ZVAL_NULL(EX_VAR(opline->result.var));
 			goto fetch_obj_r_finish;
 		} while (0);
@@ -46282,7 +46282,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_FETCH_OBJ_R_SPEC_CV_CV_HANDLER
 			if (IS_CV == IS_CV && UNEXPECTED(Z_TYPE_P(offset) == IS_UNDEF)) {
 				ZVAL_UNDEFINED_OP2();
 			}
-			zend_wrong_property_read(offset);
+			zend_wrong_property_read(container, offset);
 			ZVAL_NULL(EX_VAR(opline->result.var));
 			goto fetch_obj_r_finish;
 		} while (0);
diff --git a/ext/dom/tests/bug67949.phpt b/ext/dom/tests/bug67949.phpt
@@ -62,15 +62,15 @@ bool(false)
 testing property access
 string(4) "data"
 
-Warning: Trying to get property 'textContent' of non-object in %s on line %d
+Warning: Access to property 'textContent' on null in %s on line %d
 NULL
 testing offset not a long
 array(1) {
   [0]=>
   string(4) "test"
 }
 
-Warning: Trying to get property 'textContent' of non-object in %s on line %d
+Warning: Access to property 'textContent' on null in %s on line %d
 bool(false)
 NULL
 array(1) {
diff --git a/ext/libxml/tests/bug61367-read.phpt b/ext/libxml/tests/bug61367-read.phpt
@@ -58,6 +58,6 @@ Warning: DOMDocument::loadXML(): Failure to process entity file in Entity, line:
 
 Warning: DOMDocument::loadXML(): Entity 'file' not defined in Entity, line: 4 in %s on line %d
 
-Warning: Trying to get property 'firstChild' of non-object in %s on line %d
+Warning: Access to property 'firstChild' on null in %s on line %d
 
-Warning: Trying to get property 'nodeValue' of non-object in %s on line %d
+Warning: Access to property 'nodeValue' on null in %s on line %d
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
@@ -10510,13 +10510,15 @@ static int zend_jit_fetch_obj_read(dasm_State **Dst, const zend_op *opline, cons
 			}
 			|.if X64
 				|	mov CARG1, E_WARNING
-				|	LOAD_ADDR CARG2, "Trying to get property '%s' of non-object"
+				|	LOAD_ADDR CARG2, "Access to property '%s' on %s"
 				|	LOAD_ADDR CARG3, Z_STRVAL_P(member)
+				|	LOAD_ADDR CARG4, "non-object"
 				|	EXT_CALL zend_error, r0
 			|.else
 				|	sub r4, 4
+				|	push "non-object"
 				|	push Z_STRVAL_P(member)
-				|	push "Trying to get property '%s' of non-object"
+				|	push "Access to property '%s' on %s"
 				|	push E_WARNING
 				|	EXT_CALL zend_error, r0
 				|	add r4, 16
diff --git a/ext/pdo_mysql/tests/bug44327.phpt b/ext/pdo_mysql/tests/bug44327.phpt
@@ -60,5 +60,5 @@ object(PDORow)#%d (2) {
 string(19) "SELECT id FROM test"
 ----------------------------------
 
-Warning: Trying to get property 'queryString' of non-object in %s on line %d
+Warning: Access to property 'queryString' on bool in %s on line %d
 NULL
