Improve tests

kocsismate · kocsismate · commit 7f1c8434c0e7 · 2026-06-23T09:04:48.000+02:00
diff --git a/ext/uri/tests/rfc3986/builder/all_success_with_reset.phpt b/ext/uri/tests/rfc3986/builder/all_success_with_reset.phpt
@@ -15,11 +15,13 @@ $uri = $builder->build();
 
 var_dump($uri->toRawString());
 var_dump($uri);
+var_dump($uri->equals(new Uri\Rfc3986\Uri($uri->toRawString())));
 
 $uri = $builder->reset()->build();
 
 var_dump($uri->toRawString());
 var_dump($uri);
+var_dump($uri->equals(new Uri\Rfc3986\Uri($uri->toRawString())));
 
 ?>
 --EXPECTF--
@@ -42,6 +44,7 @@ object(Uri\Rfc3986\Uri)#%d (%d) {
   ["fragment"]=>
   string(8) "fragment"
 }
+bool(true)
 string(0) ""
 object(Uri\Rfc3986\Uri)#%d (%d) {
   ["scheme"]=>
@@ -61,3 +64,4 @@ object(Uri\Rfc3986\Uri)#%d (%d) {
   ["fragment"]=>
   NULL
 }
+bool(true)
diff --git a/ext/uri/tests/rfc3986/builder/basic_success_with_base.phpt b/ext/uri/tests/rfc3986/builder/basic_success_with_base.phpt
@@ -9,6 +9,7 @@ $uri = $builder->build(new Uri\Rfc3986\Uri("https://example.com"));
 
 var_dump($uri->toRawString());
 var_dump($uri);
+var_dump($uri->equals(new Uri\Rfc3986\Uri($uri->toRawString())));
 
 ?>
 --EXPECTF--
@@ -31,3 +32,4 @@ object(Uri\Rfc3986\Uri)#%d (%d) {
   ["fragment"]=>
   NULL
 }
+bool(true)
diff --git a/ext/uri/tests/rfc3986/builder/fragment_success_basic.phpt b/ext/uri/tests/rfc3986/builder/fragment_success_basic.phpt
@@ -0,0 +1,35 @@
+--TEST--
+Test Uri\Rfc3986\UriBuilder::setFragment() - success - basic
+--FILE--
+<?php
+
+$builder = new Uri\Rfc3986\UriBuilder();
+$builder->setFragment("foo");
+$uri = $builder->build();
+
+var_dump($uri->toRawString());
+var_dump($uri);
+var_dump($uri->equals(new Uri\Rfc3986\Uri($uri->toRawString())));
+
+?>
+--EXPECTF--
+string(4) "#foo"
+object(Uri\Rfc3986\Uri)#%d (%d) {
+  ["scheme"]=>
+  NULL
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  NULL
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(0) ""
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  string(3) "foo"
+}
+bool(true)
diff --git a/ext/uri/tests/rfc3986/builder/fragment_success_null.phpt b/ext/uri/tests/rfc3986/builder/fragment_success_null.phpt
@@ -0,0 +1,36 @@
+--TEST--
+Test Uri\Rfc3986\UriBuilder::setFragment() - success - null
+--FILE--
+<?php
+
+$builder = new Uri\Rfc3986\UriBuilder();
+$builder->setFragment("foo");
+$builder->setFragment(null);
+$uri = $builder->build();
+
+var_dump($uri->toRawString());
+var_dump($uri);
+var_dump($uri->equals(new Uri\Rfc3986\Uri($uri->toRawString())));
+
+?>
+--EXPECTF--
+string(0) ""
+object(Uri\Rfc3986\Uri)#%d (%d) {
+  ["scheme"]=>
+  NULL
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  NULL
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(0) ""
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+bool(true)
diff --git a/ext/uri/tests/rfc3986/builder/host_success_ip4_to_regname.phpt b/ext/uri/tests/rfc3986/builder/host_success_ip4_to_regname.phpt
@@ -8,11 +8,14 @@ $builder->setHost("192.168.%30.1");
 $uri = $builder->build();
 
 var_dump($uri->toRawString());
+var_dump($uri->getHostType());
 var_dump($uri);
+var_dump($uri->equals(new Uri\Rfc3986\Uri($uri->toRawString())));
 
 ?>
 --EXPECTF--
 string(15) "//192.168.%30.1"
+enum(Uri\Rfc3986\UriHostType::RegisteredName)
 object(Uri\Rfc3986\Uri)#%d (%d) {
   ["scheme"]=>
   NULL
@@ -31,3 +34,4 @@ object(Uri\Rfc3986\Uri)#%d (%d) {
   ["fragment"]=>
   NULL
 }
+bool(true)
diff --git a/ext/uri/tests/rfc3986/builder/host_success_ipv4.phpt b/ext/uri/tests/rfc3986/builder/host_success_ipv4.phpt
@@ -9,6 +9,7 @@ $uri = $builder->build();
 
 var_dump($uri->toRawString());
 var_dump($uri);
+var_dump($uri->equals(new Uri\Rfc3986\Uri($uri->toRawString())));
 
 ?>
 --EXPECTF--
@@ -31,3 +32,4 @@ object(Uri\Rfc3986\Uri)#%d (%d) {
   ["fragment"]=>
   NULL
 }
+bool(true)
diff --git a/ext/uri/tests/rfc3986/builder/host_success_ipv6.phpt b/ext/uri/tests/rfc3986/builder/host_success_ipv6.phpt
@@ -9,6 +9,7 @@ $uri = $builder->build();
 
 var_dump($uri->toRawString());
 var_dump($uri);
+var_dump($uri->equals(new Uri\Rfc3986\Uri($uri->toRawString())));
 
 ?>
 --EXPECTF--
@@ -31,3 +32,4 @@ object(Uri\Rfc3986\Uri)#%d (%d) {
   ["fragment"]=>
   NULL
 }
+bool(true)
diff --git a/ext/uri/tests/rfc3986/builder/host_success_ipvfuture.phpt b/ext/uri/tests/rfc3986/builder/host_success_ipvfuture.phpt
@@ -9,6 +9,7 @@ $uri = $builder->build();
 
 var_dump($uri->toRawString());
 var_dump($uri);
+var_dump($uri->equals(new Uri\Rfc3986\Uri($uri->toRawString())));
 
 ?>
 --EXPECTF--
@@ -31,3 +32,4 @@ object(Uri\Rfc3986\Uri)#%d (%d) {
   ["fragment"]=>
   NULL
 }
+bool(true)
diff --git a/ext/uri/tests/rfc3986/builder/host_success_null.phpt b/ext/uri/tests/rfc3986/builder/host_success_null.phpt
@@ -4,6 +4,7 @@ Test Uri\Rfc3986\UriBuilder::setHost() - success - null
 <?php
 
 $builder = new Uri\Rfc3986\UriBuilder();
+$builder->setHost("example.com");
 $builder->setHost(null);
 $uri = $builder->build();
 
diff --git a/ext/uri/tests/rfc3986/builder/host_success_regname.phpt b/ext/uri/tests/rfc3986/builder/host_success_regname.phpt
@@ -9,6 +9,7 @@ $uri = $builder->build();
 
 var_dump($uri->toRawString());
 var_dump($uri);
+var_dump($uri->equals(new Uri\Rfc3986\Uri($uri->toRawString())));
 
 ?>
 --EXPECTF--
@@ -31,3 +32,4 @@ object(Uri\Rfc3986\Uri)#%d (%d) {
   ["fragment"]=>
   NULL
 }
+bool(true)
diff --git a/ext/uri/tests/rfc3986/builder/path_error_first_segment_colon.phpt b/ext/uri/tests/rfc3986/builder/path_error_first_segment_colon.phpt
@@ -14,4 +14,4 @@ try {
 
 ?>
 --EXPECT--
-Uri\InvalidUriException: The path must not begin with ":" when the URI doesn't contain a scheme
+Uri\InvalidUriException: The path must not begin with ":" when the URI does not contain a scheme
diff --git a/ext/uri/tests/rfc3986/builder/path_error_leading_double_slash.phpt b/ext/uri/tests/rfc3986/builder/path_error_leading_double_slash.phpt
@@ -14,4 +14,4 @@ try {
 
 ?>
 --EXPECT--
-Uri\InvalidUriException: The path must not begin with "//" when the URI doesn't contain a host
+Uri\InvalidUriException: The path must not begin with "//" when the URI does not contain a host
diff --git a/ext/uri/tests/rfc3986/builder/path_success_empty_string.phpt b/ext/uri/tests/rfc3986/builder/path_success_empty_string.phpt
@@ -9,6 +9,7 @@ $uri = $builder->build();
 
 var_dump($uri->toRawString());
 var_dump($uri);
+var_dump($uri->equals(new Uri\Rfc3986\Uri($uri->toRawString())));
 
 ?>
 --EXPECTF--
@@ -31,3 +32,4 @@ object(Uri\Rfc3986\Uri)#%d (%d) {
   ["fragment"]=>
   NULL
 }
+bool(true)
diff --git a/ext/uri/tests/rfc3986/builder/path_success_first_segment_colon.phpt b/ext/uri/tests/rfc3986/builder/path_success_first_segment_colon.phpt
@@ -10,6 +10,7 @@ $uri = $builder->build();
 
 var_dump($uri->toRawString());
 var_dump($uri);
+var_dump($uri->equals(new Uri\Rfc3986\Uri($uri->toRawString())));
 
 ?>
 --EXPECTF--
@@ -32,3 +33,4 @@ object(Uri\Rfc3986\Uri)#%d (%d) {
   ["fragment"]=>
   NULL
 }
+bool(true)
diff --git a/ext/uri/tests/rfc3986/builder/path_success_leading_double_slash.phpt b/ext/uri/tests/rfc3986/builder/path_success_leading_double_slash.phpt
@@ -10,6 +10,7 @@ $uri = $builder->build();
 
 var_dump($uri->toRawString());
 var_dump($uri);
+var_dump($uri->equals(new Uri\Rfc3986\Uri($uri->toRawString())));
 
 ?>
 --EXPECTF--
@@ -31,4 +32,5 @@ object(Uri\Rfc3986\Uri)#%d (%d) {
   NULL
   ["fragment"]=>
   NULL
-}
+}
+bool(true)
diff --git a/ext/uri/tests/rfc3986/builder/port_success_large.phpt b/ext/uri/tests/rfc3986/builder/port_success_large.phpt
@@ -10,6 +10,7 @@ $uri = $builder->build();
 
 var_dump($uri->toRawString());
 var_dump($uri);
+var_dump($uri->equals(new Uri\Rfc3986\Uri($uri->toRawString())));
 
 ?>
 --EXPECTF--
@@ -32,3 +33,4 @@ object(Uri\Rfc3986\Uri)#%d (%d) {
   ["fragment"]=>
   NULL
 }
+bool(true)
diff --git a/ext/uri/tests/rfc3986/builder/port_success_null.phpt b/ext/uri/tests/rfc3986/builder/port_success_null.phpt
@@ -4,11 +4,13 @@ Test Uri\Rfc3986\UriBuilder::setPort() - success - null
 <?php
 
 $builder = new Uri\Rfc3986\UriBuilder();
+$builder->setPort(433);
 $builder->setPort(null);
 $uri = $builder->build();
 
 var_dump($uri->toRawString());
 var_dump($uri);
+var_dump($uri->equals(new Uri\Rfc3986\Uri($uri->toRawString())));
 
 ?>
 --EXPECTF--
@@ -31,3 +33,4 @@ object(Uri\Rfc3986\Uri)#%d (%d) {
   ["fragment"]=>
   NULL
 }
+bool(true)
diff --git a/ext/uri/tests/rfc3986/builder/query_success_basic.phpt b/ext/uri/tests/rfc3986/builder/query_success_basic.phpt
@@ -9,11 +9,12 @@ $uri = $builder->build();
 
 var_dump($uri->toRawString());
 var_dump($uri);
+var_dump($uri->equals(new Uri\Rfc3986\Uri($uri->toRawString())));
 
 ?>
 --EXPECTF--
 string(14) "?foo=1&bar=baz"
-object(Uri\Rfc3986\Uri)#2 (8) {
+object(Uri\Rfc3986\Uri)#%d (%d) {
   ["scheme"]=>
   NULL
   ["username"]=>
@@ -31,3 +32,4 @@ object(Uri\Rfc3986\Uri)#2 (8) {
   ["fragment"]=>
   NULL
 }
+bool(true)
diff --git a/ext/uri/tests/rfc3986/builder/query_success_null.phpt b/ext/uri/tests/rfc3986/builder/query_success_null.phpt
@@ -0,0 +1,36 @@
+--TEST--
+Test Uri\Rfc3986\UriBuilder::setQuery() - success - null
+--FILE--
+<?php
+
+$builder = new Uri\Rfc3986\UriBuilder();
+$builder->setQuery("foo");
+$builder->setQuery(null);
+$uri = $builder->build();
+
+var_dump($uri->toRawString());
+var_dump($uri);
+var_dump($uri->equals(new Uri\Rfc3986\Uri($uri->toRawString())));
+
+?>
+--EXPECTF--
+string(0) ""
+object(Uri\Rfc3986\Uri)#%d (%d) {
+  ["scheme"]=>
+  NULL
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
+  ["host"]=>
+  NULL
+  ["port"]=>
+  NULL
+  ["path"]=>
+  string(0) ""
+  ["query"]=>
+  NULL
+  ["fragment"]=>
+  NULL
+}
+bool(true)
diff --git a/ext/uri/tests/rfc3986/builder/scheme_success_basic.phpt b/ext/uri/tests/rfc3986/builder/scheme_success_basic.phpt
@@ -9,6 +9,7 @@ $uri = $builder->build();
 
 var_dump($uri->toRawString());
 var_dump($uri);
+var_dump($uri->equals(new Uri\Rfc3986\Uri($uri->toRawString())));
 
 ?>
 --EXPECTF--
@@ -31,3 +32,4 @@ object(Uri\Rfc3986\Uri)#%d (%d) {
   ["fragment"]=>
   NULL
 }
+bool(true)
diff --git a/ext/uri/tests/rfc3986/builder/scheme_success_null.phpt b/ext/uri/tests/rfc3986/builder/scheme_success_null.phpt
@@ -4,11 +4,13 @@ Test Uri\Rfc3986\UriBuilder::setScheme() - success - null
 <?php
 
 $builder = new Uri\Rfc3986\UriBuilder();
+$builder->setScheme("https");
 $builder->setScheme(null);
 $uri = $builder->build();
 
 var_dump($uri->toRawString());
 var_dump($uri);
+var_dump($uri->equals(new Uri\Rfc3986\Uri($uri->toRawString())));
 
 ?>
 --EXPECTF--
@@ -31,3 +33,4 @@ object(Uri\Rfc3986\Uri)#%d (%d) {
   ["fragment"]=>
   NULL
 }
+bool(true)
diff --git a/ext/uri/tests/rfc3986/builder/scheme_success_special.phpt b/ext/uri/tests/rfc3986/builder/scheme_success_special.phpt
@@ -9,6 +9,7 @@ $uri = $builder->build();
 
 var_dump($uri->toRawString());
 var_dump($uri);
+var_dump($uri->equals(new Uri\Rfc3986\Uri($uri->toRawString())));
 
 ?>
 --EXPECTF--
@@ -31,3 +32,4 @@ object(Uri\Rfc3986\Uri)#%d (%d) {
   ["fragment"]=>
   NULL
 }
+bool(true)
diff --git a/ext/uri/tests/rfc3986/builder/userinfo_success_null.phpt b/ext/uri/tests/rfc3986/builder/userinfo_success_null.phpt
@@ -4,11 +4,13 @@ Test Uri\Rfc3986\UriBuilder::setUserInfo() - success - null
 <?php
 
 $builder = new Uri\Rfc3986\UriBuilder();
+$builder->setUserInfo("user:pass");
 $builder->setUserInfo(null);
 $uri = $builder->build();
 
 var_dump($uri->toRawString());
 var_dump($uri);
+var_dump($uri->equals(new Uri\Rfc3986\Uri($uri->toRawString())));
 
 ?>
 --EXPECTF--
@@ -31,3 +33,4 @@ object(Uri\Rfc3986\Uri)#%d (%d) {
   ["fragment"]=>
   NULL
 }
+bool(true)
diff --git a/ext/uri/uri_parser_rfc3986.c b/ext/uri/uri_parser_rfc3986.c
