Add normalization support

ext/soap/soap.c

@@ -2790,7 +2790,7 @@ PHP_METHOD(SoapClient, __doRequest)
 		if (make_http_soap_request(this_ptr, buf, location, action, version, uri_parser_name, NULL)) {
 			RETURN_EMPTY_STRING();
 		}
-	} else if (make_http_soap_request(this_ptr, buf, location, action, uri_parser_name, version,
+	} else if (make_http_soap_request(this_ptr, buf, location, action, version, uri_parser_name,
 	    return_value)) {
 		return;
 	}

ext/standard/url.c

@@ -463,6 +463,11 @@ static void *parse_url_parse_uri(const zend_string *uri_str, const zend_string *
 	return php_url_parse_ex2(ZSTR_VAL(uri_str), ZSTR_LEN(uri_str), &has_port);
 }
 
+static zend_result parse_url_normalize_uri(void *uri)
+{
+	ZEND_UNREACHABLE();
+}
+
 static zend_string *parse_url_uri_to_string(void *uri, bool exclude_fragment)
 {
 	ZEND_UNREACHABLE();
@@ -481,6 +486,7 @@ const uri_handler_t parse_url_uri_handler = {
 	parse_url_parse_uri,
 	parse_url_get_uri_ce,
 	parse_url_clone_uri,
+	parse_url_normalize_uri,
 	parse_url_uri_to_string,
 	parse_url_free_uri,
 	parse_url_destroy_parser,

ext/uri/php_lexbor.c

@@ -27,6 +27,7 @@ static zend_result lexbor_init_parser(void);
 static void *lexbor_parse_uri(const zend_string *url_str, const zend_string *base_url_str, zval *errors);
 static zend_class_entry *lexbor_get_uri_ce(void);
 static void *lexbor_clone_uri(void *uri);
+static zend_result lexbor_normalize_uri(void *uri);
 static zend_string *lexbor_uri_to_string(void *uri, bool exclude_fragment);
 static void lexbor_free_uri(void *uri);
 static zend_result lexbor_destroy_parser(void);
@@ -42,6 +43,7 @@ const uri_handler_t lexbor_uri_handler = {
 	lexbor_parse_uri,
 	lexbor_get_uri_ce,
 	lexbor_clone_uri,
+	lexbor_normalize_uri,
 	lexbor_uri_to_string,
 	lexbor_free_uri,
 	lexbor_destroy_parser,
@@ -381,6 +383,11 @@ static void *lexbor_clone_uri(void *uri)
 	return lxb_url_clone(lexbor_parser->mraw, lexbor_uri);
 }
 
+static zend_result lexbor_normalize_uri(void *uri)
+{
+	return SUCCESS;
+}
+
 static lxb_status_t lexbor_serialize_callback(const lxb_char_t *data, size_t length, void *ctx)
 {
 	smart_str *uri_str = (smart_str *) ctx;

ext/uri/php_uri.c

@@ -36,6 +36,7 @@ zend_class_entry *whatwg_uri_ce;
 zend_object_handlers whatwg_uri_object_handlers;
 zend_class_entry *uri_exception_ce;
 zend_class_entry *uninitialized_uri_exception_ce;
+zend_class_entry *uri_operation_exception_ce;
 zend_class_entry *invalid_uri_exception_ce;
 zend_class_entry *whatwg_error_ce;
 
@@ -382,11 +383,11 @@ PHP_METHOD(Uri_Rfc3986Uri, equalsTo)
 	zend_object *that_object;
 	bool exclude_fragment = true;
 
-    ZEND_PARSE_PARAMETERS_START(1, 2)
-    	Z_PARAM_OBJ_OF_CLASS(that_object, uri_interface_ce)
+	ZEND_PARSE_PARAMETERS_START(1, 2)
+		Z_PARAM_OBJ_OF_CLASS(that_object, uri_interface_ce)
 		Z_PARAM_OPTIONAL
-    	Z_PARAM_BOOL(exclude_fragment)
-    ZEND_PARSE_PARAMETERS_END();
+		Z_PARAM_BOOL(exclude_fragment)
+	ZEND_PARSE_PARAMETERS_END();
 
 	zend_object *this_object = Z_OBJ_P(ZEND_THIS);
 	uri_internal_t *this_internal_uri = uri_internal_from_obj(this_object);
@@ -411,6 +412,53 @@ PHP_METHOD(Uri_Rfc3986Uri, equalsTo)
 	zend_string_release(that_str);
 }
 
+PHP_METHOD(Uri_Rfc3986Uri, normalize)
+{
+	ZEND_PARSE_PARAMETERS_NONE();
+
+	zend_object *this_object = Z_OBJ_P(ZEND_THIS);
+	uri_internal_t *internal_uri = uri_internal_from_obj(this_object);
+	URI_CHECK_INITIALIZATION_RETURN_THROWS(internal_uri, this_object);
+
+	zend_object *new_object = uri_clone_obj_handler(this_object);
+	if (UNEXPECTED(EG(exception) != NULL)) {
+		RETURN_THROWS();
+	}
+	uri_internal_t *new_internal_uri = uri_internal_from_obj(new_object);
+	URI_CHECK_INITIALIZATION_RETURN_THROWS(internal_uri, this_object);
+
+	if (UNEXPECTED(internal_uri->handler->normalize_uri(new_internal_uri->uri) == FAILURE)) {
+		zend_throw_error(uri_operation_exception_ce, "Failed to normalize %s", ZSTR_VAL(this_object->ce->name));
+		RETURN_THROWS();
+	}
+
+	ZVAL_OBJ(return_value, new_object);
+}
+
+PHP_METHOD(Uri_Rfc3986Uri, toNormalizedString)
+{
+	ZEND_PARSE_PARAMETERS_NONE();
+
+	zend_object *object = Z_OBJ_P(ZEND_THIS);
+	uri_internal_t *internal_uri = uri_internal_from_obj(object);
+	URI_CHECK_INITIALIZATION_RETURN_THROWS(internal_uri, object);
+
+	void *new_uri = internal_uri->handler->clone_uri(internal_uri->uri);
+	if (UNEXPECTED(new_uri == NULL)) {
+		zend_throw_error(uri_operation_exception_ce, "Failed to normalize %s", ZSTR_VAL(object->ce->name));
+		RETURN_THROWS();
+	}
+
+	if (UNEXPECTED(internal_uri->handler->normalize_uri(new_uri) == FAILURE)) {
+		zend_throw_error(uri_operation_exception_ce, "Failed to normalize %s", ZSTR_VAL(object->ce->name));
+		internal_uri->handler->free_uri(new_uri);
+		RETURN_THROWS();
+	}
+
+	RETVAL_STR(internal_uri->handler->uri_to_string(new_uri, false));
+	internal_uri->handler->free_uri(new_uri);
+}
+
 PHP_METHOD(Uri_Rfc3986Uri, __toString)
 {
 	ZEND_PARSE_PARAMETERS_NONE();
@@ -445,7 +493,7 @@ static void uri_restore_custom_properties(zend_object *object, uri_internal_t *i
 		}
 
 		zend_update_property_ex(object->ce, object, prop_name, prop_val);
-		if (EG(exception)) {
+		if (UNEXPECTED(EG(exception) != NULL)) {
 			break;
 		}
 	} ZEND_HASH_FOREACH_END();
@@ -659,7 +707,7 @@ static zend_object *uri_clone_obj_handler(zend_object *object)
 
 	void *uri = internal_uri->handler->clone_uri(internal_uri->uri);
 	if (UNEXPECTED(uri == NULL)) {
-		zend_throw_error(NULL, "Failed to clone %s", ZSTR_VAL(object->ce->name));
+		zend_throw_error(uri_operation_exception_ce, "Failed to clone %s", ZSTR_VAL(object->ce->name));
 		return &new_uri_object->std;
 	}
 
@@ -724,6 +772,7 @@ zend_result uri_handler_register(const uri_handler_t *uri_handler)
 	ZEND_ASSERT(uri_handler->parse_uri != NULL);
 	ZEND_ASSERT(uri_handler->get_uri_ce != NULL);
 	ZEND_ASSERT(uri_handler->clone_uri != NULL);
+	ZEND_ASSERT(uri_handler->normalize_uri != NULL);
 	ZEND_ASSERT(uri_handler->uri_to_string != NULL);
 	ZEND_ASSERT(uri_handler->free_uri != NULL);
 	ZEND_ASSERT(uri_handler->destroy_parser != NULL);
@@ -746,6 +795,7 @@ static PHP_MINIT_FUNCTION(uri)
 
 	uri_exception_ce = register_class_Uri_UriException(zend_ce_exception);
 	uninitialized_uri_exception_ce = register_class_Uri_UninitializedUriException(uri_exception_ce);
+	uri_operation_exception_ce = register_class_Uri_UriOperationException(uri_exception_ce);
 	invalid_uri_exception_ce = register_class_Uri_InvalidUriException(uri_exception_ce);
 	whatwg_error_ce = register_class_Uri_WhatWgError();
 

ext/uri/php_uri.stub.php

@@ -26,6 +26,11 @@ class UninitializedUriException extends \Uri\UriException
 {
 }
 
+/** @strict-properties */
+class UriOperationException extends \Uri\UriException
+{
+}
+
 /** @strict-properties */
 class InvalidUriException extends \Uri\UriException
 {
@@ -136,6 +141,10 @@ public function withFragment(?string $fragment): static {}
 
     public function equalsTo(\Uri\UriInterface $uri, bool $excludeFragment = true): bool {}
 
+    public function normalize(): static {}
+
+    public function toNormalizedString(): string {}
+
     public function __toString(): string {}
 }
 
@@ -197,6 +206,10 @@ public function withFragment(?string $fragment): static {}
 
     public function equalsTo(\Uri\UriInterface $uri, bool $excludeFragment = true): bool {}
 
+    public function normalize(): static {}
+
+    public function toNormalizedString(): string {}
+
     public function __toString(): string {}
 
     public function __serialize(): array;
@@ -279,6 +292,12 @@ public function withFragment(?string $fragment): static {}
     /** @implementation-alias Uri\Rfc3986Uri::equalsTo */
     public function equalsTo(\Uri\UriInterface $uri, bool $excludeFragment = true): bool {}
 
+    /** @implementation-alias Uri\Rfc3986Uri::normalize */
+    public function normalize(): static {}
+
+    /** @implementation-alias Uri\Rfc3986Uri::toNormalizedString */
+    public function toNormalizedString(): string {}
+
     /** @implementation-alias Uri\Rfc3986Uri::__toString */
     public function __toString(): string {}
 

ext/uri/php_uri_common.h

@@ -24,6 +24,7 @@ extern zend_class_entry *whatwg_uri_ce;
 extern zend_object_handlers whatwg_uri_object_handlers;
 extern zend_class_entry *uri_exception_ce;
 extern zend_class_entry *uninitialized_uri_exception_ce;
+extern zend_class_entry *uri_operation_exception_ce;
 extern zend_class_entry *invalid_uri_exception_ce;
 extern zend_class_entry *whatwg_error_ce;
 
@@ -34,6 +35,7 @@ typedef struct uri_handler_t {
 	void *(*parse_uri)(const zend_string *uri_str, const zend_string *base_url_str, zval *errors);
 	zend_class_entry *(*get_uri_ce)(void);
 	void *(*clone_uri)(void *uri);
+	zend_result (*normalize_uri)(void *uri);
 	zend_string *(*uri_to_string)(void *uri, bool exclude_fragment);
 	void (*free_uri)(void *uri);
 	zend_result (*destroy_parser)(void);
@@ -130,6 +132,9 @@ void throw_invalid_uri_exception(zval *errors);
     const uri_property_handler_t *property_handler = uri_property_handler_from_internal_uri(internal_uri, property_name); \
     ZEND_ASSERT(property_handler != NULL); \
     zend_object *new_object = uri_clone_obj_handler(Z_OBJ_P(ZEND_THIS)); \
+	if (UNEXPECTED(EG(exception) != NULL)) { \
+		RETURN_THROWS(); \
+	} \
     uri_internal_t *new_internal_uri = uri_internal_from_obj(new_object); \
     URI_CHECK_INITIALIZATION_RETURN_THROWS(new_internal_uri, Z_OBJ_P(ZEND_THIS)); \
     if (property_handler->write_func == NULL) { \

ext/uri/php_uriparser.c

@@ -23,6 +23,7 @@ static zend_result uriparser_init_parser(void);
 static void *uriparser_parse_uri(const zend_string *uri_str, const zend_string *base_uri_str, zval *errors);
 static zend_class_entry *uriparser_get_uri_ce(void);
 static void *uriparser_clone_uri(void *uri);
+static zend_result uriparser_normalize_uri(void *uri);
 static zend_string *uriparser_uri_to_string(void *uri, bool exclude_fragment);
 static void uriparser_free_uri(void *uri);
 static zend_result uriparser_destroy_parser(void);
@@ -35,6 +36,7 @@ const uri_handler_t uriparser_uri_handler = {
 	uriparser_parse_uri,
 	uriparser_get_uri_ce,
 	uriparser_clone_uri,
+	uriparser_normalize_uri,
 	uriparser_uri_to_string,
 	uriparser_free_uri,
 	uriparser_destroy_parser,
@@ -559,6 +561,17 @@ static void *uriparser_clone_uri(void *uri)
 	return new_uriparser_uri;
 }
 
+static zend_result uriparser_normalize_uri(void *uri)
+{
+	UriUriA *uriparser_uri = (UriUriA *) uri;
+
+	if (uriNormalizeSyntaxA(uriparser_uri) != URI_SUCCESS) {
+		return FAILURE;
+	}
+
+	return SUCCESS;
+}
+
 static zend_string *uriparser_uri_to_string(void *uri, bool exclude_fragment)
 {
 	UriUriA *uriparser_uri = (UriUriA *) uri;