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
d1cd7c13
Commit
d1cd7c13
authored
Jan 20, 2015
by
Fabien Potencier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed deprecations for the validator provider
parent
29013a9f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
10 deletions
+21
-10
src/Silex/Provider/ValidatorServiceProvider.php
src/Silex/Provider/ValidatorServiceProvider.php
+20
-9
tests/Silex/Tests/Provider/ValidatorServiceProviderTest.php
tests/Silex/Tests/Provider/ValidatorServiceProviderTest.php
+1
-1
No files found.
src/Silex/Provider/ValidatorServiceProvider.php
View file @
d1cd7c13
...
@@ -14,10 +14,10 @@ namespace Silex\Provider;
...
@@ -14,10 +14,10 @@ namespace Silex\Provider;
use
Silex\Application
;
use
Silex\Application
;
use
Silex\ServiceProviderInterface
;
use
Silex\ServiceProviderInterface
;
use
Silex\ConstraintValidatorFactory
;
use
Silex\ConstraintValidatorFactory
;
use
Symfony\Component\Validator\Validator
;
use
Symfony\Component\Validator\DefaultTranslator
;
use
Symfony\Component\Validator\Mapping\ClassMetadataFactory
;
use
Symfony\Component\Validator\Mapping\ClassMetadataFactory
;
use
Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory
;
use
Symfony\Component\Validator\Mapping\Loader\StaticMethodLoader
;
use
Symfony\Component\Validator\Mapping\Loader\StaticMethodLoader
;
use
Symfony\Component\Validator\Validation
;
/**
/**
* Symfony Validator component Provider.
* Symfony Validator component Provider.
...
@@ -37,16 +37,27 @@ class ValidatorServiceProvider implements ServiceProviderInterface
...
@@ -37,16 +37,27 @@ class ValidatorServiceProvider implements ServiceProviderInterface
}
}
}
}
return
new
Validator
(
return
$app
[
'validator.builder'
]
->
getValidator
();
$app
[
'validator.mapping.class_metadata_factory'
],
});
$app
[
'validator.validator_factory'
],
isset
(
$app
[
'translator'
])
?
$app
[
'translator'
]
:
new
DefaultTranslator
(),
$app
[
'validator.builder'
]
=
$app
->
share
(
function
(
$app
)
{
'validators'
,
$builder
=
Validation
::
createValidatorBuilder
();
$app
[
'validator.object_initializers'
]
$builder
->
setConstraintValidatorFactory
(
$app
[
'validator.validator_factory'
]);
);
$builder
->
setTranslationDomain
(
'validators'
);
$builder
->
addObjectInitializers
(
$app
[
'validator.object_initializers'
]);
$builder
->
setMetadataFactory
(
$app
[
'validator.mapping.class_metadata_factory'
]);
if
(
isset
(
$app
[
'translator'
]))
{
$builder
->
setTranslator
(
$app
[
'translator'
]);
}
return
$builder
;
});
});
$app
[
'validator.mapping.class_metadata_factory'
]
=
$app
->
share
(
function
(
$app
)
{
$app
[
'validator.mapping.class_metadata_factory'
]
=
$app
->
share
(
function
(
$app
)
{
if
(
class_exists
(
'Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory'
))
{
return
new
LazyLoadingMetadataFactory
(
new
StaticMethodLoader
());
}
return
new
ClassMetadataFactory
(
new
StaticMethodLoader
());
return
new
ClassMetadataFactory
(
new
StaticMethodLoader
());
});
});
...
...
tests/Silex/Tests/Provider/ValidatorServiceProviderTest.php
View file @
d1cd7c13
...
@@ -69,7 +69,7 @@ class ValidatorServiceProviderTest extends \PHPUnit_Framework_TestCase
...
@@ -69,7 +69,7 @@ class ValidatorServiceProviderTest extends \PHPUnit_Framework_TestCase
*/
*/
public
function
testValidatorServiceIsAValidator
(
$app
)
public
function
testValidatorServiceIsAValidator
(
$app
)
{
{
$this
->
assertInstanceOf
(
'Symfony\Component\Validator\Validator'
,
$app
[
'validator'
]);
$this
->
assertInstanceOf
(
'Symfony\Component\Validator\Validator
Interface
'
,
$app
[
'validator'
]);
}
}
/**
/**
...
...
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