Commit c1711986 authored by Fabien Potencier's avatar Fabien Potencier

fixed default entry points for built-ins factories

parent 581a5485
...@@ -118,10 +118,15 @@ class SecurityServiceProvider implements ServiceProviderInterface ...@@ -118,10 +118,15 @@ class SecurityServiceProvider implements ServiceProviderInterface
// generate the build-in authentication factories // generate the build-in authentication factories
foreach (array('logout', 'pre_auth', 'form', 'http', 'remember_me', 'anonymous') as $type) { foreach (array('logout', 'pre_auth', 'form', 'http', 'remember_me', 'anonymous') as $type) {
$entryPoint = $type == 'http' ? 'http' : 'form'; $entryPoint = null;
if ('http' === $type) {
$entryPoint = 'http';
} elseif ('form' === $type) {
$entryPoint = 'form';
}
$app['security.authentication_listener.factory.'.$type] = $app->protect(function($name, $options) use ($type, $app, $entryPoint) { $app['security.authentication_listener.factory.'.$type] = $app->protect(function($name, $options) use ($type, $app, $entryPoint) {
if (!isset($app['security.entry_point.'.$name.'.'.$entryPoint])) { if ($entryPoint && !isset($app['security.entry_point.'.$name.'.'.$entryPoint])) {
$app['security.entry_point.'.$name.'.'.$entryPoint] = $app['security.entry_point.'.$entryPoint.'._proto']($name); $app['security.entry_point.'.$name.'.'.$entryPoint] = $app['security.entry_point.'.$entryPoint.'._proto']($name);
} }
...@@ -136,7 +141,7 @@ class SecurityServiceProvider implements ServiceProviderInterface ...@@ -136,7 +141,7 @@ class SecurityServiceProvider implements ServiceProviderInterface
return array( return array(
'security.authentication_provider.'.$name, 'security.authentication_provider.'.$name,
'security.authentication_listener.'.$name.'.'.$type, 'security.authentication_listener.'.$name.'.'.$type,
'security.entry_point.'.$name.'.'.$entryPoint, $entryPoint ? 'security.entry_point.'.$name.'.'.$entryPoint : null,
$type $type
); );
}); });
......
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