Implement "Followup improvements for ext/uri" RFC - Host type detection (#22100)

RFC: https://wiki.php.net/rfc/uri_followup#host_type_detection

Author: kocsismate

NEWS

@@ -244,6 +244,8 @@ PHP                                                                        NEWS
 - URI:
   . Added Uri\Rfc3986\Uri:getUriType() and Uri\WhatWg\Url:isSpecialScheme().
     (kocsismate)
+  . Added Uri\Rfc3986\Uri:getHostType() and Uri\WhatWg\Url:getHostType().
+    (kocsismate)
 
 - Zip:
   . Fixed ZipArchive callback being called after executor has shut down.

UPGRADING

@@ -214,6 +214,8 @@ PHP 8.6 UPGRADE NOTES
 - URI:
   . Added Uri\Rfc3986\Uri:getUriType() and Uri\WhatWg\Url:isSpecialScheme().
     RFC: https://wiki.php.net/rfc/uri_followup#uri_type_detection
+  . Added Uri\Rfc3986\Uri:getHostType() and Uri\WhatWg\Url:getHostType().
+    RFC: https://wiki.php.net/rfc/uri_followup#host_type_detection
 
 ========================================
 3. Changes in SAPI modules

ext/uri/php_uri.c

@@ -32,11 +32,13 @@
 
 zend_class_entry *php_uri_ce_rfc3986_uri;
 zend_class_entry *php_uri_ce_rfc3986_uri_type;
+zend_class_entry *php_uri_ce_rfc3986_uri_host_type;
 zend_class_entry *php_uri_ce_whatwg_url;
 zend_class_entry *php_uri_ce_comparison_mode;
 zend_class_entry *php_uri_ce_exception;
 zend_class_entry *php_uri_ce_error;
 zend_class_entry *php_uri_ce_invalid_uri_exception;
+zend_class_entry *php_uri_ce_whatwg_url_host_type;
 zend_class_entry *php_uri_ce_whatwg_invalid_url_exception;
 zend_class_entry *php_uri_ce_whatwg_url_validation_error_type;
 zend_class_entry *php_uri_ce_whatwg_url_validation_error;
@@ -622,6 +624,16 @@ PHP_METHOD(Uri_Rfc3986_Uri, getRawHost)
 	php_uri_property_read_helper(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_URI_PROPERTY_NAME_HOST, PHP_URI_COMPONENT_READ_MODE_RAW);
 }
 
+PHP_METHOD(Uri_Rfc3986_Uri, getHostType)
+{
+	ZEND_PARSE_PARAMETERS_NONE();
+
+	php_uri_object *uri_object = Z_URI_OBJECT_P(ZEND_THIS);
+	ZEND_ASSERT(uri_object->uri != NULL);
+
+	php_uri_parser_rfc3986_host_type_read(uri_object->uri, return_value);
+}
+
 PHP_METHOD(Uri_Rfc3986_Uri, withHost)
 {
 	php_uri_property_write_str_or_null_helper(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_URI_PROPERTY_NAME_HOST);
@@ -924,6 +936,16 @@ PHP_METHOD(Uri_WhatWg_Url, getUnicodeHost)
 	php_uri_property_read_helper(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_URI_PROPERTY_NAME_HOST, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_UNICODE);
 }
 
+PHP_METHOD(Uri_WhatWg_Url, getHostType)
+{
+	ZEND_PARSE_PARAMETERS_NONE();
+
+	php_uri_object *uri_object = Z_URI_OBJECT_P(ZEND_THIS);
+	ZEND_ASSERT(uri_object->uri != NULL);
+
+	php_uri_parser_whatwg_host_type_read(uri_object->uri, return_value);
+}
+
 PHP_METHOD(Uri_WhatWg_Url, getFragment)
 {
 	php_uri_property_read_helper(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_URI_PROPERTY_NAME_FRAGMENT, PHP_URI_COMPONENT_READ_MODE_NORMALIZED_UNICODE);
@@ -1100,6 +1122,7 @@ static PHP_MINIT_FUNCTION(uri)
 	object_handlers_rfc3986_uri.clone_obj = php_uri_object_handler_clone;
 
 	php_uri_ce_rfc3986_uri_type = register_class_Uri_Rfc3986_UriType();
+	php_uri_ce_rfc3986_uri_host_type = register_class_Uri_Rfc3986_UriHostType();
 
 	php_uri_ce_whatwg_url = register_class_Uri_WhatWg_Url();
 	php_uri_ce_whatwg_url->create_object = php_uri_object_create_whatwg;
@@ -1114,6 +1137,7 @@ static PHP_MINIT_FUNCTION(uri)
 	php_uri_ce_error = register_class_Uri_UriError(zend_ce_error);
 	php_uri_ce_invalid_uri_exception = register_class_Uri_InvalidUriException(php_uri_ce_exception);
 	php_uri_ce_whatwg_invalid_url_exception = register_class_Uri_WhatWg_InvalidUrlException(php_uri_ce_invalid_uri_exception);
+	php_uri_ce_whatwg_url_host_type = register_class_Uri_WhatWg_UrlHostType();
 	php_uri_ce_whatwg_url_validation_error = register_class_Uri_WhatWg_UrlValidationError();
 	php_uri_ce_whatwg_url_validation_error_type = register_class_Uri_WhatWg_UrlValidationErrorType();
 

ext/uri/php_uri.stub.php

@@ -37,6 +37,14 @@ enum UriType
         case Uri;
     }
 
+    enum UriHostType
+    {
+        case IPv4;
+        case IPv6;
+        case IPvFuture;
+        case RegisteredName;
+    }
+
     /** @strict-properties */
     final readonly class Uri
     {
@@ -70,6 +78,8 @@ public function getHost(): ?string {}
 
         public function getRawHost(): ?string {}
 
+        public function getHostType(): ?\Uri\Rfc3986\UriHostType {}
+
         public function withHost(?string $host): static {}
 
         public function getPort(): ?int {}
@@ -162,6 +172,15 @@ enum UrlValidationErrorType
         public function __construct(string $context, \Uri\WhatWg\UrlValidationErrorType $type, bool $failure) {}
     }
 
+    enum UrlHostType
+    {
+        case IPv4;
+        case IPv6;
+        case Domain;
+        case Opaque;
+        case Empty;
+    }
+
     /** @strict-properties */
     final readonly class Url
     {
@@ -191,6 +210,8 @@ public function getAsciiHost(): ?string {}
 
         public function getUnicodeHost(): ?string {}
 
+        public function getHostType(): ?\Uri\WhatWg\UrlHostType {}
+
         /** @implementation-alias Uri\Rfc3986\Uri::withHost */
         public function withHost(?string $host): static {}
 

ext/uri/php_uri_arginfo.h

@@ -19,6 +19,7 @@
 
 extern zend_class_entry *php_uri_ce_rfc3986_uri;
 extern zend_class_entry *php_uri_ce_rfc3986_uri_type;
+extern zend_class_entry *php_uri_ce_rfc3986_uri_host_type;
 extern zend_class_entry *php_uri_ce_whatwg_url;
 extern zend_class_entry *php_uri_ce_comparison_mode;
 extern zend_class_entry *php_uri_ce_exception;
@@ -27,6 +28,7 @@ extern zend_class_entry *php_uri_ce_invalid_uri_exception;
 extern zend_class_entry *php_uri_ce_whatwg_invalid_url_exception;
 extern zend_class_entry *php_uri_ce_whatwg_url_validation_error_type;
 extern zend_class_entry *php_uri_ce_whatwg_url_validation_error;
+extern zend_class_entry *php_uri_ce_whatwg_url_host_type;
 
 typedef enum php_uri_recomposition_mode {
 	PHP_URI_RECOMPOSITION_MODE_RAW_ASCII,

ext/uri/php_uri_common.h

@@ -0,0 +1,12 @@
+--TEST--
+Test Uri\Rfc3986\Uri component retrieval - host type - IP future
+--FILE--
+<?php
+
+$uri = Uri\Rfc3986\Uri::parse("https://[vF.addr]");
+
+var_dump($uri->getHostType());
+
+?>
+--EXPECT--
+enum(Uri\Rfc3986\UriHostType::IPvFuture)

ext/uri/php_uri_decl.h

@@ -0,0 +1,12 @@
+--TEST--
+Test Uri\Rfc3986\Uri component retrieval - host type - IPv4
+--FILE--
+<?php
+
+$uri = Uri\Rfc3986\Uri::parse("https://192.168.0.1");
+
+var_dump($uri->getHostType());
+
+?>
+--EXPECT--
+enum(Uri\Rfc3986\UriHostType::IPv4)

ext/uri/tests/rfc3986/getters/host_type_success_ip_future.phpt

@@ -0,0 +1,12 @@
+--TEST--
+Test Uri\Rfc3986\Uri component retrieval - host type - IPv6
+--FILE--
+<?php
+
+$uri = Uri\Rfc3986\Uri::parse("https://[2001:0db8:3333:4444:5555:6666:7777:8888]");
+
+var_dump($uri->getHostType());
+
+?>
+--EXPECT--
+enum(Uri\Rfc3986\UriHostType::IPv6)