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

bug #22528 [Asset] Starting slash should indicate no basePath wanted (weaverryan) 

This PR was squashed before being merged into the 2.7 branch (closes #22528).

Discussion
----------

[Asset] Starting slash should indicate no basePath wanted

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | yes-ish... and no-ish
| New feature?  | no
| BC breaks?    | yes
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

**Important** View the second commit for an accurate diff. The first commit just renames some strings in a test for clarity.

When we moved `PathPackage` from `Templating` to `Asset`, we actually changed its behavior. Assume that we're deployed under a `/subdir` subdirectory:

**Before** `{{ asset('/main.css') }}` would *not* have the base path prefixed -> `/main.css`

**After** `{{ asset('/main.css') }}` *does* have the base path prefixed -> `/subdir/main.css`

3adff11d72/src/Symfony/Component/Templating/Asset/PathPackage.php (L61-L63)

This PR simply reverses that, to the *previous* behavior. This *is* a BC break... and also arguably a bug fix :). Interestingly, when we changed the behavior the first time (i.e. broke BC), I don't think that anyone noticed. It should only affect users deployed under a subdirectory.

Why do I care? I'm using the new `JsonManifestVersionStrategy` with a library that is outputting paths that *already* include my subdirectory:

```json
{
    "build/main.css": "/subdir/build/main.abc123.css"
}
```

So, I do not want Symfony to detect the `/subdir` and apply it a second time.

Commits
-------

3cc096b540 [Asset] Starting slash should indicate no basePath wanted
This commit is contained in:
Fabien Potencier 2017-04-28 16:08:26 -07:00
parent af15ead255 3cc096b540
commit c669b88403
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'),
);
}