Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit18d7304

Browse files
committed
Changing behavior back to earlier behavior: an opening / says you do not want path prefixed
1 parent551283d commit18d7304

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,13 @@ public function getUrl($path)
5656
return$path;
5757
}
5858

59-
return$this->getBasePath().ltrim($this->getVersionStrategy()->applyVersion($path),'/');
59+
$versionedPath =$this->getVersionStrategy()->applyVersion($path);
60+
61+
if ('/' ===substr($versionedPath,0,1)) {
62+
return$versionedPath;
63+
}
64+
65+
return$this->getBasePath().ltrim($versionedPath,'/');
6066
}
6167

6268
/**

‎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
publicfunctiongetContextConfigs()
6262
{
6363
returnarray(
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)
[8]ページ先頭
©2009-2025 Movatter.jp