From 1a9aca7152979b71c1e41d905979bbca43d7a065 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Haso=C5=88?= Date: Tue, 10 Feb 2015 11:34:15 +0100 Subject: [PATCH] [TwigBridge] Removed duplicated code from TwigRenderer --- src/Symfony/Bridge/Twig/Form/TwigRenderer.php | 10 ---------- src/Symfony/Bridge/Twig/composer.json | 1 - 2 files changed, 11 deletions(-) diff --git a/src/Symfony/Bridge/Twig/Form/TwigRenderer.php b/src/Symfony/Bridge/Twig/Form/TwigRenderer.php index 3b47c26ea6..ac139e44a1 100644 --- a/src/Symfony/Bridge/Twig/Form/TwigRenderer.php +++ b/src/Symfony/Bridge/Twig/Form/TwigRenderer.php @@ -11,11 +11,7 @@ namespace Symfony\Bridge\Twig\Form; -use Symfony\Component\Form\Exception\UnexpectedTypeException; -use Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderAdapter; -use Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfProviderInterface; use Symfony\Component\Form\FormRenderer; -use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface; /** * @author Bernhard Schussek @@ -29,12 +25,6 @@ class TwigRenderer extends FormRenderer implements TwigRendererInterface public function __construct(TwigRendererEngineInterface $engine, $csrfTokenManager = null) { - if ($csrfTokenManager instanceof CsrfProviderInterface) { - $csrfTokenManager = new CsrfProviderAdapter($csrfTokenManager); - } elseif (null !== $csrfTokenManager && !$csrfTokenManager instanceof CsrfTokenManagerInterface) { - throw new UnexpectedTypeException($csrfTokenManager, 'CsrfProviderInterface or CsrfTokenManagerInterface'); - } - parent::__construct($engine, $csrfTokenManager); $this->engine = $engine; diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index 33882d739d..7acca3398e 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -17,7 +17,6 @@ ], "require": { "php": ">=5.3.3", - "symfony/security-csrf": "~2.4", "twig/twig": "~1.13,>=1.13.1" }, "require-dev": {