Commit 1a194364 authored by Fabien Potencier's avatar Fabien Potencier

renamed entry_point services for more consistency with other service names

parent 35d771bb
...@@ -121,15 +121,15 @@ class SecurityServiceProvider implements ServiceProviderInterface ...@@ -121,15 +121,15 @@ class SecurityServiceProvider implements ServiceProviderInterface
$entryPoint = $type == 'http' ? 'http' : 'form'; $entryPoint = $type == 'http' ? 'http' : 'form';
$app['security.authentication.factory.'.$type] = $app->protect(function($name, $options) use ($type, $app, $entryPoint) { $app['security.authentication.factory.'.$type] = $app->protect(function($name, $options) use ($type, $app, $entryPoint) {
if (!isset($app['security.entry_point.'.$entryPoint.'.'.$name])) { if (!isset($app['security.entry_point.'.$name.'.'.$entryPoint])) {
$app['security.entry_point.'.$entryPoint.'.'.$name] = $app['security.entry_point.'.$entryPoint.'._proto']($name); $app['security.entry_point.'.$name.'.'.$entryPoint] = $app['security.entry_point.'.$entryPoint.'._proto']($name);
} }
if (!isset($app['security.authentication.'.$name.'.'.$type])) { if (!isset($app['security.authentication.'.$name.'.'.$type])) {
$app['security.authentication.'.$name.'.'.$type] = $app['security.authentication.'.$type.'._proto']($name, $options); $app['security.authentication.'.$name.'.'.$type] = $app['security.authentication.'.$type.'._proto']($name, $options);
} }
return array($app['security.authentication.'.$name.'.'.$type], $app['security.entry_point.'.$entryPoint.'.'.$name]); return array($app['security.authentication.'.$name.'.'.$type], $app['security.entry_point.'.$name.'.'.$entryPoint]);
}); });
} }
...@@ -324,7 +324,7 @@ class SecurityServiceProvider implements ServiceProviderInterface ...@@ -324,7 +324,7 @@ class SecurityServiceProvider implements ServiceProviderInterface
$app['security'], $app['security'],
$app['security.authentication_manager'], $app['security.authentication_manager'],
$providerKey, $providerKey,
$app['security.entry_point.http.'.$providerKey], $app['security.entry_point.'.$providerKey.'.http'],
$app['logger'] $app['logger']
); );
}); });
......
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