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

tweaked previous merge

Browse Source
This commit is contained in:
Fabien Potencier 2012-11-21 09:43:39 +01:00
parent 63b44861d0
commit 5aa6788298
3 changed files with 4 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Symfony/Component/HttpKernel/Event/GetResponseForControllerResultEvent.php
View File

@ -29,6 +29,7 @@ class GetResponseForControllerResultEvent extends GetResponseEvent
{
/**
* The return value of the controller
*
* @var mixed
*/
private $controllerResult;
@ -41,7 +42,7 @@ class GetResponseForControllerResultEvent extends GetResponseEvent
}
/**
* Returns the return value of the controller
* Returns the return value of the controller.
*
* @return mixed The controller return value
*
@ -51,9 +52,9 @@ class GetResponseForControllerResultEvent extends GetResponseEvent
{
return $this->controllerResult;
}
/**
* Assign the return value of the controller
* Assigns the return value of the controller.
*
* @param array The controller return value
*

31
src/Symfony/Component/HttpKernel/Tests/EventListener/ControllerResponseInjectorListener.php
View File

@ -1,31 +0,0 @@
<?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\Component\HttpKernel\Tests\EventListener;
use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
class ControllerResponseInjectorListener
{
protected $newParameters = array();
public function __construct(array $newParameters)
{
$this->newParameters = $newParameters;
}
public function onKernelView(GetResponseForControllerResultEvent $event)
{
$controllerResult = $event->getControllerResult();
$event->setControllerResult(array_merge($controllerResult, $this->newParameters));
}
}

60
src/Symfony/Component/HttpKernel/Tests/EventListener/ControllerResponseTest.php
View File

@ -1,60 +0,0 @@
<?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\Component\HttpKernel\Tests\EventListener;
use Symfony\Component\HttpKernel\EventListener\ResponseListener;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\HttpKernelInterface;
use Symfony\Component\HttpKernel\Event\GetResponseForControllerResultEvent;
use Symfony\Component\HttpKernel\KernelEvents;
use Symfony\Component\EventDispatcher\EventDispatcher;
class ControllerResponseTest extends \PHPUnit_Framework_TestCase
{
private $dispatcher;
private $kernel;
protected function setUp()
{
if (!class_exists('Symfony\Component\EventDispatcher\EventDispatcher')) {
$this->markTestSkipped('The "EventDispatcher" component is not available');
}
$this->dispatcher = new EventDispatcher();
$listener = new ControllerResponseInjectorListener(array(
'bar' => 'bar',
));
$this->dispatcher->addListener(KernelEvents::VIEW, array($listener, 'onKernelView'));
$this->kernel = $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface');
}
protected function tearDown()
{
$this->dispatcher = null;
$this->kernel = null;
}
public function testControllerResponseIsChainable()
{
$controllerResponse = array('foo' => 'foo');
$event = new GetResponseForControllerResultEvent($this->kernel, new Request(), HttpKernelInterface::MASTER_REQUEST, $controllerResponse);
$this->dispatcher->dispatch(KernelEvents::VIEW, $event);
$this->assertEquals(array('foo' => 'foo', 'bar' => 'bar'), $event->getControllerResult());
}
}