Skip to content

Commit 4c8b782

Browse files
paulbalandanpaulbalandan
authored
Merge pull request #9296 from paulbalandan/curl-base-uri
refactor: use `baseURI` instead of `base_uri`
2 parents 0b2c6f8 + 9bbe30f commit 4c8b782

File tree

4 files changed

+44
-55
lines changed

4 files changed

+44
-55
lines changed

‎system/Config/Services.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ public static function curlrequest(array $options = [], ?ResponseInterface $resp
211211

212212
return new CURLRequest(
213213
$config,
214-
new URI($options['base_uri'] ?? null),
214+
new URI($options['baseURI'] ?? null),
215215
$response,
216216
$options
217217
);

‎system/HTTP/ContentSecurityPolicy.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,9 +356,9 @@ public function reportOnly(bool $value = true)
356356
}
357357

358358
/**
359-
* Adds a new base_uri value. Can be either a URI class or a simple string.
359+
* Adds a new baseURI value. Can be either a URI class or a simple string.
360360
*
361-
* base_uri restricts the URLs that can appear in a page's <base> element.
361+
* baseURI restricts the URLs that can appear in a page's <base> element.
362362
*
363363
* @see http://www.w3.org/TR/CSP/#directive-base-uri
364364
*

‎tests/system/HTTP/CURLRequestShareOptionsTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ final class CURLRequestShareOptionsTest extends CURLRequestTest
3030
{
3131
protected function getRequest(array $options = []): MockCURLRequest
3232
{
33-
$uri = isset($options['base_uri']) ? new URI($options['base_uri']) : new URI();
33+
$uri = isset($options['baseURI']) ? new URI($options['baseURI']) : new URI();
3434
$app = new App();
3535

3636
$config = new ConfigCURLRequest();
@@ -43,7 +43,7 @@ protected function getRequest(array $options = []): MockCURLRequest
4343
public function testHeaderContentLengthNotSharedBetweenRequests(): void
4444
{
4545
$options = [
46-
'base_uri' => 'http://www.foo.com/api/v1/',
46+
'baseURI' => 'http://www.foo.com/api/v1/',
4747
];
4848
$request = $this->getRequest($options);
4949

@@ -61,8 +61,8 @@ public function testHeaderContentLengthNotSharedBetweenRequests(): void
6161
public function testBodyIsResetOnSecondRequest(): void
6262
{
6363
$request = $this->getRequest([
64-
'base_uri' => 'http://www.foo.com/api/v1/',
65-
'delay' => 100,
64+
'baseURI' => 'http://www.foo.com/api/v1/',
65+
'delay' => 100,
6666
]);
6767
$request->setBody('name=George');
6868
$request->setOutput('Hi there');

‎tests/system/HTTP/CURLRequestTest.php‎

Lines changed: 37 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ protected function setUp(): void
4747
*/
4848
protected function getRequest(array $options = []): MockCURLRequest
4949
{
50-
$uri = isset($options['base_uri']) ? new URI($options['base_uri']) : new URI();
50+
$uri = isset($options['baseURI']) ? new URI($options['baseURI']) : new URI();
5151
$app = new App();
5252

5353
$config = new ConfigCURLRequest();
@@ -64,7 +64,7 @@ public function testPrepareURLIgnoresAppConfig(): void
6464
{
6565
config('App')->baseURL = 'http://example.com/fruit/';
6666

67-
$request = $this->getRequest(['base_uri' => 'http://example.com/v1/']);
67+
$request = $this->getRequest(['baseURI' => 'http://example.com/v1/']);
6868

6969
$method = $this->getPrivateMethodInvoker($request, 'prepareURL');
7070

@@ -76,7 +76,7 @@ public function testPrepareURLIgnoresAppConfig(): void
7676
*/
7777
public function testGetRemembersBaseURI(): void
7878
{
79-
$request = $this->getRequest(['base_uri' => 'http://www.foo.com/api/v1/']);
79+
$request = $this->getRequest(['baseURI' => 'http://www.foo.com/api/v1/']);
8080

8181
$request->get('products');
8282

@@ -90,7 +90,7 @@ public function testGetRemembersBaseURI(): void
9090
*/
9191
public function testGetRemembersBaseURIWithHelperMethod(): void
9292
{
93-
$request = Services::curlrequest(['base_uri' => 'http://www.foo.com/api/v1/']);
93+
$request = Services::curlrequest(['baseURI' => 'http://www.foo.com/api/v1/']);
9494

9595
$uri = $this->getPrivateProperty($request, 'baseURI');
9696
$this->assertSame('www.foo.com', $uri->getHost());
@@ -157,28 +157,17 @@ public function testOptionsSetsCorrectMethod(): void
157157

158158
public function testOptionsBaseURIOption(): void
159159
{
160-
$options = ['base_uri' => 'http://www.foo.com/api/v1/'];
160+
$options = ['baseURI' => 'http://www.foo.com/api/v1/'];
161161
$request = $this->getRequest($options);
162162

163163
$this->assertSame('http://www.foo.com/api/v1/', $request->getBaseURI()->__toString());
164164
}
165165

166-
public function testOptionsBaseURIOverride(): void
167-
{
168-
$options = [
169-
'base_uri' => 'http://www.foo.com/api/v1/',
170-
'baseURI' => 'http://bogus/com',
171-
];
172-
$request = $this->getRequest($options);
173-
174-
$this->assertSame('http://bogus/com', $request->getBaseURI()->__toString());
175-
}
176-
177166
public function testOptionsHeaders(): void
178167
{
179168
$options = [
180-
'base_uri' => 'http://www.foo.com/api/v1/',
181-
'headers' => ['fruit' => 'apple'],
169+
'baseURI' => 'http://www.foo.com/api/v1/',
170+
'headers' => ['fruit' => 'apple'],
182171
];
183172
$request = $this->getRequest();
184173
$this->assertNull($request->header('fruit'));
@@ -195,8 +184,8 @@ public function testOptionsHeadersNotUsingPopulate(): void
195184
$_SERVER['HTTP_ACCEPT_ENCODING'] = 'gzip, deflate, br';
196185

197186
$options = [
198-
'base_uri' => 'http://www.foo.com/api/v1/',
199-
'headers' => [
187+
'baseURI' => 'http://www.foo.com/api/v1/',
188+
'headers' => [
200189
'Host' => 'www.foo.com',
201190
'Accept-Encoding' => '',
202191
],
@@ -233,7 +222,7 @@ public function testDefaultOptionsAreSharedBetweenRequests(): void
233222
public function testHeaderContentLengthNotSharedBetweenRequests(): void
234223
{
235224
$options = [
236-
'base_uri' => 'http://www.foo.com/api/v1/',
225+
'baseURI' => 'http://www.foo.com/api/v1/',
237226
];
238227
$request = $this->getRequest($options);
239228

@@ -253,7 +242,7 @@ public function testHeaderContentLengthNotSharedBetweenClients(): void
253242
$_SERVER['HTTP_CONTENT_LENGTH'] = '10';
254243

255244
$options = [
256-
'base_uri' => 'http://www.foo.com/api/v1/',
245+
'baseURI' => 'http://www.foo.com/api/v1/',
257246
];
258247
$request = $this->getRequest($options);
259248
$request->post('example', [
@@ -730,8 +719,8 @@ public function testAllowRedirectsArray(): void
730719
public function testSendWithQuery(): void
731720
{
732721
$request = $this->getRequest([
733-
'base_uri' => 'http://www.foo.com/api/v1/',
734-
'query' => [
722+
'baseURI' => 'http://www.foo.com/api/v1/',
723+
'query' => [
735724
'name' => 'Henry',
736725
'd.t' => 'value',
737726
],
@@ -747,8 +736,8 @@ public function testSendWithQuery(): void
747736
public function testSendWithDelay(): void
748737
{
749738
$request = $this->getRequest([
750-
'base_uri' => 'http://www.foo.com/api/v1/',
751-
'delay' => 100,
739+
'baseURI' => 'http://www.foo.com/api/v1/',
740+
'delay' => 100,
752741
]);
753742

754743
$request->get('products');
@@ -760,8 +749,8 @@ public function testSendWithDelay(): void
760749
public function testSendContinued(): void
761750
{
762751
$request = $this->getRequest([
763-
'base_uri' => 'http://www.foo.com/api/v1/',
764-
'delay' => 100,
752+
'baseURI' => 'http://www.foo.com/api/v1/',
753+
'delay' => 100,
765754
]);
766755

767756
$request->setOutput("HTTP/1.1 100 Continue\x0d\x0a\x0d\x0aHi there");
@@ -775,8 +764,8 @@ public function testSendContinued(): void
775764
public function testSendContinuedWithManyHeaders(): void
776765
{
777766
$request = $this->getRequest([
778-
'base_uri' => 'http://www.foo.com/api/v1/',
779-
'delay' => 100,
767+
'baseURI' => 'http://www.foo.com/api/v1/',
768+
'delay' => 100,
780769
]);
781770

782771
$output = "HTTP/1.1 100 Continue
@@ -819,8 +808,8 @@ public function testSendContinuedWithManyHeaders(): void
819808
public function testSendProxied(): void
820809
{
821810
$request = $this->getRequest([
822-
'base_uri' => 'http://www.foo.com/api/v1/',
823-
'delay' => 100,
811+
'baseURI' => 'http://www.foo.com/api/v1/',
812+
'delay' => 100,
824813
]);
825814

826815
$output = "HTTP/1.1 200 Connection established
@@ -834,8 +823,8 @@ public function testSendProxied(): void
834823
public function testSendProxiedWithHTTP10(): void
835824
{
836825
$request = $this->getRequest([
837-
'base_uri' => 'http://www.foo.com/api/v1/',
838-
'delay' => 100,
826+
'baseURI' => 'http://www.foo.com/api/v1/',
827+
'delay' => 100,
839828
]);
840829

841830
$output = "HTTP/1.0 200 Connection established
@@ -852,7 +841,7 @@ public function testSendProxiedWithHTTP10(): void
852841
public function testResponseHeadersWithMultipleRequests(): void
853842
{
854843
$request = $this->getRequest([
855-
'base_uri' => 'http://www.foo.com/api/v1/',
844+
'baseURI' => 'http://www.foo.com/api/v1/',
856845
]);
857846

858847
$output = "HTTP/2.0 200 OK
@@ -905,7 +894,7 @@ public function testResponseHeadersWithMultipleRequests(): void
905894
public function testResponseHeadersWithMultipleSetCookies(): void
906895
{
907896
$request = $this->getRequest([
908-
'base_uri' => 'https://github.com/',
897+
'baseURI' => 'https://github.com/',
909898
]);
910899

911900
$output = "HTTP/2 200
@@ -937,8 +926,8 @@ public function testResponseHeadersWithMultipleSetCookies(): void
937926
public function testSplitResponse(): void
938927
{
939928
$request = $this->getRequest([
940-
'base_uri' => 'http://www.foo.com/api/v1/',
941-
'delay' => 100,
929+
'baseURI' => 'http://www.foo.com/api/v1/',
930+
'delay' => 100,
942931
]);
943932

944933
$request->setOutput("Accept: text/html\x0d\x0a\x0d\x0aHi there");
@@ -949,8 +938,8 @@ public function testSplitResponse(): void
949938
public function testApplyBody(): void
950939
{
951940
$request = $this->getRequest([
952-
'base_uri' => 'http://www.foo.com/api/v1/',
953-
'delay' => 100,
941+
'baseURI' => 'http://www.foo.com/api/v1/',
942+
'delay' => 100,
954943
]);
955944

956945
$request->setBody('name=George');
@@ -964,8 +953,8 @@ public function testApplyBody(): void
964953
public function testApplyBodyByOptions(): void
965954
{
966955
$request = $this->getRequest([
967-
'base_uri' => 'http://www.foo.com/api/v1/',
968-
'delay' => 100,
956+
'baseURI' => 'http://www.foo.com/api/v1/',
957+
'delay' => 100,
969958
]);
970959

971960
$request->setOutput('Hi there');
@@ -980,8 +969,8 @@ public function testApplyBodyByOptions(): void
980969
public function testBodyIsResetOnSecondRequest(): void
981970
{
982971
$request = $this->getRequest([
983-
'base_uri' => 'http://www.foo.com/api/v1/',
984-
'delay' => 100,
972+
'baseURI' => 'http://www.foo.com/api/v1/',
973+
'delay' => 100,
985974
]);
986975
$request->setBody('name=George');
987976
$request->setOutput('Hi there');
@@ -995,8 +984,8 @@ public function testBodyIsResetOnSecondRequest(): void
995984
public function testResponseHeaders(): void
996985
{
997986
$request = $this->getRequest([
998-
'base_uri' => 'http://www.foo.com/api/v1/',
999-
'delay' => 100,
987+
'baseURI' => 'http://www.foo.com/api/v1/',
988+
'delay' => 100,
1000989
]);
1001990

1002991
$request->setOutput("HTTP/2.0 234 Ohoh\x0d\x0aAccept: text/html\x0d\x0a\x0d\x0aHi there");
@@ -1009,8 +998,8 @@ public function testResponseHeaders(): void
1009998
public function testResponseHeadersShortProtocol(): void
1010999
{
10111000
$request = $this->getRequest([
1012-
'base_uri' => 'http://www.foo.com/api/v1/',
1013-
'delay' => 100,
1001+
'baseURI' => 'http://www.foo.com/api/v1/',
1002+
'delay' => 100,
10141003
]);
10151004

10161005
$request->setOutput("HTTP/2 235 Ohoh\x0d\x0aAccept: text/html\x0d\x0a\x0d\x0aHi there shortie");

0 commit comments

Comments
 (0)