Skip to content

[FrameworkBundle] Optimize validator registration #13111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 26, 2014
Merged

[FrameworkBundle] Optimize validator registration #13111

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 14 additions & 22 deletions src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ class FrameworkExtension extends Extension
*
* @param array $configs
* @param ContainerBuilder $container
* @throws LogicException
*/
public function load(array $configs, ContainerBuilder $container)
{
Expand Down Expand Up @@ -711,9 +712,7 @@ private function registerValidationConfiguration(array $config, ContainerBuilder

$container->setParameter('validator.translation_domain', $config['translation_domain']);

$xmlMappings = $this->getValidatorXmlMappingFiles($container);
$yamlMappings = $this->getValidatorYamlMappingFiles($container);

list($xmlMappings, $yamlMappings) = $this->getValidatorMappingFiles($container);
if (count($xmlMappings) > 0) {
$validatorBuilder->addMethodCall('addXmlMappings', array($xmlMappings));
}
Expand Down Expand Up @@ -766,35 +765,28 @@ private function registerValidationConfiguration(array $config, ContainerBuilder
$container->setParameter('validator.api', $api);
}

private function getValidatorXmlMappingFiles(ContainerBuilder $container)
private function getValidatorMappingFiles(ContainerBuilder $container)
{
$files = array();
$files = array(array(), array());

if (interface_exists('Symfony\Component\Form\FormInterface')) {
$reflClass = new \ReflectionClass('Symfony\Component\Form\FormInterface');
$files[] = dirname($reflClass->getFileName()).'/Resources/config/validation.xml';
$container->addResource(new FileResource($files[0]));
$files[0][] = dirname($reflClass->getFileName()).'/Resources/config/validation.xml';
$container->addResource(new FileResource($files[0][0]));
}

foreach ($container->getParameter('kernel.bundles') as $bundle) {
$bundles = $container->getParameter('kernel.bundles');
foreach ($bundles as $bundle) {
$reflection = new \ReflectionClass($bundle);
if (is_file($file = dirname($reflection->getFilename()).'/Resources/config/validation.xml')) {
$files[] = realpath($file);
$dirname = dirname($reflection->getFilename());

if (is_file($file = $dirname.'/Resources/config/validation.xml')) {
$files[0][] = realpath($file);
$container->addResource(new FileResource($file));
}
}

return $files;
}

private function getValidatorYamlMappingFiles(ContainerBuilder $container)
{
$files = array();

foreach ($container->getParameter('kernel.bundles') as $bundle) {
$reflection = new \ReflectionClass($bundle);
if (is_file($file = dirname($reflection->getFilename()).'/Resources/config/validation.yml')) {
$files[] = realpath($file);
if (is_file($file = $dirname.'/Resources/config/validation.yml')) {
$files[1][] = realpath($file);
$container->addResource(new FileResource($file));
}
}
Expand Down