Skip to content

Commit

Permalink
feature #13937 [FrameworkBundle] Allow to disable Kernel reboot (sroze)
Browse files Browse the repository at this point in the history
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Allow to disable Kernel reboot

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

This PR introduce a `disableReboot` method on `Client` class.

A use case of this method is to prevent rebooting kernel if we manually rebooted it before the request to manipulate registered services.

Commits
-------

648aacb [FrameworkBundle] Allow to disable Kernel reboot
  • Loading branch information
fabpot committed Mar 23, 2015
2 parents 95b6c56 + 648aacb commit 7e94662
Show file tree
Hide file tree
Showing 2 changed files with 87 additions and 1 deletion.
23 changes: 22 additions & 1 deletion src/Symfony/Bundle/FrameworkBundle/Client.php
Expand Up @@ -29,6 +29,7 @@ class Client extends BaseClient
{
private $hasPerformedRequest = false;
private $profiler = false;
private $reboot = true;

/**
* {@inheritdoc}
Expand Down Expand Up @@ -84,6 +85,26 @@ public function enableProfiler()
}
}

/**
* By default, the Client reboots the Kernel for each request. This method
* allows to keep the same kernel across requests.
*/
public function disableReboot()
{
$this->reboot = false;
}

/**
* Enable the kernel reboot behaviour.
*
* If the kernel reboot was previously disabled, you can re-enable it with
* this method.
*/
public function enableReboot()
{
$this->reboot = true;
}

/**
* {@inheritdoc}
*
Expand All @@ -95,7 +116,7 @@ protected function doRequest($request)
{
// avoid shutting down the Kernel if no request has been performed yet
// WebTestCase::createClient() boots the Kernel but do not handle a request
if ($this->hasPerformedRequest) {
if ($this->hasPerformedRequest && $this->reboot) {
$this->kernel->shutdown();
} else {
$this->hasPerformedRequest = true;
Expand Down
65 changes: 65 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/Tests/ClientTest.php
@@ -0,0 +1,65 @@
<?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\Bundle\FrameworkBundle\Tests;

use Symfony\Bundle\FrameworkBundle\Client;
use Symfony\Bundle\FrameworkBundle\Tests\Functional\WebTestCase;
use Symfony\Component\HttpFoundation\Response;

class ClientTest extends WebTestCase
{
public function testRebootKernelBetweenRequests()
{
$mock = $this->getKernelMock();
$mock->expects($this->once())->method('shutdown');

$client = new Client($mock);
$client->request('GET', '/');
$client->request('GET', '/');
}

public function testDisabledRebootKernel()
{
$mock = $this->getKernelMock();
$mock->expects($this->never())->method('shutdown');

$client = new Client($mock);
$client->disableReboot();
$client->request('GET', '/');
$client->request('GET', '/');
}

public function testEnableRebootKernel()
{
$mock = $this->getKernelMock();
$mock->expects($this->once())->method('shutdown');

$client = new Client($mock);
$client->disableReboot();
$client->request('GET', '/');
$client->request('GET', '/');
$client->enableReboot();
$client->request('GET', '/');
}

private function getKernelMock()
{
$mock = $this->getMockBuilder($this->getKernelClass())
->setMethods(array('shutdown', 'boot', 'handle'))
->disableOriginalConstructor()
->getMock();

$mock->expects($this->any())->method('handle')->willReturn(new Response('foo'));

return $mock;
}
}

0 comments on commit 7e94662

Please sign in to comment.