Fix review comments by DanielEScherzer

Author: kocsismate

ext/uri/php_lexbor.c

@@ -215,7 +215,7 @@ static void fill_errors(zval *errors)
 
 		zval error_type;
 		zend_enum_new(&error_type, uri_whatwg_url_validation_error_type_ce, error_str, NULL);
-		zend_update_property(uri_whatwg_url_validation_error_ce, Z_OBJ(error), ZEND_STRL("type"), &error_type);
+		zend_update_property_ex(uri_whatwg_url_validation_error_ce, Z_OBJ(error), ZSTR_KNOWN(ZEND_STR_TYPE), &error_type);
 		zend_string_release_ex(error_str, false);
 		zval_ptr_dtor(&error_type);
 
@@ -321,7 +321,7 @@ static zend_result lexbor_write_password(struct uri_internal_t *internal_uri, zv
 	return SUCCESS;
 }
 
-static ZEND_RESULT_CODE init_idna(void)
+static zend_result init_idna(void)
 {
 	if (lexbor_parser->idna != NULL) {
 		return SUCCESS;
@@ -471,7 +471,7 @@ static zend_result lexbor_write_query(struct uri_internal_t *internal_uri, zval
 
 	zval_string_or_null_to_lexbor_str(value, &str);
 
-	if ( lxb_url_api_search_set(lexbor_uri, lexbor_parser, str.data, str.length) != LXB_STATUS_OK) {
+	if (lxb_url_api_search_set(lexbor_uri, lexbor_parser, str.data, str.length) != LXB_STATUS_OK) {
 		fill_errors(errors);
 
 		return FAILURE;

ext/uri/php_uri.c

@@ -152,7 +152,7 @@ PHP_METHOD(Uri_WhatWg_UrlValidationError, __construct)
 		RETURN_THROWS();
 	}
 
-	zend_update_property(uri_whatwg_url_validation_error_ce, Z_OBJ_P(ZEND_THIS), ZEND_STRL("type"), type);
+	zend_update_property_ex(uri_whatwg_url_validation_error_ce, Z_OBJ_P(ZEND_THIS), ZSTR_KNOWN(ZEND_STR_TYPE), type);
 	if (EG(exception)) {
 		RETURN_THROWS();
 	}
@@ -347,21 +347,16 @@ static void uri_unserialize(INTERNAL_FUNCTION_PARAMETERS, const char *handler_na
 		RETURN_THROWS();
 	}
 
-	zval errors;
-	ZVAL_UNDEF(&errors);
-
 	uri_internal_t *internal_uri = uri_internal_from_obj(object);
 	internal_uri->handler = uri_handler_by_name(handler_name, strlen(handler_name));
 	if (internal_uri->uri != NULL) {
 		internal_uri->handler->free_uri(internal_uri->uri);
 	}
-	internal_uri->uri = internal_uri->handler->parse_uri(Z_STR_P(uri_zv), NULL, &errors);
+	internal_uri->uri = internal_uri->handler->parse_uri(Z_STR_P(uri_zv), NULL, NULL);
 	if (internal_uri->uri == NULL) {
 		zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object", ZSTR_VAL(object->ce->name));
-		zval_ptr_dtor(&errors);
 		RETURN_THROWS();
 	}
-	zval_ptr_dtor(&errors);
 
 	/* Unserialize regular properties: second array */
 	arr = zend_hash_index_find(data, 1);