Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in
Toggle navigation
S
Silex
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
common
Silex
Commits
935caf7b
Commit
935caf7b
authored
Feb 25, 2018
by
Haralan Dobrev
Committed by
Fabien Potencier
Feb 25, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make CSRF extension work with Validator translations domain
parent
eb559d4c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
src/Silex/Provider/FormServiceProvider.php
src/Silex/Provider/FormServiceProvider.php
+3
-1
src/Silex/Provider/ValidatorServiceProvider.php
src/Silex/Provider/ValidatorServiceProvider.php
+5
-1
No files found.
src/Silex/Provider/FormServiceProvider.php
View file @
935caf7b
...
...
@@ -47,7 +47,9 @@ class FormServiceProvider implements ServiceProviderInterface
$app
[
'form.extension.csrf'
]
=
function
(
$app
)
{
if
(
isset
(
$app
[
'translator'
]))
{
return
new
CsrfExtension
(
$app
[
'csrf.token_manager'
],
$app
[
'translator'
]);
$translationDomain
=
isset
(
$app
[
'validator.translation_domain'
])
?
$app
[
'validator.translation_domain'
]
:
null
;
return
new
CsrfExtension
(
$app
[
'csrf.token_manager'
],
$app
[
'translator'
],
$translationDomain
);
}
return
new
CsrfExtension
(
$app
[
'csrf.token_manager'
]);
...
...
src/Silex/Provider/ValidatorServiceProvider.php
View file @
935caf7b
...
...
@@ -35,7 +35,7 @@ class ValidatorServiceProvider implements ServiceProviderInterface
$app
[
'validator.builder'
]
=
function
(
$app
)
{
$builder
=
Validation
::
createValidatorBuilder
();
$builder
->
setConstraintValidatorFactory
(
$app
[
'validator.validator_factory'
]);
$builder
->
setTranslationDomain
(
'validators'
);
$builder
->
setTranslationDomain
(
$app
[
'validator.translation_domain'
]
);
$builder
->
addObjectInitializers
(
$app
[
'validator.object_initializers'
]);
$builder
->
setMetadataFactory
(
$app
[
'validator.mapping.class_metadata_factory'
]);
if
(
isset
(
$app
[
'translator'
]))
{
...
...
@@ -58,5 +58,9 @@ class ValidatorServiceProvider implements ServiceProviderInterface
};
$app
[
'validator.validator_service_ids'
]
=
[];
$app
[
'validator.translation_domain'
]
=
function
()
{
return
'validators'
;
};
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment