8000 Changing behavior back to earlier behavior: an opening / says you do … · symfony/symfony@91664fe · GitHub
[go: up one dir, main page]
Skip to content 8000

Commit 91664fe

Browse files
weaverryanweaverryan
committed
Changing behavior back to earlier behavior: an opening / says you do not want path prefixed
1 parent da85fee commit 91664fe

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

‎src/Symfony/Component/Asset/PathPackage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public function getUrl($path)
5858

5959
$versionedPath = $this->getVersionStrategy()->applyVersion($path);
6060

61-
if ($this->isAbsoluteUrl($versionedPath)) {
61+
if ($this->isAbsoluteUrl($versionedPath) || '/' === substr($versionedPath, 0, 1)) {
6262
return $versionedPath;
6363
}
6464

‎src/Symfony/Component/Asset/Tests/PathPackageTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@ public function getConfigs()
3535

3636
array('', '', '/foo', '/foo?v1'),
3737

38-
array('/foo', '', '/bar', '/foo/bar?v1'),
38+
array('/foo', '', '/bar', '/bar?v1'),
3939
array('/foo', '', 'bar', '/foo/bar?v1'),
4040
array('foo', '', 'bar', '/foo/bar?v1'),
4141
array('foo/', '', 'bar', '/foo/bar?v1'),
4242
array('/foo/', '', 'bar', '/foo/bar?v1'),
4343

44-
array('/foo', 'version-%2$s/%1$s', '/bar', '/foo/version-v1/bar'),
44+
array('/foo', 'version-%2$s/%1$s', '/bar', '/version-v1/bar'),
4545
array('/foo', 'version-%2$s/%1$s', 'bar', '/foo/version-v1/bar'),
4646
array('/foo', 'version-%2$s/%1$s', 'bar/', '/foo/version-v1/bar/'),
47-
array('/foo', 'version-%2$s/%1$s', '/bar/', '/foo/version-v1/bar/'),
47+
array('/foo', 'version-%2$s/%1$s', '/bar/', '/version-v1/bar/'),
4848
);
4949
}
5050

@@ -61,13 +61,13 @@ public function testGetUrlWithContext($basePathRequest, $basePath, $format, $pat
6161
public function getContextConfigs()
6262
{
6363
return array(
64-
array('', '/foo', '', '/baz', '/foo/baz?v1'),
64+
array('', '/foo', '', '/baz', '/baz?v1'),
6565
array('', '/foo', '', 'baz', '/foo/baz?v1'),
6666
array('', 'foo', '', 'baz', '/foo/baz?v1'),
6767
array('', 'foo/', '', 'baz', '/foo/baz?v1'),
6868
array('', '/foo/', '', 'baz', '/foo/baz?v1'),
6969

70-
array('/bar', '/foo', '', '/baz', '/bar/foo/baz?v1'),
70+
array('/bar', '/foo', '', '/baz', '/baz?v1'),
7171
array('/bar', '/foo', '', 'baz', '/bar/foo/baz?v1'),
7272
array('/bar', 'foo', '', 'baz', '/bar/foo/baz?v1'),
7373
array('/bar', 'foo/', '', 'baz', '/bar/foo/baz?v1'),

0 commit comments

Comments
 (0)
0