Promote incomplete class to modification to Error

nikic · nikic · commit 32315c247f3c · 2020-08-28T11:14:43.000+02:00
In line with engine diagnostic promotions, property writes throw
an Error exception, while reads throw a warning.
diff --git a/Zend/tests/bug71841.phpt b/Zend/tests/bug71841.phpt
@@ -3,9 +3,21 @@ Bug #71841 (EG(error_zval) is not handled well)
 --FILE--
 <?php
 $z = unserialize('O:1:"A":0:{}');
-@var_dump($z->e.=0);
-@var_dump(++$z->x);
-@var_dump($z->y++);
+try {
+    var_dump($z->e.=0);
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    var_dump(++$z->x);
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    var_dump($z->y++);
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
 
 $y = array(PHP_INT_MAX => 0);
 try {
@@ -25,9 +37,9 @@ try {
 }
 ?>
 --EXPECT--
-NULL
-NULL
-NULL
+The script tried to modify a property on an incomplete object. Please ensure that the class definition "A" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition
+The script tried to modify a property on an incomplete object. Please ensure that the class definition "A" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition
+The script tried to modify a property on an incomplete object. Please ensure that the class definition "A" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition
 Cannot add element to the array as the next element is already occupied
 Cannot add element to the array as the next element is already occupied
 Cannot add element to the array as the next element is already occupied
diff --git a/ext/standard/incomplete_class.c b/ext/standard/incomplete_class.c
@@ -19,8 +19,7 @@
 #include "php_incomplete_class.h"
 
 #define INCOMPLETE_CLASS_MSG \
-		"The script tried to execute a method or "  \
-		"access a property of an incomplete object. " \
+		"The script tried to %s on an incomplete object. " \
 		"Please ensure that the class definition \"%s\" of the object " \
 		"you are trying to operate on was loaded _before_ " \
 		"unserialize() gets called or provide an autoloader " \
@@ -29,28 +28,29 @@
 PHPAPI zend_class_entry *php_ce_incomplete_class;
 static zend_object_handlers php_incomplete_object_handlers;
 
-static void incomplete_class_message(zend_object *object, int error_type)
+static void incomplete_class_message(zend_object *object)
 {
 	zend_string *class_name = php_lookup_class_name(object);
-	php_error_docref(NULL, error_type, INCOMPLETE_CLASS_MSG,
-		class_name ? ZSTR_VAL(class_name) : "unknown");
+	php_error_docref(NULL, E_WARNING, INCOMPLETE_CLASS_MSG,
+		"access a property", class_name ? ZSTR_VAL(class_name) : "unknown");
 	if (class_name) {
 		zend_string_release_ex(class_name, 0);
 	}
 }
 
-static void throw_incomplete_class_error(zend_object *object)
+static void throw_incomplete_class_error(zend_object *object, const char *what)
 {
 	zend_string *class_name = php_lookup_class_name(object);
-	zend_throw_error(NULL, INCOMPLETE_CLASS_MSG, class_name ? ZSTR_VAL(class_name) : "unknown");
+	zend_throw_error(NULL, INCOMPLETE_CLASS_MSG,
+		what, class_name ? ZSTR_VAL(class_name) : "unknown");
 	if (class_name) {
 		zend_string_release_ex(class_name, 0);
 	}
 }
 
 static zval *incomplete_class_get_property(zend_object *object, zend_string *member, int type, void **cache_slot, zval *rv) /* {{{ */
 {
-	incomplete_class_message(object, E_NOTICE);
+	incomplete_class_message(object);
 
 	if (type == BP_VAR_W || type == BP_VAR_RW) {
 		ZVAL_ERROR(rv);
@@ -63,34 +63,34 @@ static zval *incomplete_class_get_property(zend_object *object, zend_string *mem
 
 static zval *incomplete_class_write_property(zend_object *object, zend_string *member, zval *value, void **cache_slot) /* {{{ */
 {
-	incomplete_class_message(object, E_NOTICE);
+	throw_incomplete_class_error(object, "modify a property");
 	return value;
 }
 /* }}} */
 
 static zval *incomplete_class_get_property_ptr_ptr(zend_object *object, zend_string *member, int type, void **cache_slot) /* {{{ */
 {
-	incomplete_class_message(object, E_NOTICE);
+	throw_incomplete_class_error(object, "modify a property");
 	return &EG(error_zval);
 }
 /* }}} */
 
 static void incomplete_class_unset_property(zend_object *object, zend_string *member, void **cache_slot) /* {{{ */
 {
-	incomplete_class_message(object, E_NOTICE);
+	throw_incomplete_class_error(object, "modify a property");
 }
 /* }}} */
 
 static int incomplete_class_has_property(zend_object *object, zend_string *member, int check_empty, void **cache_slot) /* {{{ */
 {
-	incomplete_class_message(object, E_NOTICE);
+	incomplete_class_message(object);
 	return 0;
 }
 /* }}} */
 
 static zend_function *incomplete_class_get_method(zend_object **object, zend_string *method, const zval *key) /* {{{ */
 {
-	throw_incomplete_class_error(*object);
+	throw_incomplete_class_error(*object, "call a method");
 	return NULL;
 }
 /* }}} */
diff --git a/ext/standard/tests/serialize/incomplete_class.phpt b/ext/standard/tests/serialize/incomplete_class.phpt
@@ -7,7 +7,11 @@ $d = serialize(new __PHP_Incomplete_Class);
 $o = unserialize($d);
 var_dump($o);
 
-$o->test = "a";
+try {
+    $o->test = "a";
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
 var_dump($o->test);
 var_dump($o->test2);
 
@@ -16,12 +20,11 @@ echo "Done\n";
 --EXPECTF--
 object(__PHP_Incomplete_Class)#%d (0) {
 }
+The script tried to modify a property on an incomplete object. Please ensure that the class definition "unknown" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition
 
-Notice: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "unknown" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition in %s on line %d
-
-Notice: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "unknown" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition in %s on line %d
+Warning: main(): The script tried to access a property on an incomplete object. Please ensure that the class definition "unknown" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition in %s on line %d
 NULL
 
-Notice: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "unknown" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition in %s on line %d
+Warning: main(): The script tried to access a property on an incomplete object. Please ensure that the class definition "unknown" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition in %s on line %d
 NULL
 Done
diff --git a/ext/standard/tests/serialize/serialization_objects_005.phpt b/ext/standard/tests/serialize/serialization_objects_005.phpt
@@ -34,18 +34,34 @@ var_dump($incomplete);
 var_dump(is_object($incomplete));
 var_dump($incomplete->p);
 
-$ref2 = "ref1.original";
-$incomplete->p = &$ref2;
+try {
+    $ref2 = "ref1.original";
+    $incomplete->p = &$ref2;
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
 var_dump($incomplete->p);
 $ref2 = "ref1.changed";
 var_dump($incomplete->p);
-$incomplete->p = "p.changed";
+try {
+    $incomplete->p = "p.changed";
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
 var_dump($ref1);
 
 var_dump(isset($incomplete->x));
-$incomplete->x = "x.new";
+try {
+    $incomplete->x = "x.new";
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
 var_dump(isset($incomplete->x));
-unset($incomplete->x);
+try {
+    unset($incomplete->x);
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
 var_dump($incomplete->x);
 
 try {
@@ -83,31 +99,27 @@ object(__PHP_Incomplete_Class)#%d (2) {
 }
 bool(true)
 
-Notice: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition in %s on line %d
+Warning: main(): The script tried to access a property on an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition in %s on line %d
 NULL
+The script tried to modify a property on an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition
 
-Notice: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition in %s on line %d
-
-Notice: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition in %s on line %d
+Warning: main(): The script tried to access a property on an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition in %s on line %d
 NULL
 
-Notice: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition in %s on line %d
+Warning: main(): The script tried to access a property on an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition in %s on line %d
 NULL
-
-Notice: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition in %s on line %d
+The script tried to modify a property on an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition
 string(9) "p.changed"
 
-Notice: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition in %s on line %d
+Warning: main(): The script tried to access a property on an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition in %s on line %d
 bool(false)
+The script tried to modify a property on an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition
 
-Notice: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition in %s on line %d
-
-Notice: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition in %s on line %d
+Warning: main(): The script tried to access a property on an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition in %s on line %d
 bool(false)
+The script tried to modify a property on an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition
 
-Notice: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition in %s on line %d
-
-Notice: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition in %s on line %d
+Warning: main(): The script tried to access a property on an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition in %s on line %d
 NULL
-The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition
+The script tried to call a method on an incomplete object. Please ensure that the class definition "C" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition
 Done
diff --git a/ext/standard/tests/serialize/serialization_objects_006.phpt b/ext/standard/tests/serialize/serialization_objects_006.phpt
@@ -12,6 +12,6 @@ echo "Done";
 object(__PHP_Incomplete_Class)#%d (0) {
 }
 
-Notice: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "unknown" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition in %s on line %d
+Warning: main(): The script tried to access a property on an incomplete object. Please ensure that the class definition "unknown" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition in %s on line %d
 NULL
 Done

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,7 @@`
`19`	`19`	`#include "php_incomplete_class.h"`
`20`	`20`
`21`	`21`	`#define INCOMPLETE_CLASS_MSG \`
`22`		`- "The script tried to execute a method or " \`
`23`		`- "access a property of an incomplete object. " \`
	`22`	`+ "The script tried to %s on an incomplete object. " \`
`24`	`23`	`"Please ensure that the class definition \"%s\" of the object " \`
`25`	`24`	`"you are trying to operate on was loaded _before_ " \`
`26`	`25`	`"unserialize() gets called or provide an autoloader " \`
`@@ -29,28 +28,29 @@`
`29`	`28`	`PHPAPI zend_class_entry *php_ce_incomplete_class;`
`30`	`29`	`static zend_object_handlers php_incomplete_object_handlers;`
`31`	`30`
`32`		`-static void incomplete_class_message(zend_object *object, int error_type)`
	`31`	`+static void incomplete_class_message(zend_object *object)`
`33`	`32`	`{`
`34`	`33`	`zend_string *class_name = php_lookup_class_name(object);`
`35`		`- php_error_docref(NULL, error_type, INCOMPLETE_CLASS_MSG,`
`36`		`- class_name ? ZSTR_VAL(class_name) : "unknown");`
	`34`	`+ php_error_docref(NULL, E_WARNING, INCOMPLETE_CLASS_MSG,`
	`35`	`+ "access a property", class_name ? ZSTR_VAL(class_name) : "unknown");`
`37`	`36`	`if (class_name) {`
`38`	`37`	`zend_string_release_ex(class_name, 0);`
`39`	`38`	`}`
`40`	`39`	`}`
`41`	`40`
`42`		`-static void throw_incomplete_class_error(zend_object *object)`
	`41`	`+static void throw_incomplete_class_error(zend_object object, const char what)`
`43`	`42`	`{`
`44`	`43`	`zend_string *class_name = php_lookup_class_name(object);`
`45`		`- zend_throw_error(NULL, INCOMPLETE_CLASS_MSG, class_name ? ZSTR_VAL(class_name) : "unknown");`
	`44`	`+ zend_throw_error(NULL, INCOMPLETE_CLASS_MSG,`
	`45`	`+ what, class_name ? ZSTR_VAL(class_name) : "unknown");`
`46`	`46`	`if (class_name) {`
`47`	`47`	`zend_string_release_ex(class_name, 0);`
`48`	`48`	`}`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`static zval incomplete_class_get_property(zend_object object, zend_string member, int type, void cache_slot, zval rv) /* {{{ */`
`52`	`52`	`{`
`53`		`- incomplete_class_message(object, E_NOTICE);`
	`53`	`+ incomplete_class_message(object);`
`54`	`54`
`55`	`55`	`if (type == BP_VAR_W \|\| type == BP_VAR_RW) {`
`56`	`56`	`ZVAL_ERROR(rv);`
`@@ -63,34 +63,34 @@ static zval incomplete_class_get_property(zend_object object, zend_string *mem`
`63`	`63`
`64`	`64`	`static zval incomplete_class_write_property(zend_object object, zend_string member, zval value, void *cache_slot) / {{{ */`
`65`	`65`	`{`
`66`		`- incomplete_class_message(object, E_NOTICE);`
	`66`	`+ throw_incomplete_class_error(object, "modify a property");`
`67`	`67`	`return value;`
`68`	`68`	`}`
`69`	`69`	`/* }}} */`
`70`	`70`
`71`	`71`	`static zval incomplete_class_get_property_ptr_ptr(zend_object object, zend_string member, int type, void cache_slot) / {{{ */`
`72`	`72`	`{`
`73`		`- incomplete_class_message(object, E_NOTICE);`
	`73`	`+ throw_incomplete_class_error(object, "modify a property");`
`74`	`74`	`return &EG(error_zval);`
`75`	`75`	`}`
`76`	`76`	`/* }}} */`
`77`	`77`
`78`	`78`	`static void incomplete_class_unset_property(zend_object object, zend_string member, void *cache_slot) / {{{ */`
`79`	`79`	`{`
`80`		`- incomplete_class_message(object, E_NOTICE);`
	`80`	`+ throw_incomplete_class_error(object, "modify a property");`
`81`	`81`	`}`
`82`	`82`	`/* }}} */`
`83`	`83`
`84`	`84`	`static int incomplete_class_has_property(zend_object object, zend_string member, int check_empty, void *cache_slot) / {{{ */`
`85`	`85`	`{`
`86`		`- incomplete_class_message(object, E_NOTICE);`
	`86`	`+ incomplete_class_message(object);`
`87`	`87`	`return 0;`
`88`	`88`	`}`
`89`	`89`	`/* }}} */`
`90`	`90`
`91`	`91`	`static zend_function incomplete_class_get_method(zend_object object, zend_string method, const zval key) / {{{ */`
`92`	`92`	`{`
`93`		`- throw_incomplete_class_error(*object);`
	`93`	`+ throw_incomplete_class_error(*object, "call a method");`
`94`	`94`	`return NULL;`
`95`	`95`	`}`
`96`	`96`	`/* }}} */`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ echo "Done";`
`12`	`12`	`object(__PHP_Incomplete_Class)#%d (0) {`
`13`	`13`	`}`
`14`	`14`
`15`		`-Notice: main(): The script tried to execute a method or access a property of an incomplete object. Please ensure that the class definition "unknown" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition in %s on line %d`
	`15`	`+Warning: main(): The script tried to access a property on an incomplete object. Please ensure that the class definition "unknown" of the object you are trying to operate on was loaded _before_ unserialize() gets called or provide an autoloader to load the class definition in %s on line %d`
`16`	`16`	`NULL`
`17`	`17`	`Done`