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

Fixed absolute_url for absolute paths

Browse Source
This commit is contained in:
florianv 2015-02-20 00:13:09 +01:00
parent a630d87d57
commit 08aa7bc223
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php
View File

@ -67,10 +67,10 @@ class HttpFoundationExtension extends \Twig_Extension
$prefix = substr($prefix, 0, $pos).'/';
}
$path = $prefix.$path;
return $request->getUriForPath($prefix.$path);
}
return $request->getUriForPath($path);
return $request->getSchemeAndHttpHost().$path;
}
/**

15
src/Symfony/Bridge/Twig/Tests/Extension/HttpFoundationExtensionTest.php
View File

@ -43,6 +43,21 @@ class HttpFoundationExtensionTest extends \PHPUnit_Framework_TestCase
);
}
public function testGenerateAbsoluteUrlWithScriptFileName()
{
$request = Request::create('http://localhost/app/web/app_dev.php');
$request->server->set('SCRIPT_FILENAME', '/var/www/app/web/app_dev.php');
$stack = new RequestStack();
$stack->push($request);
$extension = new HttpFoundationExtension($stack);
$this->assertEquals(
'http://localhost/app/web/bundles/framework/css/structure.css',
$extension->generateAbsoluteUrl('/app/web/bundles/framework/css/structure.css')
);
}
/**
* @dataProvider getGenerateRelativePathData()
*/