[HttpKernel] made the strategy a regular parameter in HttpContentRenderer::render()
This commit is contained in:
parent
adc067e938
commit
1240690cac
|
@ -54,14 +54,15 @@ class HttpKernelExtension extends \Twig_Extension
|
||||||
*/
|
*/
|
||||||
public function render($uri, $options = array())
|
public function render($uri, $options = array())
|
||||||
{
|
{
|
||||||
return $this->renderer->render($uri, $options);
|
$strategy = isset($options['strategy']) ? $options['strategy'] : 'default';
|
||||||
|
unset($options['strategy']);
|
||||||
|
|
||||||
|
return $this->renderer->render($uri, $strategy, $options);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function renderStrategy($strategy, $uri, $options = array())
|
public function renderStrategy($strategy, $uri, $options = array())
|
||||||
{
|
{
|
||||||
$options['strategy'] = $strategy;
|
return $this->renderer->render($uri, $strategy, $options);
|
||||||
|
|
||||||
return $this->renderer->render($uri, $options);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function controller($controller, $attributes = array(), $query = array())
|
public function controller($controller, $attributes = array(), $query = array())
|
||||||
|
|
|
@ -101,6 +101,9 @@ class HttpKernel extends BaseHttpKernel
|
||||||
{
|
{
|
||||||
trigger_error('render() is deprecated since version 2.2 and will be removed in 2.3. Use Symfony\Component\HttpKernel\HttpContentRenderer::render() instead.', E_USER_DEPRECATED);
|
trigger_error('render() is deprecated since version 2.2 and will be removed in 2.3. Use Symfony\Component\HttpKernel\HttpContentRenderer::render() instead.', E_USER_DEPRECATED);
|
||||||
|
|
||||||
$this->container->get('http_content_renderer')->render($uri, $options);
|
$strategy = isset($options['strategy']) ? $options['strategy'] : 'default';
|
||||||
|
unset($options['strategy']);
|
||||||
|
|
||||||
|
$this->container->get('http_content_renderer')->render($uri, $strategy, $options);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,7 +46,10 @@ class ActionsHelper extends Helper
|
||||||
*/
|
*/
|
||||||
public function render($uri, array $options = array())
|
public function render($uri, array $options = array())
|
||||||
{
|
{
|
||||||
return $this->renderer->render($uri, $options);
|
$strategy = isset($options['strategy']) ? $options['strategy'] : 'default';
|
||||||
|
unset($options['strategy']);
|
||||||
|
|
||||||
|
return $this->renderer->render($uri, $strategy, $options);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function controller($controller, $attributes = array(), $query = array())
|
public function controller($controller, $attributes = array(), $query = array())
|
||||||
|
|
|
@ -81,23 +81,26 @@ class HttpContentRenderer implements EventSubscriberInterface
|
||||||
* When the Response is a StreamedResponse, the content is streamed immediately
|
* When the Response is a StreamedResponse, the content is streamed immediately
|
||||||
* instead of being returned.
|
* instead of being returned.
|
||||||
*
|
*
|
||||||
* * ignore_errors: true to return an empty string in case of an error
|
* Available options:
|
||||||
* * strategy: the strategy to use for rendering
|
|
||||||
*
|
*
|
||||||
* @param string|ControllerReference $uri A URI as a string or a ControllerReference instance
|
* * ignore_errors: true to return an empty string in case of an error
|
||||||
* @param array $options An array of options
|
*
|
||||||
|
* @param string|ControllerReference $uri A URI as a string or a ControllerReference instance
|
||||||
|
* @param string $strategy The strategy to use for the rendering
|
||||||
|
* @param array $options An array of options
|
||||||
*
|
*
|
||||||
* @return string|null The Response content or null when the Response is streamed
|
* @return string|null The Response content or null when the Response is streamed
|
||||||
*/
|
*/
|
||||||
public function render($uri, array $options = array())
|
public function render($uri, $strategy = 'default', array $options = array())
|
||||||
{
|
{
|
||||||
if (!isset($options['ignore_errors'])) {
|
if (!isset($options['ignore_errors'])) {
|
||||||
$options['ignore_errors'] = !$this->debug;
|
$options['ignore_errors'] = !$this->debug;
|
||||||
}
|
}
|
||||||
|
|
||||||
$options = $this->fixOptions($options);
|
$options = $this->fixOptions($options);
|
||||||
|
if (isset($options['strategy'])) {
|
||||||
$strategy = isset($options['strategy']) ? $options['strategy'] : 'default';
|
$strategy = $options['strategy'];
|
||||||
|
}
|
||||||
|
|
||||||
if (!isset($this->strategies[$strategy])) {
|
if (!isset($this->strategies[$strategy])) {
|
||||||
throw new \InvalidArgumentException(sprintf('The "%s" rendering strategy does not exist.', $strategy));
|
throw new \InvalidArgumentException(sprintf('The "%s" rendering strategy does not exist.', $strategy));
|
||||||
|
|
Reference in New Issue