-
-
Notifications
You must be signed in to change notification settings - Fork 111
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
bug #19061 [FORM] fix post_max_size_message translation (alt. 2) (Dav…
…id Badura) This PR was merged into the 2.7 branch. Discussion ---------- [FORM] fix post_max_size_message translation (alt. 2) | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #15479, #18543 | License | MIT | Doc PR | - Commits ------- 9d8a5e5 fix post_max_size_message translation
- Loading branch information
Showing
2 changed files
with
96 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
<?php | ||
|
||
/* | ||
* This file is part of the Symfony package. | ||
* | ||
* (c) Fabien Potencier <[email protected]> | ||
* | ||
* For the full copyright and license information, please view the LICENSE | ||
* file that was distributed with this source code. | ||
*/ | ||
|
||
namespace Symfony\Component\Form\Extension\Validator\Type; | ||
|
||
use Symfony\Component\Form\AbstractTypeExtension; | ||
use Symfony\Component\OptionsResolver\Options; | ||
use Symfony\Component\OptionsResolver\OptionsResolver; | ||
use Symfony\Component\Translation\TranslatorInterface; | ||
|
||
/** | ||
* @author Abdellatif Ait boudad <[email protected]> | ||
* @author David Badura <[email protected]> | ||
*/ | ||
class UploadValidatorExtension extends AbstractTypeExtension | ||
{ | ||
private $translator; | ||
private $translationDomain; | ||
|
||
/** | ||
* @param TranslatorInterface $translator The translator for translating error messages | ||
* @param null|string $translationDomain The translation domain for translating | ||
*/ | ||
public function __construct(TranslatorInterface $translator, $translationDomain = null) | ||
{ | ||
$this->translator = $translator; | ||
$this->translationDomain = $translationDomain; | ||
} | ||
|
||
/** | ||
* {@inheritdoc} | ||
*/ | ||
public function configureOptions(OptionsResolver $resolver) | ||
{ | ||
$translator = $this->translator; | ||
$translationDomain = $this->translationDomain; | ||
|
||
$resolver->setNormalizer('post_max_size_message', function (Options $options, $errorMessage) use ($translator, $translationDomain) { | ||
return $translator->trans($errorMessage, array(), $translationDomain); | ||
}); | ||
} | ||
|
||
/** | ||
* {@inheritdoc} | ||
*/ | ||
public function getExtendedType() | ||
{ | ||
return 'form'; | ||
} | ||
} |
38 changes: 38 additions & 0 deletions
38
Tests/Extension/Validator/Type/UploadValidatorExtensionTest.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
<?php | ||
|
||
/* | ||
* This file is part of the Symfony package. | ||
* | ||
* (c) Fabien Potencier <[email protected]> | ||
* | ||
* For the full copyright and license information, please view the LICENSE | ||
* file that was distributed with this source code. | ||
*/ | ||
|
||
namespace Symfony\Component\Form\Tests\Extension\Validator\Type; | ||
|
||
use Symfony\Component\Form\Extension\Validator\Type\UploadValidatorExtension; | ||
use Symfony\Component\OptionsResolver\OptionsResolver; | ||
|
||
class UploadValidatorExtensionTest extends TypeTestCase | ||
{ | ||
public function testPostMaxSizeTranslation() | ||
{ | ||
$translator = $this->getMock('Symfony\Component\Translation\TranslatorInterface'); | ||
|
||
$translator->expects($this->any()) | ||
->method('trans') | ||
->with($this->equalTo('old max {{ max }}!')) | ||
->willReturn('translated max {{ max }}!'); | ||
|
||
$extension = new UploadValidatorExtension($translator); | ||
|
||
$resolver = new OptionsResolver(); | ||
$resolver->setDefault('post_max_size_message', 'old max {{ max }}!'); | ||
|
||
$extension->configureOptions($resolver); | ||
$options = $resolver->resolve(); | ||
|
||
$this->assertEquals('translated max {{ max }}!', $options['post_max_size_message']); | ||
} | ||
} |