diff --git a/src/Symfony/Component/Asset/PathPackage.php b/src/Symfony/Component/Asset/PathPackage.php index 4dcda08e06..5621986fb5 100644 --- a/src/Symfony/Component/Asset/PathPackage.php +++ b/src/Symfony/Component/Asset/PathPackage.php @@ -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; } diff --git a/src/Symfony/Component/Asset/Tests/PathPackageTest.php b/src/Symfony/Component/Asset/Tests/PathPackageTest.php index a1ac26442a..4a9f90df90 100644 --- a/src/Symfony/Component/Asset/Tests/PathPackageTest.php +++ b/src/Symfony/Component/Asset/Tests/PathPackageTest.php @@ -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'), ); }