Skip to content

Commit 1945401

Browse files
committed
refactor: replace $request->uri with $request->getUri()
See #5344
1 parent d4db7b2 commit 1945401

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

app/Views/errors/html/error_exception.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@
195195
<tbody>
196196
<tr>
197197
<td style="width: 10em">Path</td>
198-
<td><?= esc($request->uri) ?></td>
198+
<td><?= esc($request->getUri()) ?></td>
199199
</tr>
200200
<tr>
201201
<td>HTTP Method</td>

system/Common.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -480,9 +480,9 @@ function force_https(int $duration = 31536000, ?RequestInterface $request = null
480480
$uri = URI::createURIString(
481481
'https',
482482
$baseURL,
483-
$request->uri->getPath(), // Absolute URIs should use a "/" for an empty path
484-
$request->uri->getQuery(),
485-
$request->uri->getFragment()
483+
$request->getUri()->getPath(), // Absolute URIs should use a "/" for an empty path
484+
$request->getUri()->getQuery(),
485+
$request->getUri()->getFragment()
486486
);
487487

488488
// Set an HSTS header

tests/system/HTTP/IncomingRequestTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -650,6 +650,6 @@ public function testSetPathUpdatesURI()
650650

651651
$request->setPath('apples');
652652

653-
$this->assertSame('apples', $request->uri->getPath());
653+
$this->assertSame('apples', $request->getUri()->getPath());
654654
}
655655
}

tests/system/HTTP/URITest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -876,14 +876,14 @@ public function testBasedNoIndex()
876876

877877
// going through request
878878
$this->assertSame('http://example.com/ci/v4/controller/method', (string) $request->uri);
879-
$this->assertSame('/ci/v4/controller/method', $request->uri->getPath());
879+
$this->assertSame('/ci/v4/controller/method', $request->getUri()->getPath());
880880

881881
// standalone
882882
$uri = new URI('http://example.com/ci/v4/controller/method');
883883
$this->assertSame('http://example.com/ci/v4/controller/method', (string) $uri);
884884
$this->assertSame('/ci/v4/controller/method', $uri->getPath());
885885

886-
$this->assertSame($uri->getPath(), $request->uri->getPath());
886+
$this->assertSame($uri->getPath(), $request->getUri()->getPath());
887887
}
888888

889889
public function testBasedWithIndex()
@@ -902,15 +902,15 @@ public function testBasedWithIndex()
902902
Services::injectMock('request', $request);
903903

904904
// going through request
905-
$this->assertSame('http://example.com/ci/v4/index.php/controller/method', (string) $request->uri);
906-
$this->assertSame('/ci/v4/index.php/controller/method', $request->uri->getPath());
905+
$this->assertSame('http://example.com/ci/v4/index.php/controller/method', (string) $request->getUri());
906+
$this->assertSame('/ci/v4/index.php/controller/method', $request->getUri()->getPath());
907907

908908
// standalone
909909
$uri = new URI('http://example.com/ci/v4/index.php/controller/method');
910910
$this->assertSame('http://example.com/ci/v4/index.php/controller/method', (string) $uri);
911911
$this->assertSame('/ci/v4/index.php/controller/method', $uri->getPath());
912912

913-
$this->assertSame($uri->getPath(), $request->uri->getPath());
913+
$this->assertSame($uri->getPath(), $request->getUri()->getPath());
914914
}
915915

916916
public function testForceGlobalSecureRequests()
@@ -933,13 +933,13 @@ public function testForceGlobalSecureRequests()
933933
Services::injectMock('request', $request);
934934

935935
// Detected by request
936-
$this->assertSame('https://example.com/ci/v4/controller/method', (string) $request->uri);
936+
$this->assertSame('https://example.com/ci/v4/controller/method', (string) $request->getUri());
937937

938938
// Standalone
939939
$uri = new URI('http://example.com/ci/v4/controller/method');
940940
$this->assertSame('https://example.com/ci/v4/controller/method', (string) $uri);
941941

942-
$this->assertSame(trim($uri->getPath(), '/'), trim($request->uri->getPath(), '/'));
942+
$this->assertSame(trim($uri->getPath(), '/'), trim($request->getUri()->getPath(), '/'));
943943
}
944944

945945
public function testZeroAsURIPath()

0 commit comments

Comments
 (0)