Skip to content

Commit 59e34a1

Browse files
MGatnerMGatner
authored
Merge pull request #4716 from MGatner/uri-string
Replace URI string casts
2 parents 0eff770 + 021a6f4 commit 59e34a1

9 files changed

Lines changed: 31 additions & 42 deletions

File tree

‎system/CodeIgniter.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ protected function handleRequest(?RouteCollectionInterface $routes, Cache $cache
474474

475475
// Save our current URI as the previous URI in the session
476476
// for safer, more accurate use with `previous_url()` helper function.
477-
$this->storePreviousURL((string) current_url(true));
477+
$this->storePreviousURL(current_url(true));
478478

479479
unset($uri);
480480

@@ -1080,7 +1080,7 @@ public function storePreviousURL($uri)
10801080

10811081
if (isset($_SESSION))
10821082
{
1083-
$_SESSION['_ci_previous_url'] = (string) $uri;
1083+
$_SESSION['_ci_previous_url'] = URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
10841084
}
10851085
}
10861086

‎system/HTTP/RedirectResponse.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function to(string $uri, int $code = null, string $method = 'auto')
3636
// for better security.
3737
if (strpos($uri, 'http') !== 0)
3838
{
39-
$uri = (string) current_url(true)->resolveRelativeURI($uri);
39+
$uri = site_url($uri);
4040
}
4141

4242
return $this->redirect($uri, $method, $code);

‎system/Helpers/url_helper.php‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -205,20 +205,9 @@ function previous_url(bool $returnObject = false)
205205
*/
206206
function uri_string(bool $relative = false): string
207207
{
208-
$request = Services::request();
209-
$uri = $request->uri;
210-
211-
// An absolute path is equivalent to getPath()
212-
if (! $relative)
213-
{
214-
return $uri->getPath();
215-
}
216-
217-
// Remove the baseURL from the entire URL
218-
$url = (string) $uri->__toString();
219-
$baseURL = rtrim($request->config->baseURL, '/ ') . '/';
220-
221-
return substr($url, strlen($baseURL));
208+
return $relative
209+
? ltrim(Services::request()->getPath(), '/')
210+
: Services::request()->getUri()->getPath();
222211
}
223212
}
224213

‎system/Log/Handlers/ChromeLoggerHandler.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,7 @@ public function __construct(array $config = [])
8787
{
8888
parent::__construct($config);
8989

90-
$request = Services::request(null, true);
91-
92-
$this->json['request_uri'] = (string) $request->uri;
90+
$this->json['request_uri'] = current_url();
9391
}
9492

9593
//--------------------------------------------------------------------

‎system/Pager/Pager.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ public function getPageURI(int $page = null, string $group = 'default', bool $re
377377
$uri->setQueryArray($query);
378378
}
379379

380-
return $returnObject === true ? $uri : (string) $uri;
380+
return $returnObject === true ? $uri : URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
381381
}
382382

383383
//--------------------------------------------------------------------

‎system/Pager/PagerRenderer.php‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public function getPrevious()
156156
$uri->setSegment($this->segment, $this->first - 1);
157157
}
158158

159-
return (string) $uri;
159+
return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
160160
}
161161

162162
//--------------------------------------------------------------------
@@ -200,7 +200,7 @@ public function getNext()
200200
$uri->setSegment($this->segment, $this->last + 1);
201201
}
202202

203-
return (string) $uri;
203+
return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
204204
}
205205

206206
//--------------------------------------------------------------------
@@ -223,7 +223,7 @@ public function getFirst(): string
223223
$uri->setSegment($this->segment, 1);
224224
}
225225

226-
return (string) $uri;
226+
return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
227227
}
228228

229229
//--------------------------------------------------------------------
@@ -246,7 +246,7 @@ public function getLast(): string
246246
$uri->setSegment($this->segment, $this->pageCount);
247247
}
248248

249-
return (string) $uri;
249+
return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
250250
}
251251

252252
//--------------------------------------------------------------------
@@ -269,7 +269,7 @@ public function getCurrent(): string
269269
$uri->setSegment($this->segment, $this->current);
270270
}
271271

272-
return (string) $uri;
272+
return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
273273
}
274274

275275
//--------------------------------------------------------------------
@@ -290,8 +290,9 @@ public function links(): array
290290

291291
for ($i = $this->first; $i <= $this->last; $i ++)
292292
{
293+
$uri = $this->segment === 0 ? $uri->addQuery($this->pageSelector, $i) : $uri->setSegment($this->segment, $i);
293294
$links[] = [
294-
'uri' => (string) ($this->segment === 0 ? $uri->addQuery($this->pageSelector, $i) : $uri->setSegment($this->segment, $i)),
295+
'uri' => URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment()),
295296
'title' => (int) $i,
296297
'active' => ($i === $this->current),
297298
];
@@ -359,7 +360,7 @@ public function getPreviousPage()
359360
$uri->setSegment($this->segment, $this->current - 1);
360361
}
361362

362-
return (string) $uri;
363+
return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
363364
}
364365

365366
//--------------------------------------------------------------------
@@ -401,7 +402,7 @@ public function getNextPage()
401402
$uri->setSegment($this->segment, $this->current + 1);
402403
}
403404

404-
return (string) $uri;
405+
return URI::createURIString($uri->getScheme(), $uri->getAuthority(), $uri->getPath(), $uri->getQuery(), $uri->getFragment());
405406
}
406407

407408
/**

‎tests/system/HTTP/RedirectResponseTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public function testRedirectRelativeConvertsToFullURI()
9090
$response = $response->to('/foo');
9191

9292
$this->assertTrue($response->hasHeader('Location'));
93-
$this->assertEquals('http://example.com/foo', $response->getHeaderLine('Location'));
93+
$this->assertEquals('http://example.com/index.php/foo', $response->getHeaderLine('Location'));
9494
}
9595

9696
//--------------------------------------------------------------------

‎tests/system/Helpers/URLHelper/CurrentUrlTest.php‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ public function testUriStringAbsolute()
153153

154154
Services::injectMock('request', $request);
155155

156-
$url = current_url();
157156
$this->assertEquals('/assets/image.jpg', uri_string());
158157
}
159158

@@ -167,7 +166,6 @@ public function testUriStringRelative()
167166

168167
Services::injectMock('request', $request);
169168

170-
$url = current_url();
171169
$this->assertEquals('assets/image.jpg', uri_string(true));
172170
}
173171

@@ -182,7 +180,6 @@ public function testUriStringNoTrailingSlashAbsolute()
182180

183181
Services::injectMock('request', $request);
184182

185-
$url = current_url();
186183
$this->assertEquals('/assets/image.jpg', uri_string());
187184
}
188185

@@ -197,7 +194,6 @@ public function testUriStringNoTrailingSlashRelative()
197194

198195
Services::injectMock('request', $request);
199196

200-
$url = current_url();
201197
$this->assertEquals('assets/image.jpg', uri_string(true));
202198
}
203199

@@ -208,7 +204,6 @@ public function testUriStringEmptyAbsolute()
208204

209205
Services::injectMock('request', $request);
210206

211-
$url = current_url();
212207
$this->assertEquals('/', uri_string());
213208
}
214209

@@ -219,7 +214,6 @@ public function testUriStringEmptyRelative()
219214

220215
Services::injectMock('request', $request);
221216

222-
$url = current_url();
223217
$this->assertEquals('', uri_string(true));
224218
}
225219

@@ -234,23 +228,21 @@ public function testUriStringSubfolderAbsolute()
234228

235229
Services::injectMock('request', $request);
236230

237-
$url = current_url();
238231
$this->assertEquals('/subfolder/assets/image.jpg', uri_string());
239232
}
240233

241234
public function testUriStringSubfolderRelative()
242235
{
243236
$_SERVER['HTTP_HOST'] = 'example.com';
244-
$_SERVER['REQUEST_URI'] = '/assets/image.jpg';
245237
$_SERVER['REQUEST_URI'] = '/subfolder/assets/image.jpg';
238+
$_SERVER['SCRIPT_NAME'] = '/subfolder/index.php';
246239

247240
$this->config->baseURL = 'http://example.com/subfolder/';
248241
$request = Services::request($this->config);
249242
$request->uri = new URI('http://example.com/subfolder/assets/image.jpg');
250243

251244
Services::injectMock('request', $request);
252245

253-
$url = current_url();
254246
$this->assertEquals('assets/image.jpg', uri_string(true));
255247
}
256248

@@ -304,7 +296,8 @@ public function urlIsProvider()
304296
*/
305297
public function testUrlIs(string $currentPath, string $testPath, bool $expected)
306298
{
307-
$_SERVER['HTTP_HOST'] = 'example.com';
299+
$_SERVER['HTTP_HOST'] = 'example.com';
300+
$_SERVER['REQUEST_URI'] = '/' . $currentPath;
308301

309302
$request = Services::request();
310303
$request->uri = new URI('http://example.com/' . $currentPath);
@@ -319,6 +312,7 @@ public function testUrlIs(string $currentPath, string $testPath, bool $expected)
319312
public function testUrlIsNoIndex(string $currentPath, string $testPath, bool $expected)
320313
{
321314
$_SERVER['HTTP_HOST'] = 'example.com';
315+
$_SERVER['REQUEST_URI'] = '/' . $currentPath;
322316
$this->config->indexPage = '';
323317

324318
$request = Services::request($this->config);
@@ -333,8 +327,10 @@ public function testUrlIsNoIndex(string $currentPath, string $testPath, bool $ex
333327
*/
334328
public function testUrlIsWithSubfolder(string $currentPath, string $testPath, bool $expected)
335329
{
336-
$_SERVER['HTTP_HOST'] = 'example.com';
337-
$this->config->baseURL = 'http://example.com/subfolder/';
330+
$_SERVER['HTTP_HOST'] = 'example.com';
331+
$_SERVER['REQUEST_URI'] = '/' . $currentPath;
332+
$_SERVER['SCRIPT_NAME'] = '/subfolder/index.php';
333+
$this->config->baseURL = 'http://example.com/subfolder/';
338334

339335
$request = Services::request($this->config);
340336
$request->uri = new URI('http://example.com/subfolder/' . $currentPath);

‎user_guide_src/source/libraries/uri.rst‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,11 @@ using the URI class' static ``createURIString()`` method::
6161
// Creates: http://exmample.com/some/path?foo=bar#first-heading
6262
echo URI::createURIString('http', 'example.com', 'some/path', 'foo=bar', 'first-heading');
6363

64+
.. important:: When ``URI`` is cast to a string, it will attempt to adjust project URLs to the
65+
settings defined in ``Config\App``. If you need the exact, unaltered string representation
66+
then use ``URI::createURIString()`` instead.
67+
68+
6469
=============
6570
The URI Parts
6671
=============

0 commit comments

Comments
 (0)