Skip to content

Commit

Permalink
Merge branch '3.3' into 3.4
Browse files Browse the repository at this point in the history
* 3.3:
  [FrameworkBundle] Set default public directory on install assets
  [Security] Fix wrong term in UserProviderInterface
  [HttpFoundation] Set meta refresh time to 0 in RedirectResponse content
  disable inlining deprecated services
  [Cache] add constructor docblocks for clarity
  [WebServerBundle] allowed public/ root directory to be auto-discovered along side web/
  [WebServerBundle] remove duplicate code
  [SecurityBundle] Clarify deprecation in UserPasswordEncoderCommand::getContainer
  [Cache] add constructor docblocks for clarity
  [Security] validate empty passwords again
  [DI] Remove irrelevant comment from container
  [TwigBridge] cleaner implementation of the TwigRenderer
  • Loading branch information
fabpot committed Jul 17, 2017
2 parents 6087a6a + 614e214 commit 19ad836
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions Form/TwigRenderer.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,26 @@
*/
class TwigRenderer extends FormRenderer implements TwigRendererInterface
{
/**
* @var TwigRendererEngineInterface
*/
private $engine;

public function __construct(TwigRendererEngineInterface $engine, CsrfTokenManagerInterface $csrfTokenManager = null)
{
parent::__construct($engine, $csrfTokenManager);
}

$this->engine = $engine;
/**
* Returns the engine used by this renderer.
*
* @return TwigRendererEngineInterface The renderer engine
*/
public function getEngine()
{
return parent::getEngine();
}

/**
* {@inheritdoc}
*/
public function setEnvironment(Environment $environment)
{
$this->engine->setEnvironment($environment);
$this->getEngine()->setEnvironment($environment);
}
}

0 comments on commit 19ad836

Please sign in to comment.