Review fixes

Author: kocsismate

NEWS

@@ -64,6 +64,7 @@ PHP                                                                        NEWS
   . Avoid double conversion to string in php_userstreamop_readdir(). (nielsdos)
 
 - URI:
+  . Added support for Uri\Rfc3986\Uri::with*() methods. (kocsismate)
   . Fixed memory management of Uri\WhatWg\Url objects. (timwolla)
   . Fixed memory management of the internal "parse_url" URI parser.
     (timwolla)

ext/uri/php_uri.c

@@ -541,21 +541,25 @@ PHP_METHOD(Uri_Rfc3986_Uri, withUserInfo)
 		ZVAL_STR(&zv, value);
 	}
 
+	zend_object *old_object = Z_OBJ_P(ZEND_THIS);
 	uri_internal_t *internal_uri = Z_URI_INTERNAL_P(ZEND_THIS);
 	URI_ASSERT_INITIALIZATION(internal_uri);
 
-	zend_object *new_object = uri_clone_obj_handler(Z_OBJ_P(ZEND_THIS));
-	ZEND_ASSERT(new_object != NULL);
+	zend_object *new_object = old_object->handlers->clone_obj(old_object);
+	if (new_object == NULL) {
+		RETURN_THROWS();
+	}
+
+	/* Assign the object early. The engine will take care of destruction in
+	 * case of an exception being thrown. */
+	RETVAL_OBJ(new_object);
 
 	uri_internal_t *new_internal_uri = uri_internal_from_obj(new_object);
 	URI_ASSERT_INITIALIZATION(new_internal_uri);
 
 	if (UNEXPECTED(php_uri_parser_rfc3986_userinfo_write(new_internal_uri, &zv, NULL) == FAILURE)) {
-		zend_object_release(new_object);
 		RETURN_THROWS();
 	}
-
-	RETVAL_OBJ(new_object);
 }
 
 PHP_METHOD(Uri_Rfc3986_Uri, getUsername)

ext/uri/tests/026.phpt

@@ -42,7 +42,7 @@ try {
 }
 
 try {
-    $uri3->withHost("t:s/t.com");     // t:s/t.com
+    $uri3->withHost("t:s/t.com");
 } catch (Uri\InvalidUriException $e) {
     echo $e->getMessage() . "\n";
 }

ext/uri/uri_parser_rfc3986.c

@@ -106,14 +106,6 @@ ZEND_ATTRIBUTE_NONNULL static UriUriA *get_uri_for_writing(uri_internal_t *inter
 	return &uriparser_uris->uri;
 }
 
-ZEND_ATTRIBUTE_NONNULL static void reset_normalized_uri_after_writing(uri_internal_t *internal_uri)
-{
-	php_uri_parser_rfc3986_uris *uriparser_uris = internal_uri->uri;
-
-	uriFreeUriMembersMmA(&uriparser_uris->normalized_uri, mm);
-	uriparser_uris->normalized_uri_initialized = false;
-}
-
 ZEND_ATTRIBUTE_NONNULL static zend_result php_uri_parser_rfc3986_scheme_read(const uri_internal_t *internal_uri, uri_component_read_mode_t read_mode, zval *retval)
 {
 	const UriUriA *uriparser_uri = get_uri_for_reading(internal_uri->uri, read_mode);
@@ -143,8 +135,6 @@ static zend_result php_uri_parser_rfc3986_scheme_write(struct uri_internal_t *in
 		return FAILURE;
 	}
 
-	reset_normalized_uri_after_writing(internal_uri);
-
 	return SUCCESS;
 }
 
@@ -174,7 +164,6 @@ zend_result php_uri_parser_rfc3986_userinfo_write(struct uri_internal_t *interna
 
 	switch (result) {
 		case URI_SUCCESS:
-			reset_normalized_uri_after_writing(internal_uri);
 			return SUCCESS;
 		case URI_ERROR_SETUSERINFO_HOST_NOT_SET:
 			zend_throw_exception(uri_invalid_uri_exception_ce, "Cannot set a userinfo without having a host", 0);
@@ -263,7 +252,6 @@ static zend_result php_uri_parser_rfc3986_host_write(struct uri_internal_t *inte
 
 	switch (result) {
 		case URI_SUCCESS:
-			reset_normalized_uri_after_writing(internal_uri);
 			return SUCCESS;
 		case URI_ERROR_SETHOST_PORT_SET:
 			zend_throw_exception(uri_invalid_uri_exception_ce, "Cannot remove the host from a URI that has a port", 0);
@@ -318,12 +306,11 @@ static zend_result php_uri_parser_rfc3986_port_write(struct uri_internal_t *inte
 	} else {
 		zend_string *tmp = zend_long_to_str(Z_LVAL_P(value));
 		result = uriSetPortTextMmA(uriparser_uri, ZSTR_VAL(tmp), ZSTR_VAL(tmp) + ZSTR_LEN(tmp), mm);
-		zend_string_release(tmp);
+		zend_string_release_ex(tmp, false);
 	}
 
 	switch (result) {
 		case URI_SUCCESS:
-			reset_normalized_uri_after_writing(internal_uri);
 			return SUCCESS;
 		case URI_ERROR_SETPORT_HOST_NOT_SET:
 			zend_throw_exception(uri_invalid_uri_exception_ce, "Cannot set a port without having a host", 0);
@@ -378,8 +365,6 @@ static zend_result php_uri_parser_rfc3986_path_write(struct uri_internal_t *inte
 		return FAILURE;
 	}
 
-	reset_normalized_uri_after_writing(internal_uri);
-
 	return SUCCESS;
 }
 
@@ -412,8 +397,6 @@ static zend_result php_uri_parser_rfc3986_query_write(struct uri_internal_t *int
 		return FAILURE;
 	}
 
-	reset_normalized_uri_after_writing(internal_uri);
-
 	return SUCCESS;
 }
 
@@ -446,8 +429,6 @@ static zend_result php_uri_parser_rfc3986_fragment_write(struct uri_internal_t *
 		return FAILURE;
 	}
 
-	reset_normalized_uri_after_writing(internal_uri);
-
 	return SUCCESS;
 }