ext/uri: Fix the distinction between an empty and a missing query/fragment for WHATWG URLs

Author: kocsismate

NEWS

@@ -26,6 +26,11 @@ PHP                                                                        NEWS
   . Fixed bug GH-19798: XP_SOCKET XP_SSL (Socket stream modules): Incorrect
     condition for Win32/Win64. (Jakub Zelenka)
 
+- URI:
+  . Fixed the distinction between an empty and a missing query/fragment
+    when using Uri\WhatWg\Url::getQuery() and Uri\WhatWg\Url::getFragment().
+    (kocsismate)
+
 - Zip:
   . Fixed missing zend_release_fcall_info_cache on the following methods
     ZipArchive::registerProgressCallback() and ZipArchive::registerCancelCallback()

ext/uri/tests/whatwg/modification/fragment_success_hashmark.phpt

@@ -15,5 +15,5 @@ var_dump($url2->toAsciiString());
 ?>
 --EXPECT--
 NULL
-NULL
+string(0) ""
 string(21) "https://example.com/#"

ext/uri/tests/whatwg/modification/query_success_question_mark.phpt

@@ -15,5 +15,5 @@ var_dump($url2->toAsciiString());
 ?>
 --EXPECT--
 NULL
-NULL
+string(0) ""
 string(21) "https://example.com/?"

ext/uri/uri_parser_whatwg.c

@@ -278,7 +278,7 @@ static zend_result php_uri_parser_whatwg_username_read(void *uri, php_uri_compon
 {
 	const lxb_url_t *lexbor_uri = uri;
 
-	if (lexbor_uri->username.length) {
+	if (lexbor_uri->username.length > 0) {
 		ZVAL_STRINGL(retval, (const char *) lexbor_uri->username.data, lexbor_uri->username.length);
 	} else {
 		ZVAL_NULL(retval);
@@ -425,7 +425,7 @@ static zend_result php_uri_parser_whatwg_path_read(void *uri, php_uri_component_
 {
 	const lxb_url_t *lexbor_uri = uri;
 
-	if (lexbor_uri->path.str.length) {
+	if (lexbor_uri->path.str.length > 0) {
 		ZVAL_STRINGL(retval, (const char *) lexbor_uri->path.str.data, lexbor_uri->path.str.length);
 	} else {
 		ZVAL_EMPTY_STRING(retval);
@@ -454,7 +454,7 @@ static zend_result php_uri_parser_whatwg_query_read(void *uri, php_uri_component
 {
 	const lxb_url_t *lexbor_uri = uri;
 
-	if (lexbor_uri->query.length) {
+	if (lexbor_uri->query.data != NULL) {
 		ZVAL_STRINGL(retval, (const char *) lexbor_uri->query.data, lexbor_uri->query.length);
 	} else {
 		ZVAL_NULL(retval);
@@ -483,7 +483,7 @@ static zend_result php_uri_parser_whatwg_fragment_read(void *uri, php_uri_compon
 {
 	const lxb_url_t *lexbor_uri = uri;
 
-	if (lexbor_uri->fragment.length) {
+	if (lexbor_uri->fragment.data != NULL) {
 		ZVAL_STRINGL(retval, (const char *) lexbor_uri->fragment.data, lexbor_uri->fragment.length);
 	} else {
 		ZVAL_NULL(retval);