General fix

Author: kocsismate

ext/standard/tests/serialize/serialization_objects_009.phpt

@@ -3,22 +3,24 @@ Custom unserialization of classes with no custom unserializer.
 --FILE--
 <?php
 $ser = 'C:1:"C":6:{dasdas}';
-$a = unserialize($ser);
+
+try {
+    unserialize($ser);
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+}
+
 eval('class C {}');
-$b = unserialize($ser);
 
-var_dump($a, $b);
+try {
+    unserialize($ser);
+} catch (Throwable $e) {
+    echo $e::class, ": ", $e->getMessage(), PHP_EOL;
+}
 
 echo "Done";
 ?>
---EXPECTF--
-Warning: Class __PHP_Incomplete_Class has no unserializer in %sserialization_objects_009.php on line %d
-
-Warning: Class C has no unserializer in %sserialization_objects_009.php on line %d
-object(__PHP_Incomplete_Class)#%d (1) {
-  ["__PHP_Incomplete_Class_Name"]=>
-  string(1) "C"
-}
-object(C)#%d (0) {
-}
+--EXPECT--
+Exception: Class __PHP_Incomplete_Class has no unserializer
+Exception: Class C has no unserializer
 Done

ext/standard/var_unserializer.re

@@ -769,7 +769,7 @@ static inline int object_custom(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
 	}
 
 	if (ce->unserialize == NULL) {
-		zend_error(E_WARNING, "Class %s has no unserializer", ZSTR_VAL(ce->name));
+		zend_throw_exception_ex(NULL, 0,  "Class %s has no unserializer", ZSTR_VAL(ce->name));
 		object_init_ex(rval, ce);
 	} else if (ce->unserialize(rval, ce, (const unsigned char*)*p, datalen, (zend_unserialize_data *)var_hash) != SUCCESS) {
 		return 0;

ext/uri/php_uri.c

@@ -1094,13 +1094,6 @@ PHPAPI zend_object *php_uri_object_handler_clone(zend_object *object)
 	return &new_uri_object->std;
 }
 
-PHPAPI int php_uri_object_handler_unserialize(zval *object, zend_class_entry *ce, const unsigned char *buf, size_t buf_len, zend_unserialize_data *data)
-{
-	zend_throw_exception_ex(NULL, 0, "Unserialization of %s using the \"C\" format is unsupported", ZSTR_VAL(ce->name));
-
-	return FAILURE;
-}
-
 PHPAPI zend_result php_uri_parser_register(const php_uri_parser *uri_parser)
 {
 	zend_string *key = zend_string_init_interned(uri_parser->name, strlen(uri_parser->name), true);
@@ -1123,7 +1116,6 @@ static PHP_MINIT_FUNCTION(uri)
 	php_uri_ce_rfc3986_uri = register_class_Uri_Rfc3986_Uri();
 	php_uri_ce_rfc3986_uri->create_object = php_uri_object_create_rfc3986;
 	php_uri_ce_rfc3986_uri->default_object_handlers = &object_handlers_rfc3986_uri;
-	php_uri_ce_rfc3986_uri->unserialize = &php_uri_object_handler_unserialize;
 	memcpy(&object_handlers_rfc3986_uri, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	object_handlers_rfc3986_uri.offset = offsetof(php_uri_object, std);
 	object_handlers_rfc3986_uri.free_obj = php_uri_object_handler_free;
@@ -1135,7 +1127,6 @@ static PHP_MINIT_FUNCTION(uri)
 	php_uri_ce_whatwg_url = register_class_Uri_WhatWg_Url();
 	php_uri_ce_whatwg_url->create_object = php_uri_object_create_whatwg;
 	php_uri_ce_whatwg_url->default_object_handlers = &object_handlers_whatwg_uri;
-	php_uri_ce_whatwg_url->unserialize = &php_uri_object_handler_unserialize;
 	memcpy(&object_handlers_whatwg_uri, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	object_handlers_whatwg_uri.offset = offsetof(php_uri_object, std);
 	object_handlers_whatwg_uri.free_obj = php_uri_object_handler_free;
@@ -1145,7 +1136,6 @@ static PHP_MINIT_FUNCTION(uri)
 	php_uri_ce_exception = register_class_Uri_UriException(zend_ce_exception);
 	php_uri_ce_error = register_class_Uri_UriError(zend_ce_error);
 	php_uri_ce_invalid_uri_exception = register_class_Uri_InvalidUriException(php_uri_ce_exception);
-	php_uri_ce_invalid_uri_exception->unserialize = &php_uri_object_handler_unserialize;
 	php_uri_ce_whatwg_invalid_url_exception = register_class_Uri_WhatWg_InvalidUrlException(php_uri_ce_invalid_uri_exception);
 	php_uri_ce_whatwg_url_host_type = register_class_Uri_WhatWg_UrlHostType();
 	php_uri_ce_whatwg_url_validation_error = register_class_Uri_WhatWg_UrlValidationError();

ext/uri/tests/gh22046.phpt

@@ -18,5 +18,5 @@ try {
 }
 ?>
 --EXPECT--
-Exception: Unserialization of Uri\WhatWg\Url using the "C" format is unsupported
-Exception: Unserialization of Uri\Rfc3986\Uri using the "C" format is unsupported
+Exception: Class Uri\WhatWg\Url has no unserializer
+Exception: Class Uri\Rfc3986\Uri has no unserializer