Skip to content

Commit 190bbfd

Browse files
kocsismatekocsismate
committed
Rename WHATWG getters again
1 parent feefccf commit 190bbfd

File tree

12 files changed

+81
-81
lines changed

12 files changed

+81
-81
lines changed

‎ext/uri/php_uri.stub.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,13 @@ public function getScheme(): string {}
149149

150150
public function withScheme(string $scheme): static {}
151151

152-
/** @implementation-alias Uri\Rfc3986\Uri::getRawUsername */
153-
public function getRawUsername(): ?string {}
152+
/** @implementation-alias Uri\Rfc3986\Uri::getUsername */
153+
public function getUsername(): ?string {}
154154

155-
public function withUsername(?string $user): static {}
155+
public function withUsername(?string $username): static {}
156156

157-
/** @implementation-alias Uri\Rfc3986\Uri::getRawPassword */
158-
public function getRawPassword(): ?string {}
157+
/** @implementation-alias Uri\Rfc3986\Uri::getPassword */
158+
public function getPassword(): ?string {}
159159

160160
public function withPassword(?string $password): static {}
161161

@@ -171,20 +171,20 @@ public function getPort(): ?int {}
171171
/** @implementation-alias Uri\Rfc3986\Uri::withPort */
172172
public function withPort(?int $port): static {}
173173

174-
/** @implementation-alias Uri\Rfc3986\Uri::getRawPath */
175-
public function getRawPath(): string {}
174+
/** @implementation-alias Uri\Rfc3986\Uri::getPath */
175+
public function getPath(): string {}
176176

177177
/** @implementation-alias Uri\Rfc3986\Uri::withPath */
178178
public function withPath(string $path): static {}
179179

180-
/** @implementation-alias Uri\Rfc3986\Uri::getRawQuery */
181-
public function getRawQuery(): ?string {}
180+
/** @implementation-alias Uri\Rfc3986\Uri::getQuery */
181+
public function getQuery(): ?string {}
182182

183183
/** @implementation-alias Uri\Rfc3986\Uri::withQuery */
184184
public function withQuery(?string $query): static {}
185185

186-
/** @implementation-alias Uri\Rfc3986\Uri::getRawFragment */
187-
public function getRawFragment(): ?string {}
186+
/** @implementation-alias Uri\Rfc3986\Uri::getFragment */
187+
public function getFragment(): ?string {}
188188

189189
/** @implementation-alias Uri\Rfc3986\Uri::withFragment */
190190
public function withFragment(?string $fragment): static {}

‎ext/uri/php_uri_arginfo.h

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ext/uri/tests/008.phpt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@ function callRfc3986Getters($uri)
2626
var_dump($uri->getRawFragment());
2727
}
2828

29-
function callWhatWgGetters($uri)
29+
function callWhatWgGetters($url)
3030
{
31-
var_dump($uri->getScheme());
32-
var_dump($uri->getRawUsername());
33-
var_dump($uri->getRawPassword());
34-
var_dump($uri->getAsciiHost());
35-
var_dump($uri->getUnicodeHost());
36-
var_dump($uri->getPort());
37-
var_dump($uri->getRawPath());
38-
var_dump($uri->getRawQuery());
39-
var_dump($uri->getRawFragment());
31+
var_dump($url->getScheme());
32+
var_dump($url->getUsername());
33+
var_dump($url->getPassword());
34+
var_dump($url->getAsciiHost());
35+
var_dump($url->getUnicodeHost());
36+
var_dump($url->getPort());
37+
var_dump($url->getPath());
38+
var_dump($url->getQuery());
39+
var_dump($url->getFragment());
4040
}
4141

4242
$uri = Uri\Rfc3986\Uri::parse("https://username:[email protected]:8080/pathname1/pathname2/pathname3?query=true#hash-exists");

‎ext/uri/tests/024.phpt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ $url5 = $url4->withUsername("u:s/r");
1414
$url6 = Uri\WhatWg\Url::parse("file:///foo/bar/");
1515
$url6 = $url6->withUsername("user");
1616

17-
var_dump($url2->getRawUsername());
18-
var_dump($url3->getRawUsername());
19-
var_dump($url4->getRawUsername());
20-
var_dump($url5->getRawUsername());
21-
var_dump($url6->getRawUsername());
17+
var_dump($url2->getUsername());
18+
var_dump($url3->getUsername());
19+
var_dump($url4->getUsername());
20+
var_dump($url5->getUsername());
21+
var_dump($url6->getUsername());
2222

2323
?>
2424
--EXPECT--

‎ext/uri/tests/025.phpt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ $url5 = $url4->withPassword("p:s/");
1414
$url6 = Uri\WhatWg\Url::parse("file:///foo/bar/");
1515
$url6 = $url6->withUsername("pass");
1616

17-
var_dump($url2->getRawPassword());
18-
var_dump($url3->getRawPassword());
19-
var_dump($url4->getRawPassword());
20-
var_dump($url5->getRawPassword());
21-
var_dump($url6->getRawPassword());
17+
var_dump($url2->getPassword());
18+
var_dump($url3->getPassword());
19+
var_dump($url4->getPassword());
20+
var_dump($url5->getPassword());
21+
var_dump($url6->getPassword());
2222

2323
?>
2424
--EXPECT--

‎ext/uri/tests/028.phpt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,18 @@ $url4 = $url3->withPath("t%65st");
4040
$url5 = $url4->withPath("/foo%2Fbar");
4141
$url6 = $url5->withPath("/#");
4242

43-
var_dump($url1->getRawPath());
44-
var_dump($url2->getRawPath());
45-
var_dump($url3->getRawPath());
46-
var_dump($url4->getRawPath());
47-
var_dump($url5->getRawPath());
48-
var_dump($url6->getRawPath());
43+
var_dump($url1->getPath());
44+
var_dump($url2->getPath());
45+
var_dump($url3->getPath());
46+
var_dump($url4->getPath());
47+
var_dump($url5->getPath());
48+
var_dump($url6->getPath());
4949

5050
$url1 = Uri\WhatWg\Url::parse("https://example.com/");
5151
$uri2 = $url1->withPath("/foo");
5252

53-
var_dump($url1->getRawPath());
54-
var_dump($url2->getRawPath());
53+
var_dump($url1->getPath());
54+
var_dump($url2->getPath());
5555

5656
?>
5757
--EXPECT--

‎ext/uri/tests/029.phpt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ $url1 = Uri\WhatWg\Url::parse("https://example.com?foo=bar");
3333
$url2 = $url1->withQuery("?foo=baz");
3434
$url3 = $url2->withQuery(null);
3535

36-
var_dump($url1->getRawQuery());
37-
var_dump($url2->getRawQuery());
38-
var_dump($url3->getRawQuery());
36+
var_dump($url1->getQuery());
37+
var_dump($url2->getQuery());
38+
var_dump($url3->getQuery());
3939

4040
$url1 = Uri\WhatWg\Url::parse("https://example.com");
4141
$url2 = $url1->withQuery("?foo=bar&foo=baz");
@@ -44,12 +44,12 @@ $url4 = $url3->withQuery("t%65st");
4444
$url5 = $url4->withQuery("foo=foo%26bar&baz=/qux%3D");
4545
$url6 = $url5->withQuery("#");
4646

47-
var_dump($url1->getRawQuery());
48-
var_dump($url2->getRawQuery());
49-
var_dump($url3->getRawQuery());
50-
var_dump($url4->getRawQuery());
51-
var_dump($url5->getRawQuery());
52-
var_dump($url6->getRawQuery());
47+
var_dump($url1->getQuery());
48+
var_dump($url2->getQuery());
49+
var_dump($url3->getQuery());
50+
var_dump($url4->getQuery());
51+
var_dump($url5->getQuery());
52+
var_dump($url6->getQuery());
5353

5454
?>
5555
--EXPECT--

‎ext/uri/tests/030.phpt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ $url2 = $url1->withFragment("#fragment2");
2424
$url3 = $url2->withFragment(null);
2525
$url4 = $url3->withFragment(" ");
2626

27-
var_dump($url1->getRawFragment());
28-
var_dump($url2->getRawFragment());
29-
var_dump($url3->getRawFragment());
30-
var_dump($url4->getRawFragment());
27+
var_dump($url1->getFragment());
28+
var_dump($url2->getFragment());
29+
var_dump($url3->getFragment());
30+
var_dump($url4->getFragment());
3131

3232
$url1 = Uri\WhatWg\Url::parse("https://example.com?abc=def");
3333
$url2 = $url1->withFragment("#fragment");
3434

35-
var_dump($url1->getRawFragment());
36-
var_dump($url2->getRawFragment());
35+
var_dump($url1->getFragment());
36+
var_dump($url2->getFragment());
3737

3838
?>
3939
--EXPECT--

‎ext/uri/tests/039.phpt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@ function callRfc3986Getters($uri)
2626
var_dump($uri->getRawFragment());
2727
}
2828

29-
function callWhatWgGetters($uri)
29+
function callWhatWgGetters($url)
3030
{
31-
var_dump($uri->getScheme());
32-
var_dump($uri->getRawUsername());
33-
var_dump($uri->getRawPassword());
34-
var_dump($uri->getAsciiHost());
35-
var_dump($uri->getUnicodeHost());
36-
var_dump($uri->getPort());
37-
var_dump($uri->getRawPath());
38-
var_dump($uri->getRawQuery());
39-
var_dump($uri->getRawFragment());
31+
var_dump($url->getScheme());
32+
var_dump($url->getUsername());
33+
var_dump($url->getPassword());
34+
var_dump($url->getAsciiHost());
35+
var_dump($url->getUnicodeHost());
36+
var_dump($url->getPort());
37+
var_dump($url->getPath());
38+
var_dump($url->getQuery());
39+
var_dump($url->getFragment());
4040
}
4141

4242
$uri = Uri\Rfc3986\Uri::parse("http://%61pple:p%61ss@ex%61mple.com/foob%61r?%61bc=%61bc#%61bc");

‎ext/uri/tests/045.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var_dump($uri->getRawPath());
1414
$url = new Uri\Whatwg\Url("https://example.com/foo/bar%2Fbaz");
1515

1616
var_dump($url->toAsciiString());
17-
var_dump($url->getRawPath());
17+
var_dump($url->getPath());
1818

1919
?>
2020
--EXPECT--

‎ext/uri/tests/046.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@ var_dump($uri->getRawPath());
3636
$url = new Uri\Whatwg\Url("mailto:[email protected]");
3737

3838
var_dump($url->toAsciiString());
39-
var_dump($url->getRawPath());
39+
var_dump($url->getPath());
4040

4141
$url = new Uri\Whatwg\Url("https://example.com");
4242

4343
var_dump($url->toAsciiString());
44-
var_dump($url->getRawPath());
44+
var_dump($url->getPath());
4545

4646
$url = new Uri\Whatwg\Url("https://example.com/");
4747

4848
var_dump($url->toAsciiString());
49-
var_dump($url->getRawPath());
49+
var_dump($url->getPath());
5050

5151
?>
5252
--EXPECT--

‎ext/uri/tests/049.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ var_dump($uri->getRawPath());
1010
var_dump($uri->getPath());
1111

1212
$url = new Uri\WhatWg\Url("https://example.com/foo/bar%2Fbaz");
13-
var_dump($url->getRawPath());
13+
var_dump($url->getPath());
1414

1515
?>
1616
--EXPECT--

0 commit comments

Comments
 (0)