merged branch liuggio/master (PR #9077)

This PR was merged into the master branch.

Discussion
----------

[HttpKernel] [Fragment] Fixed CS

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

Only two simple CS fixes.

Commits
-------

7d53314 [HttpKernel] Fragment Fixed CS
This commit is contained in:
Fabien Potencier 2013-09-19 18:16:36 +02:00
commit 77d3a857da
1 changed files with 5 additions and 4 deletions

View File

@ -43,9 +43,10 @@ class FragmentHandler
* Constructor.
*
* RequestStack will become required in 3.0.
*
* @param FragmentRendererInterface[] $renderers An array of FragmentRendererInterface instances
* @param Boolean $debug Whether the debug mode is enabled or not
*
* @param FragmentRendererInterface[] $renderers An array of FragmentRendererInterface instances
* @param Boolean $debug Whether the debug mode is enabled or not
* @param RequestStack|null $requestStack The Request stack that controls the lifecycle of requests
*/
public function __construct(array $renderers = array(), $debug = false, RequestStack $requestStack = null)
{
@ -97,7 +98,7 @@ class FragmentHandler
* @return string|null The Response content or null when the Response is streamed
*
* @throws \InvalidArgumentException when the renderer does not exist
* @throws \RuntimeException when the Response is not successful
* @throws \LogicException when the Request is not successful
*/
public function render($uri, $renderer = 'inline', array $options = array())
{