Permalink
Browse files

Merge pull request #58 from bamarni/master

Bux fix with symfony master
  • Loading branch information...
2 parents 61c7af9 + dde3567 commit eb8e16130f393b177a11ce6cab2c5312a668f646 @genemu committed Mar 5, 2012
Showing with 4 additions and 3 deletions.
  1. +1 −1 Gd/Type/Captcha.php
  2. +1 −0 Resources/config/twig.xml
  3. +2 −2 Tests/Form/Extension/TypeExtensionTest.php
View
2 Gd/Type/Captcha.php
@@ -11,7 +11,7 @@
namespace Genemu\Bundle\FormBundle\Gd\Type;
-use Symfony\Component\HttpFoundation\Session;
+use Symfony\Component\HttpFoundation\Session\Session;
use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException;
use Genemu\Bundle\FormBundle\Gd\Gd;
View
1 Resources/config/twig.xml
@@ -7,6 +7,7 @@
<services>
<service id="genemu.twig.extension.form" class="Genemu\Bundle\FormBundle\Twig\Extension\FormExtension">
<tag name="twig.extension" />
+ <argument type="service" id="form.csrf_provider" on-invalid="null" />
<argument>%twig.form.resources%</argument>
</service>
</services>
View
4 Tests/Form/Extension/TypeExtensionTest.php
@@ -12,8 +12,8 @@
namespace Genemu\Bundle\FormBundle\Tests\Form\Extension;
use Symfony\Component\Form\Extension\Core\CoreExtension;
-use Symfony\Component\HttpFoundation\Session;
-use Symfony\Component\HttpFoundation\SessionStorage\ArraySessionStorage;
+use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpFoundation\Session\SessionStorage\ArraySessionStorage;
use Symfony\Component\HttpFoundation\Request;
use Genemu\Bundle\FormBundle\Gd\Type\Captcha;

0 comments on commit eb8e161

Please sign in to comment.