feature #13264 URL manipulations as a Twig extension (fabpot)
This PR was merged into the 2.7 branch. Discussion ---------- URL manipulations as a Twig extension | Q | A | ------------- | --- | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | symfony/symfony-docs#4805 While working on the new asset component, I realized that the "absolute URL" feature was misplaced and would benefit from being exposed as a Twig function (composition is always a good thing). Then, I wondered if having a Twig function to generate a relative path (like done by the Routing component would also make sense). And here is the corresponding PR. ```jinja {# generate an absolute URL for the given absolute path #} {{ absolute_url('/me.png') }} {# generate a relative path for the given absolute path (based on the current Request) #} {{ relative_path('/foo/me.png') }} {# compose as you see fit #} {{ absolute_url(asset('me.png')) }} ``` As you can see, we require an absolute path for both functions (and we even add the leading slash if it is omitted), not sure if we want to do otherwise. ping @tobion Commits -------0ec852d
added a relative_path Twig functionee27ed8
added an absolute_url() Twig function
This commit is contained in:
commit
861804be5f
@ -1,6 +1,11 @@
|
|||||||
CHANGELOG
|
CHANGELOG
|
||||||
=========
|
=========
|
||||||
|
|
||||||
|
2.7.0
|
||||||
|
-----
|
||||||
|
|
||||||
|
* added an HttpFoundation extension (provides the `absolute_url` and the `relative_path` functions)
|
||||||
|
|
||||||
2.5.0
|
2.5.0
|
||||||
-----
|
-----
|
||||||
|
|
||||||
|
109
src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php
Normal file
109
src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php
Normal file
@ -0,0 +1,109 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of the Symfony package.
|
||||||
|
*
|
||||||
|
* (c) Fabien Potencier <fabien@symfony.com>
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view the LICENSE
|
||||||
|
* file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Symfony\Bridge\Twig\Extension;
|
||||||
|
|
||||||
|
use Symfony\Component\HttpFoundation\RequestStack;
|
||||||
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Twig extension for the Symfony HttpFoundation component.
|
||||||
|
*
|
||||||
|
* @author Fabien Potencier <fabien@symfony.com>
|
||||||
|
*/
|
||||||
|
class HttpFoundationExtension extends \Twig_Extension
|
||||||
|
{
|
||||||
|
private $requestStack;
|
||||||
|
|
||||||
|
public function __construct(RequestStack $requestStack)
|
||||||
|
{
|
||||||
|
$this->requestStack = $requestStack;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@inheritdoc}
|
||||||
|
*/
|
||||||
|
public function getFunctions()
|
||||||
|
{
|
||||||
|
return array(
|
||||||
|
new \Twig_SimpleFunction('absolute_url', array($this, 'generateAbsoluteUrl')),
|
||||||
|
new \Twig_SimpleFunction('relative_path', array($this, 'generateRelativePath')),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the absolute URL for the given absolute or relative path.
|
||||||
|
*
|
||||||
|
* This method returns the path unchanged if no request is available.
|
||||||
|
*
|
||||||
|
* @param string $path The path
|
||||||
|
*
|
||||||
|
* @return string The absolute URL
|
||||||
|
*
|
||||||
|
* @see Request::getUriForPath()
|
||||||
|
*/
|
||||||
|
public function generateAbsoluteUrl($path)
|
||||||
|
{
|
||||||
|
if (false !== strpos($path, '://') || '//' === substr($path, 0, 2)) {
|
||||||
|
return $path;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!$request = $this->requestStack->getMasterRequest()) {
|
||||||
|
return $path;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!$path || '/' !== $path[0]) {
|
||||||
|
$prefix = $request->getPathInfo();
|
||||||
|
$last = strlen($prefix) - 1;
|
||||||
|
if ($last !== $pos = strrpos($prefix, '/')) {
|
||||||
|
$prefix = substr($prefix, 0, $pos).'/';
|
||||||
|
}
|
||||||
|
|
||||||
|
$path = $prefix.$path;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $request->getUriForPath($path);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns a relative path based on the current Request.
|
||||||
|
*
|
||||||
|
* This method returns the path unchanged if no request is available.
|
||||||
|
*
|
||||||
|
* @param string $path The path
|
||||||
|
*
|
||||||
|
* @return string The relative path
|
||||||
|
*
|
||||||
|
* @see Request::getRelativeUriForPath()
|
||||||
|
*/
|
||||||
|
public function generateRelativePath($path)
|
||||||
|
{
|
||||||
|
if (false !== strpos($path, '://') || '//' === substr($path, 0, 2)) {
|
||||||
|
return $path;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!$request = $this->requestStack->getMasterRequest()) {
|
||||||
|
return $path;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $request->getRelativeUriForPath($path);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the name of the extension.
|
||||||
|
*
|
||||||
|
* @return string The extension name
|
||||||
|
*/
|
||||||
|
public function getName()
|
||||||
|
{
|
||||||
|
return 'request';
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,74 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* This file is part of the Symfony package.
|
||||||
|
*
|
||||||
|
* (c) Fabien Potencier <fabien@symfony.com>
|
||||||
|
*
|
||||||
|
* For the full copyright and license information, please view the LICENSE
|
||||||
|
* file that was distributed with this source code.
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace Symfony\Bridge\Twig\Tests\Extension;
|
||||||
|
|
||||||
|
use Symfony\Bridge\Twig\Extension\HttpFoundationExtension;
|
||||||
|
use Symfony\Component\HttpFoundation\RequestStack;
|
||||||
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
|
|
||||||
|
class HttpFoundationExtensionTest extends \PHPUnit_Framework_TestCase
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @dataProvider getGenerateAbsoluteUrlData()
|
||||||
|
*/
|
||||||
|
public function testGenerateAbsoluteUrl($expected, $path, $pathinfo)
|
||||||
|
{
|
||||||
|
$stack = new RequestStack();
|
||||||
|
$stack->push(Request::create($pathinfo));
|
||||||
|
$extension = new HttpFoundationExtension($stack);
|
||||||
|
|
||||||
|
$this->assertEquals($expected, $extension->generateAbsoluteUrl($path));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getGenerateAbsoluteUrlData()
|
||||||
|
{
|
||||||
|
return array(
|
||||||
|
array('http://localhost/foo.png', '/foo.png', '/foo/bar.html'),
|
||||||
|
array('http://localhost/foo/foo.png', 'foo.png', '/foo/bar.html'),
|
||||||
|
array('http://localhost/foo/foo.png', 'foo.png', '/foo/bar'),
|
||||||
|
array('http://localhost/foo/bar/foo.png', 'foo.png', '/foo/bar/'),
|
||||||
|
|
||||||
|
array('http://example.com/baz', 'http://example.com/baz', '/'),
|
||||||
|
array('https://example.com/baz', 'https://example.com/baz', '/'),
|
||||||
|
array('//example.com/baz', '//example.com/baz', '/'),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dataProvider getGenerateRelativePathData()
|
||||||
|
*/
|
||||||
|
public function testGenerateRelativePath($expected, $path, $pathinfo)
|
||||||
|
{
|
||||||
|
if (!method_exists('Symfony\Component\HttpFoundation\Request', 'getRelativeUriForPath')) {
|
||||||
|
$this->markTestSkipped('Your version of Symfony HttpFoundation is too old.');
|
||||||
|
}
|
||||||
|
|
||||||
|
$stack = new RequestStack();
|
||||||
|
$stack->push(Request::create($pathinfo));
|
||||||
|
$extension = new HttpFoundationExtension($stack);
|
||||||
|
|
||||||
|
$this->assertEquals($expected, $extension->generateRelativePath($path));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getGenerateRelativePathData()
|
||||||
|
{
|
||||||
|
return array(
|
||||||
|
array('../foo.png', '/foo.png', '/foo/bar.html'),
|
||||||
|
array('../baz/foo.png', '/baz/foo.png', '/foo/bar.html'),
|
||||||
|
array('baz/foo.png', 'baz/foo.png', '/foo/bar.html'),
|
||||||
|
|
||||||
|
array('http://example.com/baz', 'http://example.com/baz', '/'),
|
||||||
|
array('https://example.com/baz', 'https://example.com/baz', '/'),
|
||||||
|
array('//example.com/baz', '//example.com/baz', '/'),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
@ -42,5 +42,9 @@ class ExtensionPass implements CompilerPassInterface
|
|||||||
if ($container->has('fragment.handler')) {
|
if ($container->has('fragment.handler')) {
|
||||||
$container->getDefinition('twig.extension.httpkernel')->addTag('twig.extension');
|
$container->getDefinition('twig.extension.httpkernel')->addTag('twig.extension');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($container->has('request_stack')) {
|
||||||
|
$container->getDefinition('twig.extension.httpfoundation')->addTag('twig.extension');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -103,6 +103,9 @@
|
|||||||
<argument type="service" id="fragment.handler" />
|
<argument type="service" id="fragment.handler" />
|
||||||
</service>
|
</service>
|
||||||
|
|
||||||
|
<service id="twig.extension.httpfoundation" class="Symfony\Bridge\Twig\Extension\HttpFoundationExtension" public="false">
|
||||||
|
<argument type="service" id="request_stack" />
|
||||||
|
</service>
|
||||||
|
|
||||||
<service id="twig.extension.form" class="%twig.extension.form.class%" public="false">
|
<service id="twig.extension.form" class="%twig.extension.form.class%" public="false">
|
||||||
<argument type="service" id="twig.form.renderer" />
|
<argument type="service" id="twig.form.renderer" />
|
||||||
|
@ -1137,6 +1137,61 @@ class Request
|
|||||||
return $this->getSchemeAndHttpHost().$this->getBaseUrl().$path;
|
return $this->getSchemeAndHttpHost().$this->getBaseUrl().$path;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the path as relative reference from the current Request path.
|
||||||
|
*
|
||||||
|
* Only the URIs path component (no schema, host etc.) is relevant and must be given.
|
||||||
|
* Both paths must be absolute and not contain relative parts.
|
||||||
|
* Relative URLs from one resource to another are useful when generating self-contained downloadable document archives.
|
||||||
|
* Furthermore, they can be used to reduce the link size in documents.
|
||||||
|
*
|
||||||
|
* Example target paths, given a base path of "/a/b/c/d":
|
||||||
|
* - "/a/b/c/d" -> ""
|
||||||
|
* - "/a/b/c/" -> "./"
|
||||||
|
* - "/a/b/" -> "../"
|
||||||
|
* - "/a/b/c/other" -> "other"
|
||||||
|
* - "/a/x/y" -> "../../x/y"
|
||||||
|
*
|
||||||
|
* @param string $path The target path
|
||||||
|
*
|
||||||
|
* @return string The relative target path
|
||||||
|
*/
|
||||||
|
public function getRelativeUriForPath($path)
|
||||||
|
{
|
||||||
|
// be sure that we are dealing with an absolute path
|
||||||
|
if (!isset($path[0]) || '/' !== $path[0]) {
|
||||||
|
return $path;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($path === $basePath = $this->getPathInfo()) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
$sourceDirs = explode('/', isset($basePath[0]) && '/' === $basePath[0] ? substr($basePath, 1) : $basePath);
|
||||||
|
$targetDirs = explode('/', isset($path[0]) && '/' === $path[0] ? substr($path, 1) : $path);
|
||||||
|
array_pop($sourceDirs);
|
||||||
|
$targetFile = array_pop($targetDirs);
|
||||||
|
|
||||||
|
foreach ($sourceDirs as $i => $dir) {
|
||||||
|
if (isset($targetDirs[$i]) && $dir === $targetDirs[$i]) {
|
||||||
|
unset($sourceDirs[$i], $targetDirs[$i]);
|
||||||
|
} else {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$targetDirs[] = $targetFile;
|
||||||
|
$path = str_repeat('../', count($sourceDirs)).implode('/', $targetDirs);
|
||||||
|
|
||||||
|
// A reference to the same base directory or an empty subdirectory must be prefixed with "./".
|
||||||
|
// This also applies to a segment with a colon character (e.g., "file:colon") that cannot be used
|
||||||
|
// as the first segment of a relative-path reference, as it would be mistaken for a scheme name
|
||||||
|
// (see http://tools.ietf.org/html/rfc3986#section-4.2).
|
||||||
|
return !isset($path[0]) || '/' === $path[0]
|
||||||
|
|| false !== ($colonPos = strpos($path, ':')) && ($colonPos < ($slashPos = strpos($path, '/')) || false === $slashPos)
|
||||||
|
? "./$path" : $path;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Generates the normalized query string for the Request.
|
* Generates the normalized query string for the Request.
|
||||||
*
|
*
|
||||||
|
@ -575,6 +575,26 @@ class RequestTest extends \PHPUnit_Framework_TestCase
|
|||||||
$this->assertEquals('http://servername/some/path', $request->getUriForPath('/some/path'));
|
$this->assertEquals('http://servername/some/path', $request->getUriForPath('/some/path'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dataProvider getRelativeUriForPathData()
|
||||||
|
*/
|
||||||
|
public function testGetRelativeUriForPath($expected, $pathinfo, $path)
|
||||||
|
{
|
||||||
|
$this->assertEquals($expected, Request::create($pathinfo)->getRelativeUriForPath($path));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getRelativeUriForPathData()
|
||||||
|
{
|
||||||
|
return array(
|
||||||
|
array('me.png', '/foo', '/me.png'),
|
||||||
|
array('../me.png', '/foo/bar', '/me.png'),
|
||||||
|
array('me.png', '/foo/bar', '/foo/me.png'),
|
||||||
|
array('../baz/me.png', '/foo/bar/b', '/foo/baz/me.png'),
|
||||||
|
array('../../fooz/baz/me.png', '/foo/bar/b', '/fooz/baz/me.png'),
|
||||||
|
array('baz/me.png', '/foo/bar/b', 'baz/me.png'),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @covers Symfony\Component\HttpFoundation\Request::getUserInfo
|
* @covers Symfony\Component\HttpFoundation\Request::getUserInfo
|
||||||
*/
|
*/
|
||||||
|
Reference in New Issue
Block a user