Commit eb9da773 authored by Fabien Potencier's avatar Fabien Potencier

simplified code

parent 8bd96879
......@@ -575,10 +575,6 @@ class SecurityServiceProvider implements ServiceProviderInterface
return new UserPasswordValidator($app['security.token_storage'], $app['security.encoder_factory']);
});
if (!isset($app['validator.validator_service_ids'])) {
$app['validator.validator_service_ids'] = array();
}
$app['validator.validator_service_ids'] = array_merge($app['validator.validator_service_ids'], array('security.validator.user_password' => 'security.validator.user_password_validator'));
}
}
......
......@@ -62,14 +62,14 @@ class ValidatorServiceProvider implements ServiceProviderInterface
});
$app['validator.validator_factory'] = $app->share(function () use ($app) {
$validators = isset($app['validator.validator_service_ids']) ? $app['validator.validator_service_ids'] : array();
return new ConstraintValidatorFactory($app, $validators);
return new ConstraintValidatorFactory($app, $app['validator.validator_service_ids']);
});
$app['validator.object_initializers'] = $app->share(function ($app) {
return array();
});
$app['validator.validator_service_ids'] = array();
}
public function boot(Application $app)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment