Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[5.6] remove full baseUrl from generated url paths (follow up) #24101

Merged
merged 3 commits into from
May 4, 2018
Merged

[5.6] remove full baseUrl from generated url paths (follow up) #24101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13bb2ba
use getBaseUrl() instead of getBasePath()
tomschlick May 3, 2018
0853b2b
add tests for request url with filename suffix
tomschlick May 3, 2018
5df8e20
add test case for files not in a folder
tomschlick May 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Illuminate/Routing/RouteUrlGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public function to($route, $parameters = [], $absolute = false)
if (! $absolute) {
$uri = preg_replace('#^(//|[^/?])+#', '', $uri);

if ($base = $this->request->getBasePath()) {
if ($base = $this->request->getBaseUrl()) {
$uri = preg_replace('#^'.$base.'#i', '', $uri);
}

Expand Down
42 changes: 41 additions & 1 deletion tests/Routing/RoutingUrlGeneratorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public function testBasicGenerationWithHostFormatting()
$this->assertEquals('/named-route', $url->route('plain', [], false));
}

public function testBasicGenerationWithRequestBasePath()
public function testBasicGenerationWithRequestBaseUrlWithSubfolder()
{
$request = Request::create('http://www.foo.com/subfolder/foo/bar/subfolder/');

Expand All @@ -79,7 +79,47 @@ public function testBasicGenerationWithRequestBasePath()
$route = new Route(['GET'], 'foo/bar/subfolder', ['as' => 'foobar']);
$routes->add($route);

$this->assertEquals('/subfolder', $request->getBaseUrl());
$this->assertEquals('/foo/bar/subfolder', $url->route('foobar', [], false));
}

public function testBasicGenerationWithRequestBaseUrlWithSubfolderAndFileSuffix()
{
$request = Request::create('http://www.foo.com/subfolder/index.php');

$request->server->set('SCRIPT_FILENAME', '/var/www/laravel-project/public/subfolder/index.php');
$request->server->set('PHP_SELF', '/subfolder/index.php');

$url = new UrlGenerator(
$routes = new RouteCollection,
$request
);

$route = new Route(['GET'], 'foo/bar/subfolder', ['as' => 'foobar']);
$routes->add($route);

$this->assertEquals('/subfolder', $request->getBasePath());
$this->assertEquals('/subfolder/index.php', $request->getBaseUrl());
$this->assertEquals('/foo/bar/subfolder', $url->route('foobar', [], false));
}

public function testBasicGenerationWithRequestBaseUrlWithFileSuffix()
{
$request = Request::create('http://www.foo.com/other.php');

$request->server->set('SCRIPT_FILENAME', '/var/www/laravel-project/public/other.php');
$request->server->set('PHP_SELF', '/other.php');

$url = new UrlGenerator(
$routes = new RouteCollection,
$request
);

$route = new Route(['GET'], 'foo/bar/subfolder', ['as' => 'foobar']);
$routes->add($route);

$this->assertEquals('', $request->getBasePath());
$this->assertEquals('/other.php', $request->getBaseUrl());
$this->assertEquals('/foo/bar/subfolder', $url->route('foobar', [], false));
}

Expand Down