Skip to content

uri: Fix casing of UriHostType and UrlHostType enum cases #23851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mbeccati merged 1 commit into from
Sep 22, 2026
Merged

uri: Fix casing of UriHostType and UrlHostType enum cases #23851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ext/uri/php_uri.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ enum UriType

enum UriHostType
{
case IPv4;
case IPv6;
case IPvFuture;
case IpV4;
case IpV6;
case IpVFuture;
case RegisteredName;
}

Expand Down Expand Up @@ -204,8 +204,8 @@ public function __construct(string $context, \Uri\WhatWg\UrlValidationErrorType

enum UrlHostType
{
case IPv4;
case IPv6;
case IpV4;
case IpV6;
case Domain;
case Opaque;
case Empty;
Expand Down
12 changes: 6 additions & 6 deletions ext/uri/php_uri_arginfo.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions ext/uri/php_uri_decl.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ext/uri/tests/rfc3986/getters/host_type_success_ip_future.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ var_dump($uri->getHostType());

?>
--EXPECT--
enum(Uri\Rfc3986\UriHostType::IPvFuture)
enum(Uri\Rfc3986\UriHostType::IpVFuture)
2 changes: 1 addition & 1 deletion ext/uri/tests/rfc3986/getters/host_type_success_ipv4.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ var_dump($uri->getHostType());

?>
--EXPECT--
enum(Uri\Rfc3986\UriHostType::IPv4)
enum(Uri\Rfc3986\UriHostType::IpV4)
2 changes: 1 addition & 1 deletion ext/uri/tests/rfc3986/getters/host_type_success_ipv6.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ var_dump($uri->getHostType());

?>
--EXPECT--
enum(Uri\Rfc3986\UriHostType::IPv6)
enum(Uri\Rfc3986\UriHostType::IpV6)
2 changes: 1 addition & 1 deletion ext/uri/tests/whatwg/getters/host_type_success_ipv4.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ var_dump($url->getHostType());

?>
--EXPECT--
enum(Uri\WhatWg\UrlHostType::IPv4)
enum(Uri\WhatWg\UrlHostType::IpV4)
2 changes: 1 addition & 1 deletion ext/uri/tests/whatwg/getters/host_type_success_ipv6.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ var_dump($url->getHostType());

?>
--EXPECT--
enum(Uri\WhatWg\UrlHostType::IPv6)
enum(Uri\WhatWg\UrlHostType::IpV6)
6 changes: 3 additions & 3 deletions ext/uri/uri_parser_rfc3986.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,11 +293,11 @@ ZEND_ATTRIBUTE_NONNULL void php_uri_parser_rfc3986_host_type_read(php_uri_parser
zend_object *value;

if (uriparser_uri->hostData.ip4 != NULL) {
value = zend_enum_get_case_by_id(php_uri_ce_rfc3986_uri_host_type, ZEND_ENUM_Uri_Rfc3986_UriHostType_IPv4);
value = zend_enum_get_case_by_id(php_uri_ce_rfc3986_uri_host_type, ZEND_ENUM_Uri_Rfc3986_UriHostType_IpV4);
} else if (uriparser_uri->hostData.ip6 != NULL) {
value = zend_enum_get_case_by_id(php_uri_ce_rfc3986_uri_host_type, ZEND_ENUM_Uri_Rfc3986_UriHostType_IPv6);
value = zend_enum_get_case_by_id(php_uri_ce_rfc3986_uri_host_type, ZEND_ENUM_Uri_Rfc3986_UriHostType_IpV6);
} else if (has_text_range(&uriparser_uri->hostData.ipFuture)) {
value = zend_enum_get_case_by_id(php_uri_ce_rfc3986_uri_host_type, ZEND_ENUM_Uri_Rfc3986_UriHostType_IPvFuture);
value = zend_enum_get_case_by_id(php_uri_ce_rfc3986_uri_host_type, ZEND_ENUM_Uri_Rfc3986_UriHostType_IpVFuture);
} else {
value = zend_enum_get_case_by_id(php_uri_ce_rfc3986_uri_host_type, ZEND_ENUM_Uri_Rfc3986_UriHostType_RegisteredName);
}
Expand Down
4 changes: 2 additions & 2 deletions ext/uri/uri_parser_whatwg.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,10 +392,10 @@ ZEND_ATTRIBUTE_NONNULL void php_uri_parser_whatwg_host_type_read(const lxb_url_t
{
switch (lexbor_uri->host.type) {
case LXB_URL_HOST_TYPE_IPV4:
ZVAL_OBJ_COPY(retval, zend_enum_get_case_cstr(php_uri_ce_whatwg_url_host_type, "IPv4"));
ZVAL_OBJ_COPY(retval, zend_enum_get_case_cstr(php_uri_ce_whatwg_url_host_type, "IpV4"));
return;
case LXB_URL_HOST_TYPE_IPV6:
ZVAL_OBJ_COPY(retval, zend_enum_get_case_cstr(php_uri_ce_whatwg_url_host_type, "IPv6"));
ZVAL_OBJ_COPY(retval, zend_enum_get_case_cstr(php_uri_ce_whatwg_url_host_type, "IpV6"));
return;
case LXB_URL_HOST_TYPE_DOMAIN:
ZVAL_OBJ_COPY(retval, zend_enum_get_case_cstr(php_uri_ce_whatwg_url_host_type, "Domain"));
Expand Down
Loading