diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Asset] Starting slash should indicate no basePath wanted

This commit is contained in:
Ryan Weaver 2017-04-25 21:36:30 -04:00 committed by Fabien Potencier
parent fc1fe8decf
commit 3cc096b540
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Symfony/Component/Asset/PathPackage.php
View File

@ -58,7 +58,8 @@ class PathPackage extends Package
$versionedPath = $this->getVersionStrategy()->applyVersion($path);
if ($this->isAbsoluteUrl($versionedPath)) {
// if absolute or begins with /, we're done
if ($this->isAbsoluteUrl($versionedPath) || ($versionedPath && '/' === $versionedPath[0])) {
return $versionedPath;
}

38
src/Symfony/Component/Asset/Tests/PathPackageTest.php
View File

@ -35,16 +35,16 @@ class PathPackageTest extends TestCase
array('', '', '/foo', '/foo?v1'),
array('/foo', '', '/foo', '/foo/foo?v1'),
array('/foo', '', 'foo', '/foo/foo?v1'),
array('foo', '', 'foo', '/foo/foo?v1'),
array('foo/', '', 'foo', '/foo/foo?v1'),
array('/foo/', '', 'foo', '/foo/foo?v1'),
array('/foo', '', '/bar', '/bar?v1'),
array('/foo', '', 'bar', '/foo/bar?v1'),
array('foo', '', 'bar', '/foo/bar?v1'),
array('foo/', '', 'bar', '/foo/bar?v1'),
array('/foo/', '', 'bar', '/foo/bar?v1'),
array('/foo', 'version-%2$s/%1$s', '/foo', '/foo/version-v1/foo'),
array('/foo', 'version-%2$s/%1$s', 'foo', '/foo/version-v1/foo'),
array('/foo', 'version-%2$s/%1$s', 'foo/', '/foo/version-v1/foo/'),
array('/foo', 'version-%2$s/%1$s', '/foo/', '/foo/version-v1/foo/'),
array('/foo', 'version-%2$s/%1$s', '/bar', '/version-v1/bar'),
array('/foo', 'version-%2$s/%1$s', 'bar', '/foo/version-v1/bar'),
array('/foo', 'version-%2$s/%1$s', 'bar/', '/foo/version-v1/bar/'),
array('/foo', 'version-%2$s/%1$s', '/bar/', '/version-v1/bar/'),
);
}
@ -61,17 +61,17 @@ class PathPackageTest extends TestCase
public function getContextConfigs()
{
return array(
array('', '/foo', '', '/foo', '/foo/foo?v1'),
array('', '/foo', '', 'foo', '/foo/foo?v1'),
array('', 'foo', '', 'foo', '/foo/foo?v1'),
array('', 'foo/', '', 'foo', '/foo/foo?v1'),
array('', '/foo/', '', 'foo', '/foo/foo?v1'),
array('', '/foo', '', '/baz', '/baz?v1'),
array('', '/foo', '', 'baz', '/foo/baz?v1'),
array('', 'foo', '', 'baz', '/foo/baz?v1'),
array('', 'foo/', '', 'baz', '/foo/baz?v1'),
array('', '/foo/', '', 'baz', '/foo/baz?v1'),
array('/bar', '/foo', '', '/foo', '/bar/foo/foo?v1'),
array('/bar', '/foo', '', 'foo', '/bar/foo/foo?v1'),
array('/bar', 'foo', '', 'foo', '/bar/foo/foo?v1'),
array('/bar', 'foo/', '', 'foo', '/bar/foo/foo?v1'),
array('/bar', '/foo/', '', 'foo', '/bar/foo/foo?v1'),
array('/bar', '/foo', '', '/baz', '/baz?v1'),
array('/bar', '/foo', '', 'baz', '/bar/foo/baz?v1'),
array('/bar', 'foo', '', 'baz', '/bar/foo/baz?v1'),
array('/bar', 'foo/', '', 'baz', '/bar/foo/baz?v1'),
array('/bar', '/foo/', '', 'baz', '/bar/foo/baz?v1'),
);
}