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

[HttpKernel] fixed scope management in HttpKernel

Browse Source 
We should always leave the request scope at the end of the request processing.
If not, the HttpKernel leaves the container in a different state.
This commit is contained in:
Fabien Potencier 2011-01-23 08:47:00 +01:00
parent 86b357d70b
commit b577ce665a
2 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Symfony/Bundle/FrameworkBundle/HttpKernel.php
View File

@ -32,18 +32,14 @@ class HttpKernel extends BaseHttpKernel
try {
$response = parent::handle($request, $type, $catch);
if (HttpKernelInterface::MASTER_REQUEST !== $type) {
$this->container->leaveScope('request');
}
return $response;
} catch (\Exception $e) {
if (HttpKernelInterface::MASTER_REQUEST !== $type) {
$this->container->leaveScope('request');
}
$this->container->leaveScope('request');
throw $e;
}
$this->container->leaveScope('request');
return $response;
}
}
}

34
src/Symfony/Bundle/FrameworkBundle/Tests/HttpKernelTest.php
View File

@ -25,18 +25,11 @@ class HttpKernelTest extends \PHPUnit_Framework_TestCase
->method('enterScope')
->with($this->equalTo('request'))
;
if ($type !== HttpKernelInterface::MASTER_REQUEST) {
$container
->expects($this->once())
->method('leaveScope')
->with($this->equalTo('request'))
;
} else {
$container
->expects($this->never())
->method('leaveScope')
;
}
$container
->expects($this->once())
->method('leaveScope')
->with($this->equalTo('request'))
;
$container
->expects($this->once())
->method('set')
@ -80,18 +73,11 @@ class HttpKernelTest extends \PHPUnit_Framework_TestCase
->method('enterScope')
->with($this->equalTo('request'))
;
if ($type !== HttpKernelInterface::MASTER_REQUEST) {
$container
->expects($this->once())
->method('leaveScope')
->with($this->equalTo('request'))
;
} else {
$container
->expects($this->never())
->method('leaveScope')
;
}
$container
->expects($this->once())
->method('leaveScope')
->with($this->equalTo('request'))
;
$container
->expects($this->once())
->method('set')