Merge branch 'PHP-8.5'

kocsismate · kocsismate · commit 858d34fd32dc · 2026-01-13T22:46:22.000+01:00
* PHP-8.5: Reorganize ext/uri tests - equivalence (php#20391)
diff --git a/ext/uri/tests/036.phpt b/ext/uri/tests/036.phpt
diff --git a/ext/uri/tests/rfc3986/equivalence/equals_false_host.phpt b/ext/uri/tests/rfc3986/equivalence/equals_false_host.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Test Uri\Rfc3986\Uri equivalence - returns false - host is different
+--FILE--
+<?php
+
+$uri1 = Uri\Rfc3986\Uri::parse("https://user:info@example.com:443/foo/bar?abc=123&def=ghi#hashmark");
+$uri2 = Uri\Rfc3986\Uri::parse("https://user:info@192.168.0.1:443/foo/bar?abc=123&def=ghi#hashmark");
+
+var_dump($uri1->equals($uri2));
+var_dump($uri2->equals($uri1));
+
+?>
+--EXPECT--
+bool(false)
+bool(false)
diff --git a/ext/uri/tests/rfc3986/equivalence/equals_false_path.phpt b/ext/uri/tests/rfc3986/equivalence/equals_false_path.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Test Uri\Rfc3986\Uri equivalence - returns false - path is different
+--FILE--
+<?php
+
+$uri1 = Uri\Rfc3986\Uri::parse("https://user:info@example.com:443/foo/bar?abc=123&def=ghi#hashmark");
+$uri2 = Uri\Rfc3986\Uri::parse("https://user:info@example.com:443/foo/bar/baz?abc=123&def=ghi#hashmark");
+
+var_dump($uri1->equals($uri2));
+var_dump($uri2->equals($uri1));
+
+?>
+--EXPECT--
+bool(false)
+bool(false)
diff --git a/ext/uri/tests/rfc3986/equivalence/equals_false_port.phpt b/ext/uri/tests/rfc3986/equivalence/equals_false_port.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Test Uri\Rfc3986\Uri equivalence - returns false - port is different
+--FILE--
+<?php
+
+$uri1 = Uri\Rfc3986\Uri::parse("https://user:info@example.com:443/foo/bar?abc=123&def=ghi#hashmark");
+$uri2 = Uri\Rfc3986\Uri::parse("https://user:info@example.com:442/foo/bar?abc=123&def=ghi#hashmark");
+
+var_dump($uri1->equals($uri2));
+var_dump($uri2->equals($uri1));
+
+?>
+--EXPECT--
+bool(false)
+bool(false)
diff --git a/ext/uri/tests/rfc3986/equivalence/equals_false_query.phpt b/ext/uri/tests/rfc3986/equivalence/equals_false_query.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Test Uri\Rfc3986\Uri equivalence - returns false - query is different
+--FILE--
+<?php
+
+$uri1 = Uri\Rfc3986\Uri::parse("https://user:info@example.com:443/foo/bar?abc=123&def=ghi#hashmark");
+$uri2 = Uri\Rfc3986\Uri::parse("https://user:info@example.com:443/foo/bar?abc=123#hashmark");
+
+var_dump($uri1->equals($uri2));
+var_dump($uri2->equals($uri1));
+
+?>
+--EXPECT--
+bool(false)
+bool(false)
diff --git a/ext/uri/tests/rfc3986/equivalence/equals_false_query2.phpt b/ext/uri/tests/rfc3986/equivalence/equals_false_query2.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Test Uri\Rfc3986\Uri equivalence - returns false - query differs in casing
+--FILE--
+<?php
+
+$uri1 = Uri\Rfc3986\Uri::parse("https://user:info@example.com:443/foo/bar?abc=123&def=ghi#hashmark");
+$uri2 = Uri\Rfc3986\Uri::parse("https://user:info@example.com:443/foo/bar?ABC=123&def=ghi#hashmark");
+
+var_dump($uri1->equals($uri2));
+var_dump($uri2->equals($uri1));
+
+?>
+--EXPECT--
+bool(false)
+bool(false)
diff --git a/ext/uri/tests/rfc3986/equivalence/equals_false_scheme.phpt b/ext/uri/tests/rfc3986/equivalence/equals_false_scheme.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Test Uri\Rfc3986\Uri equivalence - returns false - scheme is different
+--FILE--
+<?php
+
+$uri1 = Uri\Rfc3986\Uri::parse("https://user:info@example.com:443/foo/bar?abc=123&def=ghi#hashmark");
+$uri2 = Uri\Rfc3986\Uri::parse("http://user:info@example.com:443/foo/bar?abc=123&def=ghi#hashmark");
+
+var_dump($uri1->equals($uri2));
+var_dump($uri2->equals($uri1));
+
+?>
+--EXPECT--
+bool(false)
+bool(false)
diff --git a/ext/uri/tests/rfc3986/equivalence/equals_false_userinfo.phpt b/ext/uri/tests/rfc3986/equivalence/equals_false_userinfo.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Test Uri\Rfc3986\Uri equivalence - returns false - userinfo is different
+--FILE--
+<?php
+
+$uri1 = Uri\Rfc3986\Uri::parse("https://user:info@example.com:443/foo/bar?abc=123&def=ghi#hashmark");
+$uri2 = Uri\Rfc3986\Uri::parse("https://user@example.com:443/foo/bar?abc=123&def=ghi#hashmark");
+
+var_dump($uri1->equals($uri2));
+var_dump($uri2->equals($uri1));
+
+?>
+--EXPECT--
+bool(false)
+bool(false)
diff --git a/ext/uri/tests/rfc3986/equivalence/equals_fragment_different.phpt b/ext/uri/tests/rfc3986/equivalence/equals_fragment_different.phpt
@@ -0,0 +1,20 @@
+--TEST--
+Test Uri\Rfc3986\Uri equivalence - different fragment - include fragment variation
+--FILE--
+<?php
+
+$uri1 = Uri\Rfc3986\Uri::parse("https://user:info@example.com:443/foo/bar?abc=123&def=ghi#hashmark");
+$uri2 = Uri\Rfc3986\Uri::parse("https://user:info@example.com:443/foo/bar?abc=123&def=ghi#hash");
+
+var_dump($uri1->equals($uri2, Uri\UriComparisonMode::IncludeFragment));
+var_dump($uri2->equals($uri1, Uri\UriComparisonMode::IncludeFragment));
+
+var_dump($uri1->equals($uri2, Uri\UriComparisonMode::ExcludeFragment));
+var_dump($uri2->equals($uri1, Uri\UriComparisonMode::ExcludeFragment));
+
+?>
+--EXPECT--
+bool(false)
+bool(false)
+bool(true)
+bool(true)
diff --git a/ext/uri/tests/rfc3986/equivalence/equals_true_identical.phpt b/ext/uri/tests/rfc3986/equivalence/equals_true_identical.phpt
@@ -0,0 +1,20 @@
+--TEST--
+Test Uri\Rfc3986\Uri equivalence - returns true - identical URIs
+--FILE--
+<?php
+
+$uri1 = Uri\Rfc3986\Uri::parse("https://user:info@example.com:443/foo/bar?abc=123&def=ghi#hashmark");
+$uri2 = Uri\Rfc3986\Uri::parse("https://user:info@example.com:443/foo/bar?abc=123&def=ghi#hashmark");
+
+var_dump($uri1->equals($uri2, Uri\UriComparisonMode::IncludeFragment));
+var_dump($uri2->equals($uri1, Uri\UriComparisonMode::IncludeFragment));
+
+var_dump($uri1->equals($uri2, Uri\UriComparisonMode::ExcludeFragment));
+var_dump($uri2->equals($uri1, Uri\UriComparisonMode::ExcludeFragment));
+
+?>
+--EXPECT--
+bool(true)
+bool(true)
+bool(true)
+bool(true)
diff --git a/ext/uri/tests/rfc3986/equivalence/equals_true_normalization1.phpt b/ext/uri/tests/rfc3986/equivalence/equals_true_normalization1.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Test Uri\Rfc3986\Uri equivalence - returns true - after multiple normalization steps
+--FILE--
+<?php
+
+$uri1 = Uri\Rfc3986\Uri::parse("https://user:info@example%2ecom:443/foo/bar?abc=123&def=ghi#hashmark");
+$uri2 = Uri\Rfc3986\Uri::parse("HTTPS://user:info@EXAMPLE.COM:0443/../foo/b%61r?abc=123&def=ghi#hashmark");
+
+var_dump($uri1->equals($uri2));
+var_dump($uri2->equals($uri1));
+
+?>
+--EXPECT--
+bool(true)
+bool(true)
diff --git a/ext/uri/tests/rfc3986/equivalence/equals_true_normalization2.phpt b/ext/uri/tests/rfc3986/equivalence/equals_true_normalization2.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Test Uri\Rfc3986\Uri equivalence - returns true - after IPv6 normalization
+--FILE--
+<?php
+
+$uri1 = new Uri\Rfc3986\Uri("https://[2001:0db8:0001:0000:0000:0ab9:C0A8:0102]");
+$uri2 = new Uri\Rfc3986\Uri("https://[2001:DB8:1::AB9:C0A8:102]");
+
+var_dump($uri1->equals($uri2));
+var_dump($uri2->equals($uri1));
+
+?>
+--EXPECT--
+bool(true)
+bool(true)
diff --git a/ext/uri/tests/whatwg/equivalence/equals_false_host.phpt b/ext/uri/tests/whatwg/equivalence/equals_false_host.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Test Uri\WhatWg\Url equivalence - returns false - host is different
+--FILE--
+<?php
+
+$url1 = Uri\WhatWg\Url::parse("https://user:pass@example.com:443/foo/bar?abc=123&def=ghi#hashmark");
+$url2 = Uri\WhatWg\Url::parse("https://user:pass@192.168.0.1:443/foo/bar?abc=123&def=ghi#hashmark");
+
+var_dump($url1->equals($url2));
+var_dump($url2->equals($url1));
+
+?>
+--EXPECT--
+bool(false)
+bool(false)
diff --git a/ext/uri/tests/whatwg/equivalence/equals_false_password.phpt b/ext/uri/tests/whatwg/equivalence/equals_false_password.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Test Uri\WhatWg\Url equivalence - returns false - password is different
+--FILE--
+<?php
+
+$url1 = Uri\WhatWg\Url::parse("https://user:pass@example.com:443/foo/bar?abc=123&def=ghi#hashmark");
+$url2 = Uri\WhatWg\Url::parse("https://user:@example.com:443/foo/bar?abc=123&def=ghi#hashmark");
+
+var_dump($url1->equals($url2));
+var_dump($url2->equals($url1));
+
+?>
+--EXPECT--
+bool(false)
+bool(false)
diff --git a/ext/uri/tests/whatwg/equivalence/equals_false_path.phpt b/ext/uri/tests/whatwg/equivalence/equals_false_path.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Test Uri\WhatWg\Url equivalence - returns false - path is different
+--FILE--
+<?php
+
+$url1 = Uri\WhatWg\Url::parse("https://user:pass@example.com:443/foo/bar?abc=123&def=ghi#hashmark");
+$url2 = Uri\WhatWg\Url::parse("https://user:pass@example.com:443/foo/bar/baz?abc=123&def=ghi#hashmark");
+
+var_dump($url1->equals($url2));
+var_dump($url2->equals($url1));
+
+?>
+--EXPECT--
+bool(false)
+bool(false)
diff --git a/ext/uri/tests/whatwg/equivalence/equals_false_path_percent_encoded.phpt b/ext/uri/tests/whatwg/equivalence/equals_false_path_percent_encoded.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Test Uri\WhatWg\Url equivalence - returns false - path is not percent-decoded during normalization
+--FILE--
+<?php
+
+$url1 = new Uri\WhatWg\Url("https://example.com/foo/bar");
+$url2 = new Uri\WhatWg\Url("https://example.com/foo/b%61r");
+
+var_dump($url1->equals($url2));
+var_dump($url2->equals($url1));
+
+?>
+--EXPECT--
+bool(false)
+bool(false)
diff --git a/ext/uri/tests/whatwg/equivalence/equals_false_port.phpt b/ext/uri/tests/whatwg/equivalence/equals_false_port.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Test Uri\WhatWg\Url equivalence - returns false - port is different
+--FILE--
+<?php
+
+$url1 = Uri\WhatWg\Url::parse("https://user:pass@example.com:443/foo/bar?abc=123&def=ghi#hashmark");
+$url2 = Uri\WhatWg\Url::parse("https://user:pass@example.com:442/foo/bar?abc=123&def=ghi#hashmark");
+
+var_dump($url1->equals($url2));
+var_dump($url2->equals($url1));
+
+?>
+--EXPECT--
+bool(false)
+bool(false)
diff --git a/ext/uri/tests/whatwg/equivalence/equals_false_query.phpt b/ext/uri/tests/whatwg/equivalence/equals_false_query.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Test Uri\WhatWg\Url equivalence - returns false - query is different
+--FILE--
+<?php
+
+$url1 = Uri\WhatWg\Url::parse("https://user:pass@example.com:443/foo/bar?abc=123&def=ghi#hashmark");
+$url2 = Uri\WhatWg\Url::parse("https://user:pass@example.com:443/foo/bar?abc=123#hashmark");
+
+var_dump($url1->equals($url2));
+var_dump($url2->equals($url1));
+
+?>
+--EXPECT--
+bool(false)
+bool(false)
diff --git a/ext/uri/tests/whatwg/equivalence/equals_false_query2.phpt b/ext/uri/tests/whatwg/equivalence/equals_false_query2.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Test Uri\WhatWg\Url equivalence - returns false - query differs in casing
+--FILE--
+<?php
+
+$url1 = Uri\WhatWg\Url::parse("https://user:pass@example.com:443/foo/bar?abc=123&def=ghi#hashmark");
+$url2 = Uri\WhatWg\Url::parse("https://user:pass@example.com:443/foo/bar?ABC=123&def=ghi#hashmark");
+
+var_dump($url1->equals($url2));
+var_dump($url2->equals($url1));
+
+?>
+--EXPECT--
+bool(false)
+bool(false)
diff --git a/ext/uri/tests/whatwg/equivalence/equals_false_user.phpt b/ext/uri/tests/whatwg/equivalence/equals_false_user.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Test Uri\WhatWg\Url equivalence - returns false - user is different
+--FILE--
+<?php
+
+$url1 = Uri\WhatWg\Url::parse("https://user:pass@example.com:443/foo/bar?abc=123&def=ghi#hashmark");
+$url2 = Uri\WhatWg\Url::parse("https://usr:pass@example.com:443/foo/bar?abc=123&def=ghi#hashmark");
+
+var_dump($url1->equals($url2));
+var_dump($url2->equals($url1));
+
+?>
+--EXPECT--
+bool(false)
+bool(false)
diff --git a/ext/uri/tests/whatwg/equivalence/equals_fragment_different.phpt b/ext/uri/tests/whatwg/equivalence/equals_fragment_different.phpt
@@ -0,0 +1,20 @@
+--TEST--
+Test Uri\WhatWg\Url equivalence - different fragment - include fragment variation
+--FILE--
+<?php
+
+$url1 = Uri\WhatWg\Url::parse("https://user:info@example.com:443/foo/bar?abc=123&def=ghi#hashmark");
+$url2 = Uri\WhatWg\Url::parse("https://user:info@example.com:443/foo/bar?abc=123&def=ghi#hash");
+
+var_dump($url1->equals($url2, Uri\UriComparisonMode::IncludeFragment));
+var_dump($url2->equals($url1, Uri\UriComparisonMode::IncludeFragment));
+
+var_dump($url1->equals($url2, Uri\UriComparisonMode::ExcludeFragment));
+var_dump($url2->equals($url1, Uri\UriComparisonMode::ExcludeFragment));
+
+?>
+--EXPECT--
+bool(false)
+bool(false)
+bool(true)
+bool(true)
diff --git a/ext/uri/tests/whatwg/equivalence/equals_true_identical.phpt b/ext/uri/tests/whatwg/equivalence/equals_true_identical.phpt
@@ -0,0 +1,20 @@
+--TEST--
+Test Uri\WhatWg\Url equivalence - returns true - identical URIs
+--FILE--
+<?php
+
+$url1 = Uri\WhatWg\Url::parse("https://user:info@example.com:443/foo/bar?abc=123&def=ghi#hashmark");
+$url2 = Uri\WhatWg\Url::parse("https://user:info@example.com:443/foo/bar?abc=123&def=ghi#hashmark");
+
+var_dump($url1->equals($url2, Uri\UriComparisonMode::IncludeFragment));
+var_dump($url2->equals($url1, Uri\UriComparisonMode::IncludeFragment));
+
+var_dump($url1->equals($url2, Uri\UriComparisonMode::ExcludeFragment));
+var_dump($url2->equals($url1, Uri\UriComparisonMode::ExcludeFragment));
+
+?>
+--EXPECT--
+bool(true)
+bool(true)
+bool(true)
+bool(true)
diff --git a/ext/uri/tests/whatwg/equivalence/equals_true_normalization1.phpt b/ext/uri/tests/whatwg/equivalence/equals_true_normalization1.phpt
diff --git a/ext/uri/tests/whatwg/equivalence/equals_true_normalization2.phpt b/ext/uri/tests/whatwg/equivalence/equals_true_normalization2.phpt
diff --git a/ext/uri/tests/whatwg/equivalence/equals_true_normalization3.phpt b/ext/uri/tests/whatwg/equivalence/equals_true_normalization3.phpt
