Throw Error instead of E_ERROR when calling method on incomplete class

There's no reason for this to abort execution completely.

Author: nikic

ext/standard/incomplete_class.c

@@ -29,21 +29,24 @@
 PHPAPI zend_class_entry *php_ce_incomplete_class;
 static zend_object_handlers php_incomplete_object_handlers;
 
-/* {{{ incomplete_class_message */
 static void incomplete_class_message(zend_object *object, int error_type)
 {
-	zend_string *class_name;
-
-	class_name = php_lookup_class_name(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");
+	if (class_name) {
+		zend_string_release_ex(class_name, 0);
+	}
+}
 
+static void throw_incomplete_class_error(zend_object *object)
+{
+	zend_string *class_name = php_lookup_class_name(object);
+	zend_throw_error(NULL, INCOMPLETE_CLASS_MSG, class_name ? ZSTR_VAL(class_name) : "unknown");
 	if (class_name) {
-		php_error_docref(NULL, error_type, INCOMPLETE_CLASS_MSG, ZSTR_VAL(class_name));
 		zend_string_release_ex(class_name, 0);
-	} else {
-		php_error_docref(NULL, error_type, INCOMPLETE_CLASS_MSG, "unknown");
 	}
 }
-/* }}} */
 
 static zval *incomplete_class_get_property(zend_object *object, zend_string *member, int type, void **cache_slot, zval *rv) /* {{{ */
 {
@@ -87,7 +90,7 @@ static int incomplete_class_has_property(zend_object *object, zend_string *membe
 
 static zend_function *incomplete_class_get_method(zend_object **object, zend_string *method, const zval *key) /* {{{ */
 {
-	incomplete_class_message(*object, E_ERROR);
+	throw_incomplete_class_error(*object);
 	return NULL;
 }
 /* }}} */

ext/standard/tests/serialize/serialization_objects_005.phpt

@@ -48,7 +48,11 @@ var_dump(isset($incomplete->x));
 unset($incomplete->x);
 var_dump($incomplete->x);
 
-$incomplete->f();
+try {
+    $incomplete->f();
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
 
 echo "Done";
 ?>
@@ -105,5 +109,5 @@ Notice: main(): The script tried to execute a method or access a property of an
 
 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
 NULL
-
-Fatal error: 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 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
+Done