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

[FrameworkBundle] use the new request_stack object in the GlobalVariables object

Browse Source
This commit is contained in:
Hugo Hamon 2013-11-20 13:37:49 +01:00
parent 8d85745430
commit 9c2ce49d92
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Bundle/FrameworkBundle/Templating/GlobalVariables.php
View File

@ -78,8 +78,8 @@ class GlobalVariables
*/
public function getRequest()
{
if ($this->container->has('request') && $request = $this->container->get('request')) {
return $request;
if ($this->container->has('request_stack')) {
return $this->container->get('request_stack')->getCurrentRequest();
}
}

11
src/Symfony/Bundle/FrameworkBundle/Tests/Templating/PhpEngineTest.php
View File

@ -14,6 +14,7 @@ namespace Symfony\Bundle\FrameworkBundle\Tests\Templating;
use Symfony\Bundle\FrameworkBundle\Templating\PhpEngine;
use Symfony\Component\DependencyInjection\Container;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\HttpFoundation\Session\Session;
use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
use Symfony\Component\Templating\TemplateNameParser;
@ -37,7 +38,7 @@ class PhpEngineTest extends TestCase
$loader = $this->getMockForAbstractClass('Symfony\Component\Templating\Loader\Loader');
$engine = new PhpEngine(new TemplateNameParser(), $container, $loader, new GlobalVariables($container));
$container->set('request', null);
$container->set('request_stack', null);
$globals = $engine->getGlobals();
$this->assertEmpty($globals['app']->getRequest());
@ -63,11 +64,13 @@ class PhpEngineTest extends TestCase
protected function getContainer()
{
$container = new Container();
$request = new Request();
$session = new Session(new MockArraySessionStorage());
$session = new Session(new MockArraySessionStorage());
$request = new Request();
$stack = new RequestStack();
$stack->push($request);
$request->setSession($session);
$container->set('request', $request);
$container->set('request_stack', $stack);
return $container;
}