Cadoles/CaptchaBundle
21
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Moving translation logic to the validator (fixes for 2.2, see #52)

Browse Source
This commit is contained in:
Gregwar
2013-03-03 13:54:31 +01:00
parent 1fef229c8f
commit 4e13d2d4cb
3 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Type/CaptchaType.php
View File

@ -9,6 +9,7 @@ use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
use Symfony\Component\Form\FormEvents;
use Symfony\Component\Translation\TranslatorInterface;
use Gregwar\CaptchaBundle\Validator\CaptchaValidator;
use Gregwar\CaptchaBundle\Generator\CaptchaGenerator;
@ -36,6 +37,11 @@ class CaptchaType extends AbstractType
*/
protected $generator;
/**
* @var TranslatorInterface
*/
protected $translator;
/**
* Options
* @var array
@ -47,10 +53,11 @@ class CaptchaType extends AbstractType
* @param \Gregwar\CaptchaBundle\Generator\CaptchaGenerator $generator
* @param array $options
*/
public function __construct(SessionInterface $session, CaptchaGenerator $generator, $options)
public function __construct(SessionInterface $session, CaptchaGenerator $generator, TranslatorInterface $translator, $options)
{
$this->session = $session;
$this->generator = $generator;
$this->translator = $translator;
$this->options = $options;
}
@ -63,6 +70,7 @@ class CaptchaType extends AbstractType
$this->key = 'gcb_'.$builder->getForm()->getName();
$validator = new CaptchaValidator(
$this->translator,
$this->session,
$this->key,
$options['invalid_message'],