uri: Improve exceptions for Uri\Rfc3986\Uri

Author: TimWolla

ext/uri/php_uriparser.c

@@ -21,7 +21,6 @@
 #include "Zend/zend_exceptions.h"
 
 static void uriparser_free_uri(void *uri);
-static void throw_invalid_uri_exception(void);
 
 static void *uriparser_malloc(UriMemoryManager *memory_manager, size_t size)
 {
@@ -293,21 +292,25 @@ static uriparser_uris_t *uriparser_create_uris(void)
 	return uriparser_uris;
 }
 
-static void throw_invalid_uri_exception(void)
-{
-	zend_throw_exception(uri_invalid_uri_exception_ce, "The specified URI is malformed", 0);
-}
 void *uriparser_parse_uri_ex(const zend_string *uri_str, const uriparser_uris_t *uriparser_base_urls, bool silent)
 {
 	UriUriA uri = {0};
 
 	/* Empty URIs are always invalid. */
 	if (ZSTR_LEN(uri_str) == 0) {
+		if (!silent) {
+			zend_throw_exception(uri_invalid_uri_exception_ce, "The specified URI must not be empty", 0);
+		}
+
 		goto fail;
 	}
 
 	/* Parse the URI. */
 	if (uriParseSingleUriExMmA(&uri, ZSTR_VAL(uri_str), ZSTR_VAL(uri_str) + ZSTR_LEN(uri_str), NULL, mm) != URI_SUCCESS) {
+		if (!silent) {
+			zend_throw_exception(uri_invalid_uri_exception_ce, "The specified URI is malformed", 0);
+		}
+
 		goto fail;
 	}
 
@@ -316,7 +319,20 @@ void *uriparser_parse_uri_ex(const zend_string *uri_str, const uriparser_uris_t
 
 		/* Combine the parsed URI with the base URI and store the result in 'tmp',
 		 * since the target and source URLs must be distinct. */
-		if (uriAddBaseUriExMmA(&tmp, &uri, &uriparser_base_urls->uri, URI_RESOLVE_STRICTLY, mm) != URI_SUCCESS) {
+		int result = uriAddBaseUriExMmA(&tmp, &uri, &uriparser_base_urls->uri, URI_RESOLVE_STRICTLY, mm);
+		if (result != URI_SUCCESS) {
+			if (!silent) {
+				switch (result) {
+					case URI_ERROR_ADDBASE_REL_BASE:
+						zend_throw_exception(uri_invalid_uri_exception_ce, "The specified base URI must be absolute", 0);
+						break;
+					default:
+						/* This should be unreachable in practice. */
+						zend_throw_exception(uri_invalid_uri_exception_ce, "Failed to resolve the specified URI against the base URI", 0);
+						break;
+				}
+			}
+
 			goto fail;
 		}
 
@@ -337,10 +353,6 @@ void *uriparser_parse_uri_ex(const zend_string *uri_str, const uriparser_uris_t
 
 	uriFreeUriMembersMmA(&uri, mm);
 
-	if (!silent) {
-		throw_invalid_uri_exception();
-	}
-
 	return NULL;
 }
 

ext/uri/tests/004.phpt

@@ -29,7 +29,7 @@ var_dump(Uri\WhatWg\Url::parse("http://RuPaul's Drag Race All Stars 7 Winners Ca
 
 ?>
 --EXPECTF--
-The specified URI is malformed
+The specified URI must not be empty
 NULL
 The specified URI is malformed (MissingSchemeNonRelativeUrl)
 NULL

ext/uri/tests/055.phpt

@@ -12,4 +12,4 @@ try {
 }
 ?>
 --EXPECT--
-The specified URI is malformed
+The specified base URI must be absolute