From 8c662f712a8e167750e79394352a1dec3bb5a190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= Date: Tue, 4 Nov 2025 21:24:14 +0100 Subject: [PATCH 1/2] Reorganize ext/uri tests - equivalence --- ext/uri/tests/036.phpt | 39 ------------------- .../equivalence/equals_false_all1.phpt | 15 +++++++ .../equivalence/equals_false_all2.phpt | 15 +++++++ .../equivalence/equals_false_all3.phpt | 15 +++++++ .../equivalence/equals_false_all4.phpt | 15 +++++++ .../equivalence/equals_false_all5.phpt | 15 +++++++ .../equivalence/equals_false_all6.phpt | 15 +++++++ .../equivalence/equals_false_all7.phpt | 15 +++++++ .../equivalence/equals_false_all8.phpt | 15 +++++++ .../equals_false_exclude_fragment.phpt | 15 +++++++ .../equals_false_include_fragment.phpt | 15 +++++++ .../equals_true_exclude_fragment.phpt | 15 +++++++ .../equivalence/equals_true_fragment.phpt | 15 +++++++ .../equivalence/equals_true_identical.phpt | 15 +++++++ .../equals_true_include_fragment.phpt | 15 +++++++ .../equals_true_normalization1.phpt | 15 +++++++ .../equals_true_normalization2.phpt | 15 +++++++ .../equals_true_normalization3.phpt | 15 +++++++ .../equals_true_normalization4.phpt | 15 +++++++ .../equals_true_normalization5.phpt | 15 +++++++ .../whatwg/equivalence/equals_false_all1.phpt | 15 +++++++ .../whatwg/equivalence/equals_false_all2.phpt | 15 +++++++ .../whatwg/equivalence/equals_false_all3.phpt | 15 +++++++ .../whatwg/equivalence/equals_false_all4.phpt | 15 +++++++ .../whatwg/equivalence/equals_false_all5.phpt | 15 +++++++ .../whatwg/equivalence/equals_false_all6.phpt | 15 +++++++ .../whatwg/equivalence/equals_false_all7.phpt | 15 +++++++ .../whatwg/equivalence/equals_false_all8.phpt | 15 +++++++ .../equals_false_exclude_fragment.phpt | 15 +++++++ .../equals_false_include_fragment.phpt | 15 +++++++ .../equals_false_percent_encoded_path.phpt | 15 +++++++ .../equals_true_exclude_fragment.phpt | 15 +++++++ .../equivalence/equals_true_fragment.phpt | 15 +++++++ .../equivalence/equals_true_identical.phpt | 15 +++++++ .../equals_true_include_fragment.phpt | 15 +++++++ .../equals_true_normalization1.phpt | 15 +++++++ .../equals_true_normalization2.phpt | 15 +++++++ .../equals_true_normalization3.phpt | 15 +++++++ .../equals_true_normalization4.phpt | 15 +++++++ .../equals_true_normalization5.phpt | 15 +++++++ 40 files changed, 585 insertions(+), 39 deletions(-) delete mode 100644 ext/uri/tests/036.phpt create mode 100644 ext/uri/tests/rfc3986/equivalence/equals_false_all1.phpt create mode 100644 ext/uri/tests/rfc3986/equivalence/equals_false_all2.phpt create mode 100644 ext/uri/tests/rfc3986/equivalence/equals_false_all3.phpt create mode 100644 ext/uri/tests/rfc3986/equivalence/equals_false_all4.phpt create mode 100644 ext/uri/tests/rfc3986/equivalence/equals_false_all5.phpt create mode 100644 ext/uri/tests/rfc3986/equivalence/equals_false_all6.phpt create mode 100644 ext/uri/tests/rfc3986/equivalence/equals_false_all7.phpt create mode 100644 ext/uri/tests/rfc3986/equivalence/equals_false_all8.phpt create mode 100644 ext/uri/tests/rfc3986/equivalence/equals_false_exclude_fragment.phpt create mode 100644 ext/uri/tests/rfc3986/equivalence/equals_false_include_fragment.phpt create mode 100644 ext/uri/tests/rfc3986/equivalence/equals_true_exclude_fragment.phpt create mode 100644 ext/uri/tests/rfc3986/equivalence/equals_true_fragment.phpt create mode 100644 ext/uri/tests/rfc3986/equivalence/equals_true_identical.phpt create mode 100644 ext/uri/tests/rfc3986/equivalence/equals_true_include_fragment.phpt create mode 100644 ext/uri/tests/rfc3986/equivalence/equals_true_normalization1.phpt create mode 100644 ext/uri/tests/rfc3986/equivalence/equals_true_normalization2.phpt create mode 100644 ext/uri/tests/rfc3986/equivalence/equals_true_normalization3.phpt create mode 100644 ext/uri/tests/rfc3986/equivalence/equals_true_normalization4.phpt create mode 100644 ext/uri/tests/rfc3986/equivalence/equals_true_normalization5.phpt create mode 100644 ext/uri/tests/whatwg/equivalence/equals_false_all1.phpt create mode 100644 ext/uri/tests/whatwg/equivalence/equals_false_all2.phpt create mode 100644 ext/uri/tests/whatwg/equivalence/equals_false_all3.phpt create mode 100644 ext/uri/tests/whatwg/equivalence/equals_false_all4.phpt create mode 100644 ext/uri/tests/whatwg/equivalence/equals_false_all5.phpt create mode 100644 ext/uri/tests/whatwg/equivalence/equals_false_all6.phpt create mode 100644 ext/uri/tests/whatwg/equivalence/equals_false_all7.phpt create mode 100644 ext/uri/tests/whatwg/equivalence/equals_false_all8.phpt create mode 100644 ext/uri/tests/whatwg/equivalence/equals_false_exclude_fragment.phpt create mode 100644 ext/uri/tests/whatwg/equivalence/equals_false_include_fragment.phpt create mode 100644 ext/uri/tests/whatwg/equivalence/equals_false_percent_encoded_path.phpt create mode 100644 ext/uri/tests/whatwg/equivalence/equals_true_exclude_fragment.phpt create mode 100644 ext/uri/tests/whatwg/equivalence/equals_true_fragment.phpt create mode 100644 ext/uri/tests/whatwg/equivalence/equals_true_identical.phpt create mode 100644 ext/uri/tests/whatwg/equivalence/equals_true_include_fragment.phpt create mode 100644 ext/uri/tests/whatwg/equivalence/equals_true_normalization1.phpt create mode 100644 ext/uri/tests/whatwg/equivalence/equals_true_normalization2.phpt create mode 100644 ext/uri/tests/whatwg/equivalence/equals_true_normalization3.phpt create mode 100644 ext/uri/tests/whatwg/equivalence/equals_true_normalization4.phpt create mode 100644 ext/uri/tests/whatwg/equivalence/equals_true_normalization5.phpt diff --git a/ext/uri/tests/036.phpt b/ext/uri/tests/036.phpt deleted file mode 100644 index 2942730739d0c..0000000000000 --- a/ext/uri/tests/036.phpt +++ /dev/null @@ -1,39 +0,0 @@ ---TEST-- -Test URI equality checks ---EXTENSIONS-- -uri ---FILE-- -equals(new Uri\Rfc3986\Uri("https://example.com"))); // true: identical URIs -var_dump(new Uri\Rfc3986\Uri("https://example.com#foo")->equals(new Uri\Rfc3986\Uri("https://example.com#bar"), Uri\UriComparisonMode::ExcludeFragment)); // true: fragment differs, but fragment is excluded -var_dump(new Uri\Rfc3986\Uri("https://example.com#foo")->equals(new Uri\Rfc3986\Uri("https://example.com#bar"), Uri\UriComparisonMode::IncludeFragment)); // false: fragment differs and fragment is included -var_dump(new Uri\Rfc3986\Uri("https://example.com/foo/..")->equals(new Uri\Rfc3986\Uri("https://example.com"))); // false: first URI becomes https://example.com/ after normalization -var_dump(new Uri\Rfc3986\Uri("https://example.com/foo/..")->equals(new Uri\Rfc3986\Uri("https://example.com/"))); // true: both URIs are https://example.com/ after normalization -var_dump(new Uri\Rfc3986\Uri("http://example%2ecom/foo%2fb%61r")->equals(new Uri\Rfc3986\Uri("http://example%2ecom/foo/bar"))); // false: "/" in the path should not be decoded -var_dump(new Uri\Rfc3986\Uri("http://example%2ecom/foo/b%61r")->equals(new Uri\Rfc3986\Uri("http://example%2ecom/foo/bar"))); // true: percent-decoding during normalization gives same URIs - -var_dump(new Uri\WhatWg\Url("https://example.com")->equals(new Uri\WhatWg\Url("https://example.com"))); // true: identical URIs -var_dump(new Uri\WhatWg\Url("https://example.com#foo")->equals(new Uri\WhatWg\Url("https://example.com#bar"), Uri\UriComparisonMode::ExcludeFragment)); // true: fragment differs, but fragment is excluded -var_dump(new Uri\WhatWg\Url("https://example.com#foo")->equals(new Uri\WhatWg\Url("https://example.com#bar"), Uri\UriComparisonMode::IncludeFragment)); // false: fragment differs and fragment is included -var_dump(new Uri\WhatWg\Url("https://example.com/foo/..")->equals(new Uri\WhatWg\Url("https://example.com"))); // true: both URIs are https://example.com/ after normalization -var_dump(new Uri\WhatWg\Url("https://example.com/foo/..")->equals(new Uri\WhatWg\Url("https://example.com/"))); // true: both URIs are https://example.com/ after normalization -var_dump(new Uri\WhatWg\Url("http://example%2ecom/foo%2fb%61r")->equals(new Uri\WhatWg\Url("http://example%2ecom/foo/bar"))); // false: WHATWG doesn't percent-decode the path during normalization -var_dump(new Uri\WhatWg\Url("http://example%2ecom/foo/b%61r")->equals(new Uri\WhatWg\Url("http://example.com/foo/b%61r"))); // true: WHATWG percent-decodes the host during normalization - -?> ---EXPECT-- -bool(true) -bool(true) -bool(false) -bool(false) -bool(true) -bool(false) -bool(true) -bool(true) -bool(true) -bool(false) -bool(true) -bool(true) -bool(false) -bool(true) diff --git a/ext/uri/tests/rfc3986/equivalence/equals_false_all1.phpt b/ext/uri/tests/rfc3986/equivalence/equals_false_all1.phpt new file mode 100644 index 0000000000000..368f766a31a06 --- /dev/null +++ b/ext/uri/tests/rfc3986/equivalence/equals_false_all1.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\Rfc3986\Uri equivalence - returns false - all components +--FILE-- +equals($uri2)); +var_dump($uri2->equals($uri1)); + +?> +--EXPECT-- +bool(false) +bool(false) diff --git a/ext/uri/tests/rfc3986/equivalence/equals_false_all2.phpt b/ext/uri/tests/rfc3986/equivalence/equals_false_all2.phpt new file mode 100644 index 0000000000000..88250d2093176 --- /dev/null +++ b/ext/uri/tests/rfc3986/equivalence/equals_false_all2.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\Rfc3986\Uri equivalence - returns false - all components +--FILE-- +equals($uri2)); +var_dump($uri2->equals($uri1)); + +?> +--EXPECT-- +bool(false) +bool(false) diff --git a/ext/uri/tests/rfc3986/equivalence/equals_false_all3.phpt b/ext/uri/tests/rfc3986/equivalence/equals_false_all3.phpt new file mode 100644 index 0000000000000..9ed0e5fb7fa4d --- /dev/null +++ b/ext/uri/tests/rfc3986/equivalence/equals_false_all3.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\Rfc3986\Uri equivalence - returns false - all components +--FILE-- +equals($uri2)); +var_dump($uri2->equals($uri1)); + +?> +--EXPECT-- +bool(false) +bool(false) diff --git a/ext/uri/tests/rfc3986/equivalence/equals_false_all4.phpt b/ext/uri/tests/rfc3986/equivalence/equals_false_all4.phpt new file mode 100644 index 0000000000000..368f766a31a06 --- /dev/null +++ b/ext/uri/tests/rfc3986/equivalence/equals_false_all4.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\Rfc3986\Uri equivalence - returns false - all components +--FILE-- +equals($uri2)); +var_dump($uri2->equals($uri1)); + +?> +--EXPECT-- +bool(false) +bool(false) diff --git a/ext/uri/tests/rfc3986/equivalence/equals_false_all5.phpt b/ext/uri/tests/rfc3986/equivalence/equals_false_all5.phpt new file mode 100644 index 0000000000000..528c46f8b8223 --- /dev/null +++ b/ext/uri/tests/rfc3986/equivalence/equals_false_all5.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\Rfc3986\Uri equivalence - returns false - all components +--FILE-- +equals($uri2)); +var_dump($uri2->equals($uri1)); + +?> +--EXPECT-- +bool(false) +bool(false) diff --git a/ext/uri/tests/rfc3986/equivalence/equals_false_all6.phpt b/ext/uri/tests/rfc3986/equivalence/equals_false_all6.phpt new file mode 100644 index 0000000000000..bab165175287f --- /dev/null +++ b/ext/uri/tests/rfc3986/equivalence/equals_false_all6.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\Rfc3986\Uri equivalence - returns false - all components +--FILE-- +equals($uri2)); +var_dump($uri2->equals($uri1)); + +?> +--EXPECT-- +bool(false) +bool(false) diff --git a/ext/uri/tests/rfc3986/equivalence/equals_false_all7.phpt b/ext/uri/tests/rfc3986/equivalence/equals_false_all7.phpt new file mode 100644 index 0000000000000..f0a5489f0ee63 --- /dev/null +++ b/ext/uri/tests/rfc3986/equivalence/equals_false_all7.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\Rfc3986\Uri equivalence - returns false - all components +--FILE-- +equals($uri2)); +var_dump($uri2->equals($uri1)); + +?> +--EXPECT-- +bool(false) +bool(false) diff --git a/ext/uri/tests/rfc3986/equivalence/equals_false_all8.phpt b/ext/uri/tests/rfc3986/equivalence/equals_false_all8.phpt new file mode 100644 index 0000000000000..09577e873c2e9 --- /dev/null +++ b/ext/uri/tests/rfc3986/equivalence/equals_false_all8.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\Rfc3986\Uri equivalence - returns false - all components +--FILE-- +equals($uri2)); +var_dump($uri2->equals($uri1)); + +?> +--EXPECT-- +bool(false) +bool(false) diff --git a/ext/uri/tests/rfc3986/equivalence/equals_false_exclude_fragment.phpt b/ext/uri/tests/rfc3986/equivalence/equals_false_exclude_fragment.phpt new file mode 100644 index 0000000000000..c8c23fd5f2f2d --- /dev/null +++ b/ext/uri/tests/rfc3986/equivalence/equals_false_exclude_fragment.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\Rfc3986\Uri equivalence - returns false - fragment excluded +--FILE-- +equals($uri2, Uri\UriComparisonMode::ExcludeFragment)); +var_dump($uri2->equals($uri1, Uri\UriComparisonMode::ExcludeFragment)); + +?> +--EXPECT-- +bool(true) +bool(true) diff --git a/ext/uri/tests/rfc3986/equivalence/equals_false_include_fragment.phpt b/ext/uri/tests/rfc3986/equivalence/equals_false_include_fragment.phpt new file mode 100644 index 0000000000000..340d86a81ec09 --- /dev/null +++ b/ext/uri/tests/rfc3986/equivalence/equals_false_include_fragment.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\Rfc3986\Uri equivalence - returns false - fragment included +--FILE-- +equals($uri2, Uri\UriComparisonMode::IncludeFragment)); +var_dump($uri2->equals($uri1, Uri\UriComparisonMode::IncludeFragment)); + +?> +--EXPECT-- +bool(false) +bool(false) diff --git a/ext/uri/tests/rfc3986/equivalence/equals_true_exclude_fragment.phpt b/ext/uri/tests/rfc3986/equivalence/equals_true_exclude_fragment.phpt new file mode 100644 index 0000000000000..fc520f1db0861 --- /dev/null +++ b/ext/uri/tests/rfc3986/equivalence/equals_true_exclude_fragment.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\Rfc3986\Uri equivalence - returns true - fragment excluded +--FILE-- +equals($uri2, Uri\UriComparisonMode::ExcludeFragment)); +var_dump($uri2->equals($uri1, Uri\UriComparisonMode::ExcludeFragment)); + +?> +--EXPECT-- +bool(true) +bool(true) diff --git a/ext/uri/tests/rfc3986/equivalence/equals_true_fragment.phpt b/ext/uri/tests/rfc3986/equivalence/equals_true_fragment.phpt new file mode 100644 index 0000000000000..7818d4e8fd47d --- /dev/null +++ b/ext/uri/tests/rfc3986/equivalence/equals_true_fragment.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\Rfc3986\Uri equivalence - returns true - only fragment differs +--FILE-- +equals($uri2)); +var_dump($uri2->equals($uri1)); + +?> +--EXPECT-- +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 new file mode 100644 index 0000000000000..9910dc991e3aa --- /dev/null +++ b/ext/uri/tests/rfc3986/equivalence/equals_true_identical.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\Rfc3986\Uri equivalence - returns true - identical URIs +--FILE-- +equals($uri2)); +var_dump($uri2->equals($uri1)); + +?> +--EXPECT-- +bool(true) +bool(true) diff --git a/ext/uri/tests/rfc3986/equivalence/equals_true_include_fragment.phpt b/ext/uri/tests/rfc3986/equivalence/equals_true_include_fragment.phpt new file mode 100644 index 0000000000000..37f514c8dfddc --- /dev/null +++ b/ext/uri/tests/rfc3986/equivalence/equals_true_include_fragment.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\Rfc3986\Uri equivalence - returns true - fragment included +--FILE-- +equals($uri2, Uri\UriComparisonMode::IncludeFragment)); +var_dump($uri2->equals($uri1, Uri\UriComparisonMode::IncludeFragment)); + +?> +--EXPECT-- +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 new file mode 100644 index 0000000000000..00aa535630347 --- /dev/null +++ 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-- +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 new file mode 100644 index 0000000000000..e9b4d647f4a2f --- /dev/null +++ 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-- +equals($uri2)); +var_dump($uri2->equals($uri1)); + +?> +--EXPECT-- +bool(true) +bool(true) diff --git a/ext/uri/tests/rfc3986/equivalence/equals_true_normalization3.phpt b/ext/uri/tests/rfc3986/equivalence/equals_true_normalization3.phpt new file mode 100644 index 0000000000000..108e7c19c9a9f --- /dev/null +++ b/ext/uri/tests/rfc3986/equivalence/equals_true_normalization3.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\Rfc3986\Uri equivalence - returns true - after port normalization +--FILE-- +equals($uri2)); +var_dump($uri2->equals($uri1)); + +?> +--EXPECT-- +bool(true) +bool(true) diff --git a/ext/uri/tests/rfc3986/equivalence/equals_true_normalization4.phpt b/ext/uri/tests/rfc3986/equivalence/equals_true_normalization4.phpt new file mode 100644 index 0000000000000..ef7c628fd8085 --- /dev/null +++ b/ext/uri/tests/rfc3986/equivalence/equals_true_normalization4.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\Rfc3986\Uri equivalence - returns true - after percent-encoding normalization +--FILE-- +equals($uri2)); +var_dump($uri2->equals($uri1)); + +?> +--EXPECT-- +bool(true) +bool(true) diff --git a/ext/uri/tests/rfc3986/equivalence/equals_true_normalization5.phpt b/ext/uri/tests/rfc3986/equivalence/equals_true_normalization5.phpt new file mode 100644 index 0000000000000..7cfe927eba7e8 --- /dev/null +++ b/ext/uri/tests/rfc3986/equivalence/equals_true_normalization5.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\Rfc3986\Uri equivalence - returns true - host is percent-decoded during normalization +--FILE-- +equals($uri2)); +var_dump($uri2->equals($uri1)); + +?> +--EXPECT-- +bool(true) +bool(true) diff --git a/ext/uri/tests/whatwg/equivalence/equals_false_all1.phpt b/ext/uri/tests/whatwg/equivalence/equals_false_all1.phpt new file mode 100644 index 0000000000000..9bac0b00f1e69 --- /dev/null +++ b/ext/uri/tests/whatwg/equivalence/equals_false_all1.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\WhatWg\Url equivalence - returns false - all components +--FILE-- +equals($url2)); +var_dump($url2->equals($url1)); + +?> +--EXPECT-- +bool(false) +bool(false) diff --git a/ext/uri/tests/whatwg/equivalence/equals_false_all2.phpt b/ext/uri/tests/whatwg/equivalence/equals_false_all2.phpt new file mode 100644 index 0000000000000..bc263e8ed1c44 --- /dev/null +++ b/ext/uri/tests/whatwg/equivalence/equals_false_all2.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\WhatWg\Url equivalence - returns false - all components +--FILE-- +equals($url2)); +var_dump($url2->equals($url1)); + +?> +--EXPECT-- +bool(false) +bool(false) diff --git a/ext/uri/tests/whatwg/equivalence/equals_false_all3.phpt b/ext/uri/tests/whatwg/equivalence/equals_false_all3.phpt new file mode 100644 index 0000000000000..9c075fc442d64 --- /dev/null +++ b/ext/uri/tests/whatwg/equivalence/equals_false_all3.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\WhatWg\Url equivalence - returns false - all components +--FILE-- +equals($url2)); +var_dump($url2->equals($url1)); + +?> +--EXPECT-- +bool(false) +bool(false) diff --git a/ext/uri/tests/whatwg/equivalence/equals_false_all4.phpt b/ext/uri/tests/whatwg/equivalence/equals_false_all4.phpt new file mode 100644 index 0000000000000..9bac0b00f1e69 --- /dev/null +++ b/ext/uri/tests/whatwg/equivalence/equals_false_all4.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\WhatWg\Url equivalence - returns false - all components +--FILE-- +equals($url2)); +var_dump($url2->equals($url1)); + +?> +--EXPECT-- +bool(false) +bool(false) diff --git a/ext/uri/tests/whatwg/equivalence/equals_false_all5.phpt b/ext/uri/tests/whatwg/equivalence/equals_false_all5.phpt new file mode 100644 index 0000000000000..1d73be2fd4199 --- /dev/null +++ b/ext/uri/tests/whatwg/equivalence/equals_false_all5.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\WhatWg\Url equivalence - returns false - all components +--FILE-- +equals($url2)); +var_dump($url2->equals($url1)); + +?> +--EXPECT-- +bool(false) +bool(false) diff --git a/ext/uri/tests/whatwg/equivalence/equals_false_all6.phpt b/ext/uri/tests/whatwg/equivalence/equals_false_all6.phpt new file mode 100644 index 0000000000000..9e686c02a3ac8 --- /dev/null +++ b/ext/uri/tests/whatwg/equivalence/equals_false_all6.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\WhatWg\Url equivalence - returns false - all components +--FILE-- +equals($url2)); +var_dump($url2->equals($url1)); + +?> +--EXPECT-- +bool(false) +bool(false) diff --git a/ext/uri/tests/whatwg/equivalence/equals_false_all7.phpt b/ext/uri/tests/whatwg/equivalence/equals_false_all7.phpt new file mode 100644 index 0000000000000..b7b1f81e7735f --- /dev/null +++ b/ext/uri/tests/whatwg/equivalence/equals_false_all7.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\WhatWg\Url equivalence - returns false - all components +--FILE-- +equals($url2)); +var_dump($url2->equals($url1)); + +?> +--EXPECT-- +bool(false) +bool(false) diff --git a/ext/uri/tests/whatwg/equivalence/equals_false_all8.phpt b/ext/uri/tests/whatwg/equivalence/equals_false_all8.phpt new file mode 100644 index 0000000000000..f18a5b93aa484 --- /dev/null +++ b/ext/uri/tests/whatwg/equivalence/equals_false_all8.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\WhatWg\Url equivalence - returns false - all components +--FILE-- +equals($url2)); +var_dump($url2->equals($url1)); + +?> +--EXPECT-- +bool(false) +bool(false) diff --git a/ext/uri/tests/whatwg/equivalence/equals_false_exclude_fragment.phpt b/ext/uri/tests/whatwg/equivalence/equals_false_exclude_fragment.phpt new file mode 100644 index 0000000000000..df95522878302 --- /dev/null +++ b/ext/uri/tests/whatwg/equivalence/equals_false_exclude_fragment.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\WhatWg\Url equivalence - returns false - fragment excluded +--FILE-- +equals($url2, Uri\UriComparisonMode::ExcludeFragment)); +var_dump($url2->equals($url1, Uri\UriComparisonMode::ExcludeFragment)); + +?> +--EXPECT-- +bool(true) +bool(true) diff --git a/ext/uri/tests/whatwg/equivalence/equals_false_include_fragment.phpt b/ext/uri/tests/whatwg/equivalence/equals_false_include_fragment.phpt new file mode 100644 index 0000000000000..2d768b9ae33ee --- /dev/null +++ b/ext/uri/tests/whatwg/equivalence/equals_false_include_fragment.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\WhatWg\Url equivalence - returns false - fragment included +--FILE-- +equals($url2, Uri\UriComparisonMode::IncludeFragment)); +var_dump($url2->equals($url1, Uri\UriComparisonMode::IncludeFragment)); + +?> +--EXPECT-- +bool(false) +bool(false) diff --git a/ext/uri/tests/whatwg/equivalence/equals_false_percent_encoded_path.phpt b/ext/uri/tests/whatwg/equivalence/equals_false_percent_encoded_path.phpt new file mode 100644 index 0000000000000..037c4c9b3a98a --- /dev/null +++ b/ext/uri/tests/whatwg/equivalence/equals_false_percent_encoded_path.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\WhatWg\Url equivalence - returns true - path is not percent-decoded during normalization +--FILE-- +equals($url2)); +var_dump($url2->equals($url1)); + +?> +--EXPECT-- +bool(false) +bool(false) diff --git a/ext/uri/tests/whatwg/equivalence/equals_true_exclude_fragment.phpt b/ext/uri/tests/whatwg/equivalence/equals_true_exclude_fragment.phpt new file mode 100644 index 0000000000000..f91883730e94f --- /dev/null +++ b/ext/uri/tests/whatwg/equivalence/equals_true_exclude_fragment.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\WhatWg\Url equivalence - returns true - fragment excluded +--FILE-- +equals($url2, Uri\UriComparisonMode::ExcludeFragment)); +var_dump($url2->equals($url1, Uri\UriComparisonMode::ExcludeFragment)); + +?> +--EXPECT-- +bool(true) +bool(true) diff --git a/ext/uri/tests/whatwg/equivalence/equals_true_fragment.phpt b/ext/uri/tests/whatwg/equivalence/equals_true_fragment.phpt new file mode 100644 index 0000000000000..f047ccb51e278 --- /dev/null +++ b/ext/uri/tests/whatwg/equivalence/equals_true_fragment.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\WhatWg\Url equivalence - returns true - only fragment differs +--FILE-- +equals($url2)); +var_dump($url2->equals($url1)); + +?> +--EXPECT-- +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 new file mode 100644 index 0000000000000..66d181a8debaa --- /dev/null +++ b/ext/uri/tests/whatwg/equivalence/equals_true_identical.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\WhatWg\Url equivalence - returns true - identical URIs +--FILE-- +equals($url2)); +var_dump($url2->equals($url1)); + +?> +--EXPECT-- +bool(true) +bool(true) diff --git a/ext/uri/tests/whatwg/equivalence/equals_true_include_fragment.phpt b/ext/uri/tests/whatwg/equivalence/equals_true_include_fragment.phpt new file mode 100644 index 0000000000000..4e17dee035f91 --- /dev/null +++ b/ext/uri/tests/whatwg/equivalence/equals_true_include_fragment.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\WhatWg\Url equivalence - returns true - fragment included +--FILE-- +equals($url2, Uri\UriComparisonMode::IncludeFragment)); +var_dump($url2->equals($url1, Uri\UriComparisonMode::IncludeFragment)); + +?> +--EXPECT-- +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 new file mode 100644 index 0000000000000..dbe44822f3325 --- /dev/null +++ b/ext/uri/tests/whatwg/equivalence/equals_true_normalization1.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\WhatWg\Url equivalence - returns true - after multiple normalization steps +--FILE-- +equals($url2)); +var_dump($url2->equals($url1)); + +?> +--EXPECT-- +bool(true) +bool(true) diff --git a/ext/uri/tests/whatwg/equivalence/equals_true_normalization2.phpt b/ext/uri/tests/whatwg/equivalence/equals_true_normalization2.phpt new file mode 100644 index 0000000000000..2f5c767f97586 --- /dev/null +++ b/ext/uri/tests/whatwg/equivalence/equals_true_normalization2.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\WhatWg\Url equivalence - returns true - after IPv6 normalization +--FILE-- +equals($url2)); +var_dump($url2->equals($url1)); + +?> +--EXPECT-- +bool(true) +bool(true) diff --git a/ext/uri/tests/whatwg/equivalence/equals_true_normalization3.phpt b/ext/uri/tests/whatwg/equivalence/equals_true_normalization3.phpt new file mode 100644 index 0000000000000..9663b76ec62db --- /dev/null +++ b/ext/uri/tests/whatwg/equivalence/equals_true_normalization3.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\WhatWg\Url equivalence - returns true - after port normalization +--FILE-- +equals($url2)); +var_dump($url2->equals($url1)); + +?> +--EXPECT-- +bool(true) +bool(true) diff --git a/ext/uri/tests/whatwg/equivalence/equals_true_normalization4.phpt b/ext/uri/tests/whatwg/equivalence/equals_true_normalization4.phpt new file mode 100644 index 0000000000000..df8ce1f1d831e --- /dev/null +++ b/ext/uri/tests/whatwg/equivalence/equals_true_normalization4.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\WhatWg\Url equivalence - returns true - after host normalization +--FILE-- +equals($url2)); +var_dump($url2->equals($url1)); + +?> +--EXPECT-- +bool(true) +bool(true) diff --git a/ext/uri/tests/whatwg/equivalence/equals_true_normalization5.phpt b/ext/uri/tests/whatwg/equivalence/equals_true_normalization5.phpt new file mode 100644 index 0000000000000..d4c019efb2d3a --- /dev/null +++ b/ext/uri/tests/whatwg/equivalence/equals_true_normalization5.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\WhatWg\Url equivalence - returns true - after path normalization +--FILE-- +equals($url2)); +var_dump($url2->equals($url1)); + +?> +--EXPECT-- +bool(true) +bool(true) From 174a8bcac5b5667a9df7ef348d25e16bf28373e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Kocsis?= Date: Wed, 5 Nov 2025 22:24:40 +0100 Subject: [PATCH 2/2] Adjust tests according to cod review --- ...t.phpt => equals_false_exclude_fragment1.phpt} | 6 +++--- .../equals_false_include_fragment1.phpt | 15 +++++++++++++++ ...t.phpt => equals_false_include_fragment2.phpt} | 0 .../equivalence/equals_true_normalization1.phpt | 4 ++-- .../equivalence/equals_true_normalization3.phpt | 15 --------------- .../equivalence/equals_true_normalization4.phpt | 15 --------------- .../equivalence/equals_true_normalization5.phpt | 15 --------------- .../equals_false_exclude_fragment.phpt | 6 +++--- .../equals_false_include_fragment1.phpt | 15 +++++++++++++++ ...t.phpt => equals_false_include_fragment2.phpt} | 0 .../equals_false_percent_encoded_path.phpt | 2 +- .../equivalence/equals_true_normalization1.phpt | 2 +- .../equivalence/equals_true_normalization3.phpt | 6 +++--- .../equivalence/equals_true_normalization4.phpt | 15 --------------- .../equivalence/equals_true_normalization5.phpt | 15 --------------- 15 files changed, 43 insertions(+), 88 deletions(-) rename ext/uri/tests/rfc3986/equivalence/{equals_false_exclude_fragment.phpt => equals_false_exclude_fragment1.phpt} (87%) create mode 100644 ext/uri/tests/rfc3986/equivalence/equals_false_include_fragment1.phpt rename ext/uri/tests/rfc3986/equivalence/{equals_false_include_fragment.phpt => equals_false_include_fragment2.phpt} (100%) delete mode 100644 ext/uri/tests/rfc3986/equivalence/equals_true_normalization3.phpt delete mode 100644 ext/uri/tests/rfc3986/equivalence/equals_true_normalization4.phpt delete mode 100644 ext/uri/tests/rfc3986/equivalence/equals_true_normalization5.phpt create mode 100644 ext/uri/tests/whatwg/equivalence/equals_false_include_fragment1.phpt rename ext/uri/tests/whatwg/equivalence/{equals_false_include_fragment.phpt => equals_false_include_fragment2.phpt} (100%) delete mode 100644 ext/uri/tests/whatwg/equivalence/equals_true_normalization4.phpt delete mode 100644 ext/uri/tests/whatwg/equivalence/equals_true_normalization5.phpt diff --git a/ext/uri/tests/rfc3986/equivalence/equals_false_exclude_fragment.phpt b/ext/uri/tests/rfc3986/equivalence/equals_false_exclude_fragment1.phpt similarity index 87% rename from ext/uri/tests/rfc3986/equivalence/equals_false_exclude_fragment.phpt rename to ext/uri/tests/rfc3986/equivalence/equals_false_exclude_fragment1.phpt index c8c23fd5f2f2d..aa11125e5a80e 100644 --- a/ext/uri/tests/rfc3986/equivalence/equals_false_exclude_fragment.phpt +++ b/ext/uri/tests/rfc3986/equivalence/equals_false_exclude_fragment1.phpt @@ -4,12 +4,12 @@ Test Uri\Rfc3986\Uri equivalence - returns false - fragment excluded equals($uri2, Uri\UriComparisonMode::ExcludeFragment)); var_dump($uri2->equals($uri1, Uri\UriComparisonMode::ExcludeFragment)); ?> --EXPECT-- -bool(true) -bool(true) +bool(false) +bool(false) diff --git a/ext/uri/tests/rfc3986/equivalence/equals_false_include_fragment1.phpt b/ext/uri/tests/rfc3986/equivalence/equals_false_include_fragment1.phpt new file mode 100644 index 0000000000000..693e2be6010ba --- /dev/null +++ b/ext/uri/tests/rfc3986/equivalence/equals_false_include_fragment1.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\Rfc3986\Uri equivalence - returns false - fragment included +--FILE-- +equals($uri2, Uri\UriComparisonMode::IncludeFragment)); +var_dump($uri2->equals($uri1, Uri\UriComparisonMode::IncludeFragment)); + +?> +--EXPECT-- +bool(false) +bool(false) diff --git a/ext/uri/tests/rfc3986/equivalence/equals_false_include_fragment.phpt b/ext/uri/tests/rfc3986/equivalence/equals_false_include_fragment2.phpt similarity index 100% rename from ext/uri/tests/rfc3986/equivalence/equals_false_include_fragment.phpt rename to ext/uri/tests/rfc3986/equivalence/equals_false_include_fragment2.phpt diff --git a/ext/uri/tests/rfc3986/equivalence/equals_true_normalization1.phpt b/ext/uri/tests/rfc3986/equivalence/equals_true_normalization1.phpt index 00aa535630347..063ee977c5d28 100644 --- a/ext/uri/tests/rfc3986/equivalence/equals_true_normalization1.phpt +++ b/ext/uri/tests/rfc3986/equivalence/equals_true_normalization1.phpt @@ -3,8 +3,8 @@ Test Uri\Rfc3986\Uri equivalence - returns true - after multiple normalization s --FILE-- equals($uri2)); var_dump($uri2->equals($uri1)); diff --git a/ext/uri/tests/rfc3986/equivalence/equals_true_normalization3.phpt b/ext/uri/tests/rfc3986/equivalence/equals_true_normalization3.phpt deleted file mode 100644 index 108e7c19c9a9f..0000000000000 --- a/ext/uri/tests/rfc3986/equivalence/equals_true_normalization3.phpt +++ /dev/null @@ -1,15 +0,0 @@ ---TEST-- -Test Uri\Rfc3986\Uri equivalence - returns true - after port normalization ---FILE-- -equals($uri2)); -var_dump($uri2->equals($uri1)); - -?> ---EXPECT-- -bool(true) -bool(true) diff --git a/ext/uri/tests/rfc3986/equivalence/equals_true_normalization4.phpt b/ext/uri/tests/rfc3986/equivalence/equals_true_normalization4.phpt deleted file mode 100644 index ef7c628fd8085..0000000000000 --- a/ext/uri/tests/rfc3986/equivalence/equals_true_normalization4.phpt +++ /dev/null @@ -1,15 +0,0 @@ ---TEST-- -Test Uri\Rfc3986\Uri equivalence - returns true - after percent-encoding normalization ---FILE-- -equals($uri2)); -var_dump($uri2->equals($uri1)); - -?> ---EXPECT-- -bool(true) -bool(true) diff --git a/ext/uri/tests/rfc3986/equivalence/equals_true_normalization5.phpt b/ext/uri/tests/rfc3986/equivalence/equals_true_normalization5.phpt deleted file mode 100644 index 7cfe927eba7e8..0000000000000 --- a/ext/uri/tests/rfc3986/equivalence/equals_true_normalization5.phpt +++ /dev/null @@ -1,15 +0,0 @@ ---TEST-- -Test Uri\Rfc3986\Uri equivalence - returns true - host is percent-decoded during normalization ---FILE-- -equals($uri2)); -var_dump($uri2->equals($uri1)); - -?> ---EXPECT-- -bool(true) -bool(true) diff --git a/ext/uri/tests/whatwg/equivalence/equals_false_exclude_fragment.phpt b/ext/uri/tests/whatwg/equivalence/equals_false_exclude_fragment.phpt index df95522878302..7485f95fb5c42 100644 --- a/ext/uri/tests/whatwg/equivalence/equals_false_exclude_fragment.phpt +++ b/ext/uri/tests/whatwg/equivalence/equals_false_exclude_fragment.phpt @@ -4,12 +4,12 @@ Test Uri\WhatWg\Url equivalence - returns false - fragment excluded equals($url2, Uri\UriComparisonMode::ExcludeFragment)); var_dump($url2->equals($url1, Uri\UriComparisonMode::ExcludeFragment)); ?> --EXPECT-- -bool(true) -bool(true) +bool(false) +bool(false) diff --git a/ext/uri/tests/whatwg/equivalence/equals_false_include_fragment1.phpt b/ext/uri/tests/whatwg/equivalence/equals_false_include_fragment1.phpt new file mode 100644 index 0000000000000..5f47087439dfb --- /dev/null +++ b/ext/uri/tests/whatwg/equivalence/equals_false_include_fragment1.phpt @@ -0,0 +1,15 @@ +--TEST-- +Test Uri\WhatWg\Url equivalence - returns false - fragment included +--FILE-- +equals($url2, Uri\UriComparisonMode::IncludeFragment)); +var_dump($url2->equals($url1, Uri\UriComparisonMode::IncludeFragment)); + +?> +--EXPECT-- +bool(false) +bool(false) diff --git a/ext/uri/tests/whatwg/equivalence/equals_false_include_fragment.phpt b/ext/uri/tests/whatwg/equivalence/equals_false_include_fragment2.phpt similarity index 100% rename from ext/uri/tests/whatwg/equivalence/equals_false_include_fragment.phpt rename to ext/uri/tests/whatwg/equivalence/equals_false_include_fragment2.phpt diff --git a/ext/uri/tests/whatwg/equivalence/equals_false_percent_encoded_path.phpt b/ext/uri/tests/whatwg/equivalence/equals_false_percent_encoded_path.phpt index 037c4c9b3a98a..03dfc43e02e95 100644 --- a/ext/uri/tests/whatwg/equivalence/equals_false_percent_encoded_path.phpt +++ b/ext/uri/tests/whatwg/equivalence/equals_false_percent_encoded_path.phpt @@ -1,5 +1,5 @@ --TEST-- -Test Uri\WhatWg\Url equivalence - returns true - path is not percent-decoded during normalization +Test Uri\WhatWg\Url equivalence - returns false - path is not percent-decoded during normalization --FILE-- equals($url2)); diff --git a/ext/uri/tests/whatwg/equivalence/equals_true_normalization3.phpt b/ext/uri/tests/whatwg/equivalence/equals_true_normalization3.phpt index 9663b76ec62db..bbcf15512c4c1 100644 --- a/ext/uri/tests/whatwg/equivalence/equals_true_normalization3.phpt +++ b/ext/uri/tests/whatwg/equivalence/equals_true_normalization3.phpt @@ -1,10 +1,10 @@ --TEST-- -Test Uri\WhatWg\Url equivalence - returns true - after port normalization +Test Uri\WhatWg\Url equivalence - returns true - after empty path normalization --FILE-- equals($url2)); var_dump($url2->equals($url1)); diff --git a/ext/uri/tests/whatwg/equivalence/equals_true_normalization4.phpt b/ext/uri/tests/whatwg/equivalence/equals_true_normalization4.phpt deleted file mode 100644 index df8ce1f1d831e..0000000000000 --- a/ext/uri/tests/whatwg/equivalence/equals_true_normalization4.phpt +++ /dev/null @@ -1,15 +0,0 @@ ---TEST-- -Test Uri\WhatWg\Url equivalence - returns true - after host normalization ---FILE-- -equals($url2)); -var_dump($url2->equals($url1)); - -?> ---EXPECT-- -bool(true) -bool(true) diff --git a/ext/uri/tests/whatwg/equivalence/equals_true_normalization5.phpt b/ext/uri/tests/whatwg/equivalence/equals_true_normalization5.phpt deleted file mode 100644 index d4c019efb2d3a..0000000000000 --- a/ext/uri/tests/whatwg/equivalence/equals_true_normalization5.phpt +++ /dev/null @@ -1,15 +0,0 @@ ---TEST-- -Test Uri\WhatWg\Url equivalence - returns true - after path normalization ---FILE-- -equals($url2)); -var_dump($url2->equals($url1)); - -?> ---EXPECT-- -bool(true) -bool(true)