diff --git a/src/Symfony/Component/Asset/PathPackage.php b/src/Symfony/Component/Asset/PathPackage.php
index 4dcda08e062c..5621986fb58b 100644
--- a/src/Symfony/Component/Asset/PathPackage.php
+++ b/src/Symfony/Component/Asset/PathPackage.php
@@ -58,7 +58,8 @@ public function getUrl($path)
$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 a1ac26442a06..4a9f90df90a1 100644
--- a/src/Symfony/Component/Asset/Tests/PathPackageTest.php
+++ b/src/Symfony/Component/Asset/Tests/PathPackageTest.php
@@ -35,16 +35,16 @@ public function getConfigs()
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', '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', '', '/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', '/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 @@ public function testGetUrlWithContext($basePathRequest, $basePath, $format, $pat
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('/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('', '/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', '', '/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'),
);
}
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy