Skip to content

Commit 02e75eb

Browse files
paulbalandanpaulbalandan
committed
refactor: use baseURI instead of base_uri 
1 parent 17fa4d0 commit 02e75eb

File tree

4 files changed

+46
-46
lines changed

4 files changed

+46
-46
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: 39 additions & 39 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,7 +157,7 @@ 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());
@@ -166,8 +166,8 @@ public function testOptionsBaseURIOption(): void
166166
public function testOptionsBaseURIOverride(): void
167167
{
168168
$options = [
169-
'base_uri' => 'http://www.foo.com/api/v1/',
170-
'baseURI' => 'http://bogus/com',
169+
'baseURI' => 'http://www.foo.com/api/v1/',
170+
'baseURI' => 'http://bogus/com',
171171
];
172172
$request = $this->getRequest($options);
173173

@@ -177,8 +177,8 @@ public function testOptionsBaseURIOverride(): void
177177
public function testOptionsHeaders(): void
178178
{
179179
$options = [
180-
'base_uri' => 'http://www.foo.com/api/v1/',
181-
'headers' => ['fruit' => 'apple'],
180+
'baseURI' => 'http://www.foo.com/api/v1/',
181+
'headers' => ['fruit' => 'apple'],
182182
];
183183
$request = $this->getRequest();
184184
$this->assertNull($request->header('fruit'));
@@ -195,8 +195,8 @@ public function testOptionsHeadersNotUsingPopulate(): void
195195
$_SERVER['HTTP_ACCEPT_ENCODING'] = 'gzip, deflate, br';
196196

197197
$options = [
198-
'base_uri' => 'http://www.foo.com/api/v1/',
199-
'headers' => [
198+
'baseURI' => 'http://www.foo.com/api/v1/',
199+
'headers' => [
200200
'Host' => 'www.foo.com',
201201
'Accept-Encoding' => '',
202202
],
@@ -233,7 +233,7 @@ public function testDefaultOptionsAreSharedBetweenRequests(): void
233233
public function testHeaderContentLengthNotSharedBetweenRequests(): void
234234
{
235235
$options = [
236-
'base_uri' => 'http://www.foo.com/api/v1/',
236+
'baseURI' => 'http://www.foo.com/api/v1/',
237237
];
238238
$request = $this->getRequest($options);
239239

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

255255
$options = [
256-
'base_uri' => 'http://www.foo.com/api/v1/',
256+
'baseURI' => 'http://www.foo.com/api/v1/',
257257
];
258258
$request = $this->getRequest($options);
259259
$request->post('example', [
@@ -730,8 +730,8 @@ public function testAllowRedirectsArray(): void
730730
public function testSendWithQuery(): void
731731
{
732732
$request = $this->getRequest([
733-
'base_uri' => 'http://www.foo.com/api/v1/',
734-
'query' => [
733+
'baseURI' => 'http://www.foo.com/api/v1/',
734+
'query' => [
735735
'name' => 'Henry',
736736
'd.t' => 'value',
737737
],
@@ -747,8 +747,8 @@ public function testSendWithQuery(): void
747747
public function testSendWithDelay(): void
748748
{
749749
$request = $this->getRequest([
750-
'base_uri' => 'http://www.foo.com/api/v1/',
751-
'delay' => 100,
750+
'baseURI' => 'http://www.foo.com/api/v1/',
751+
'delay' => 100,
752752
]);
753753

754754
$request->get('products');
@@ -760,8 +760,8 @@ public function testSendWithDelay(): void
760760
public function testSendContinued(): void
761761
{
762762
$request = $this->getRequest([
763-
'base_uri' => 'http://www.foo.com/api/v1/',
764-
'delay' => 100,
763+
'baseURI' => 'http://www.foo.com/api/v1/',
764+
'delay' => 100,
765765
]);
766766

767767
$request->setOutput("HTTP/1.1 100 Continue\x0d\x0a\x0d\x0aHi there");
@@ -775,8 +775,8 @@ public function testSendContinued(): void
775775
public function testSendContinuedWithManyHeaders(): void
776776
{
777777
$request = $this->getRequest([
778-
'base_uri' => 'http://www.foo.com/api/v1/',
779-
'delay' => 100,
778+
'baseURI' => 'http://www.foo.com/api/v1/',
779+
'delay' => 100,
780780
]);
781781

782782
$output = "HTTP/1.1 100 Continue
@@ -819,8 +819,8 @@ public function testSendContinuedWithManyHeaders(): void
819819
public function testSendProxied(): void
820820
{
821821
$request = $this->getRequest([
822-
'base_uri' => 'http://www.foo.com/api/v1/',
823-
'delay' => 100,
822+
'baseURI' => 'http://www.foo.com/api/v1/',
823+
'delay' => 100,
824824
]);
825825

826826
$output = "HTTP/1.1 200 Connection established
@@ -834,8 +834,8 @@ public function testSendProxied(): void
834834
public function testSendProxiedWithHTTP10(): void
835835
{
836836
$request = $this->getRequest([
837-
'base_uri' => 'http://www.foo.com/api/v1/',
838-
'delay' => 100,
837+
'baseURI' => 'http://www.foo.com/api/v1/',
838+
'delay' => 100,
839839
]);
840840

841841
$output = "HTTP/1.0 200 Connection established
@@ -852,7 +852,7 @@ public function testSendProxiedWithHTTP10(): void
852852
public function testResponseHeadersWithMultipleRequests(): void
853853
{
854854
$request = $this->getRequest([
855-
'base_uri' => 'http://www.foo.com/api/v1/',
855+
'baseURI' => 'http://www.foo.com/api/v1/',
856856
]);
857857

858858
$output = "HTTP/2.0 200 OK
@@ -905,7 +905,7 @@ public function testResponseHeadersWithMultipleRequests(): void
905905
public function testResponseHeadersWithMultipleSetCookies(): void
906906
{
907907
$request = $this->getRequest([
908-
'base_uri' => 'https://github.com/',
908+
'baseURI' => 'https://github.com/',
909909
]);
910910

911911
$output = "HTTP/2 200
@@ -937,8 +937,8 @@ public function testResponseHeadersWithMultipleSetCookies(): void
937937
public function testSplitResponse(): void
938938
{
939939
$request = $this->getRequest([
940-
'base_uri' => 'http://www.foo.com/api/v1/',
941-
'delay' => 100,
940+
'baseURI' => 'http://www.foo.com/api/v1/',
941+
'delay' => 100,
942942
]);
943943

944944
$request->setOutput("Accept: text/html\x0d\x0a\x0d\x0aHi there");
@@ -949,8 +949,8 @@ public function testSplitResponse(): void
949949
public function testApplyBody(): void
950950
{
951951
$request = $this->getRequest([
952-
'base_uri' => 'http://www.foo.com/api/v1/',
953-
'delay' => 100,
952+
'baseURI' => 'http://www.foo.com/api/v1/',
953+
'delay' => 100,
954954
]);
955955

956956
$request->setBody('name=George');
@@ -964,8 +964,8 @@ public function testApplyBody(): void
964964
public function testApplyBodyByOptions(): void
965965
{
966966
$request = $this->getRequest([
967-
'base_uri' => 'http://www.foo.com/api/v1/',
968-
'delay' => 100,
967+
'baseURI' => 'http://www.foo.com/api/v1/',
968+
'delay' => 100,
969969
]);
970970

971971
$request->setOutput('Hi there');
@@ -980,8 +980,8 @@ public function testApplyBodyByOptions(): void
980980
public function testBodyIsResetOnSecondRequest(): void
981981
{
982982
$request = $this->getRequest([
983-
'base_uri' => 'http://www.foo.com/api/v1/',
984-
'delay' => 100,
983+
'baseURI' => 'http://www.foo.com/api/v1/',
984+
'delay' => 100,
985985
]);
986986
$request->setBody('name=George');
987987
$request->setOutput('Hi there');
@@ -995,8 +995,8 @@ public function testBodyIsResetOnSecondRequest(): void
995995
public function testResponseHeaders(): void
996996
{
997997
$request = $this->getRequest([
998-
'base_uri' => 'http://www.foo.com/api/v1/',
999-
'delay' => 100,
998+
'baseURI' => 'http://www.foo.com/api/v1/',
999+
'delay' => 100,
10001000
]);
10011001

10021002
$request->setOutput("HTTP/2.0 234 Ohoh\x0d\x0aAccept: text/html\x0d\x0a\x0d\x0aHi there");
@@ -1009,8 +1009,8 @@ public function testResponseHeaders(): void
10091009
public function testResponseHeadersShortProtocol(): void
10101010
{
10111011
$request = $this->getRequest([
1012-
'base_uri' => 'http://www.foo.com/api/v1/',
1013-
'delay' => 100,
1012+
'baseURI' => 'http://www.foo.com/api/v1/',
1013+
'delay' => 100,
10141014
]);
10151015

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

0 commit comments

Comments
 (0)