Skip to content

Commit fcf7e77

Browse files
Merge branch '3.0' into 3.1
* 3.0: [TwigBridge] Add missing type hint to TwigRenderer [HttpFoundation] Fix UPSERT for PgSql >= 9.5 [Form] fixed DateTime transformers [PropertyAccess][DX] Enhance exception that say that some methods are missing if they don't [Form] fixed EntityType test with query_builder option Conflicts: src/Symfony/Component/HttpFoundation/Cookie.php
2 parents af3b13b + 74830bf commit fcf7e77

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

Form/TwigRenderer.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Bridge\Twig\Form;
1313

1414
use Symfony\Component\Form\FormRenderer;
15+
use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
1516

1617
/**
1718
* @author Bernhard Schussek <[email protected]>
@@ -23,7 +24,7 @@ class TwigRenderer extends FormRenderer implements TwigRendererInterface
2324
*/
2425
private $engine;
2526

26-
public function __construct(TwigRendererEngineInterface $engine, $csrfTokenManager = null)
27+
public function __construct(TwigRendererEngineInterface $engine, CsrfTokenManagerInterface $csrfTokenManager = null)
2728
{
2829
parent::__construct($engine, $csrfTokenManager);
2930

0 commit comments

Comments
 (0)