8000 [form] lazy trans `post_max_size_message`. · symfony/symfony@1238c9e · GitHub
[go: up one dir, main page]

Skip to content

Commit 1238c9e

Browse files
committed
[form] lazy trans post_max_size_message.
1 parent f876473 commit 1238c9e

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

src/Symfony/Component/Form/Extension/HttpFoundation/HttpFoundationRequestHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public function handleRequest(FormInterface $form, $request = null)
8181
$form->submit(null, false);
8282

8383
$form->addError(new FormError(
84-
$form->getConfig()->getOption('post_max_size_message'),
84+
(string) $form->getConfig()->getOption('post_max_size_message'),
8585
null,
8686
array('{{ max }}' => $this->serverParams->getNormalizedIniPostMaxSize())
8787
));

src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ class UploadValidatorExtension extends AbstractTypeExtension
2424
{
2525
private $translator;
2626
private $translationDomain;
27+
private $errorMessage = 'post_max_size_message';
2728

2829
/**
2930
* @param TranslatorInterface $translator The translator for translating error messages
@@ -40,11 +41,12 @@ public function __construct(TranslatorInterface $translator, $translationDomain
4041
*/
4142
public function configureOptions(OptionsResolver $resolver)
4243
{
43-
$translator = $this->translator;
44-
$translationDomain = $this->translationDomain;
44+
$self = $this;
45+
$errorMessage = &$this->errorMessage;
46+
$resolver->setNormalizer('post_max_size_message', function (Options $options, $message) use ($self, &$errorMessage) {
47+
$errorMessage = $message;
4548

46-
$resolver->setNormalizer('post_max_size_message', function (Options $options, $errorMessage) use ($translator, $translationDomain) {
47-
return $translator->trans($errorMessage, array(), $translationDomain);
49+
return $self;
4850
});
4951
}
5052

@@ -55,4 +57,9 @@ public function getExtendedType()
5557
{
5658
return 'form';
5759
}
60+
61+
public function __toString()
62+
{
63+
return $this->translator->trans($this->errorMessage, array(), $this->translationDomain);
64+
}
5865
}

src/Symfony/Component/Form/NativeRequestHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public function handleRequest(FormInterface $form, $request = null)
8989
$form->submit(null, false);
9090

9191
$form->addError(new FormError(
92-
$form->getConfig()->getOption('post_max_size_message'),
92+
(string) $form->getConfig()->getOption('post_max_size_message'),
9393
null,
9494
410A array('{{ max }}' => $this->serverParams->getNormalizedIniPostMaxSize())
9595
));

0 commit comments

Comments
 (0)
0