Skip to content

S
Silex
Commit 9deb79a2 authored by Fabien Potencier's avatar Fabien Potencier
Browse files
Options

updated vendors

parent 18e248a2
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 33 deletions
composer.lock
View file @ 9deb79a2
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
{ {
"package": "symfony/event-dispatcher", "package": "symfony/event-dispatcher",
"version": "dev-master", "version": "dev-master",
"source-reference": "0dc437f2eca7dea19facfde6db7f7f5e8e71d0bc", "source-reference": "b99b49760016467099f010aff7a5098861d49e09",
"commit-date": "1341838460" "commit-date": "1342207366"
}, },
{ {
"package": "symfony/http-foundation", "package": "symfony/http-foundation",
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
{ {
"package": "symfony/http-foundation", "package": "symfony/http-foundation",
"version": "dev-master", "version": "dev-master",
"source-reference": "fea04f56086f14d93e6b5188adfa92e9efc354e1", "source-reference": "d72724a62696037b52601086b629d84c1a1cb91b",
"commit-date": "1342197254" "commit-date": "1342337507"
}, },
{ {
"package": "symfony/http-kernel", "package": "symfony/http-kernel",
...@@ -46,8 +46,8 @@ ...@@ -46,8 +46,8 @@
{ {
"package": "symfony/http-kernel", "package": "symfony/http-kernel",
"version": "dev-master", "version": "dev-master",
"source-reference": "dc93ba8c91cb4d6de78bb32e9836cf32088f0626", "source-reference": "efedca5d30added6a21fc6ae8356617ad1c80de7",
"commit-date": "1342174453" "commit-date": "1342271095"
}, },
{ {
"package": "symfony/routing", "package": "symfony/routing",
...@@ -58,8 +58,8 @@ ...@@ -58,8 +58,8 @@
{ {
"package": "symfony/routing", "package": "symfony/routing",
"version": "dev-master", "version": "dev-master",
"source-reference": "e40a44a94c17f18229e2382232cc980602516ff9", "source-reference": "6bca82c3ea0d42d750de4f49b22020dfd047dc0f",
"commit-date": "1342188338" "commit-date": "1342207366"
} }
], ],
"packages-dev": [ "packages-dev": [
...@@ -142,8 +142,8 @@ ...@@ -142,8 +142,8 @@
{ {
"package": "symfony/dom-crawler", "package": "symfony/dom-crawler",
"version": "dev-master", "version": "dev-master",
"source-reference": "f0f531c1808745a85ada3cc5519d54bd5f9b25c2", "source-reference": "5dab5ea9c4821b654a71ec2b4dd0c6015f0019a8",
"commit-date": "1341838460" "commit-date": "1342207366"
}, },
{ {
"package": "symfony/finder", "package": "symfony/finder",
...@@ -154,8 +154,8 @@ ...@@ -154,8 +154,8 @@
{ {
"package": "symfony/finder", "package": "symfony/finder",
"version": "dev-master", "version": "dev-master",
"source-reference": "53377047bae92edd04e232c79b653d2beb309bf6", "source-reference": "3338fb3883eaed08a30b206a79491f6e48dfc12b",
"commit-date": "1341846417" "commit-date": "1342207366"
}, },
{ {
"package": "symfony/form", "package": "symfony/form",
...@@ -166,8 +166,8 @@ ...@@ -166,8 +166,8 @@
{ {
"package": "symfony/form", "package": "symfony/form",
"version": "dev-master", "version": "dev-master",
"source-reference": "f5905ab087ee8de72e98897c81d754d815e70556", "source-reference": "205f66ed7586c9fb1a152bcd00af8e0e52d32d3b",
"commit-date": "1342207591" "commit-date": "1342275631"
}, },
{ {
"package": "symfony/locale", "package": "symfony/locale",
...@@ -178,8 +178,8 @@ ...@@ -178,8 +178,8 @@
{ {
"package": "symfony/locale", "package": "symfony/locale",
"version": "dev-master", "version": "dev-master",
"source-reference": "04a4515e6eb050a3f637b7a56c0fb942a4119c4f", "source-reference": "0d4d67d314a106a1b3be45878de8bf4748f85be0",
"commit-date": "1341993367" "commit-date": "1342207366"
}, },
{ {
"package": "symfony/monolog-bridge", "package": "symfony/monolog-bridge",
...@@ -202,8 +202,8 @@ ...@@ -202,8 +202,8 @@
{ {
"package": "symfony/options-resolver", "package": "symfony/options-resolver",
"version": "dev-master", "version": "dev-master",
"source-reference": "36a848adcfadb5af553ed61744ebe1038365cedd", "source-reference": "efcb31a59364c88be1891663a5cb2832b8e1b4b5",
"commit-date": "1342113225" "commit-date": "1342207366"
}, },
{ {
"package": "symfony/process", "package": "symfony/process",
...@@ -214,8 +214,8 @@ ...@@ -214,8 +214,8 @@
{ {
"package": "symfony/process", "package": "symfony/process",
"version": "dev-master", "version": "dev-master",
"source-reference": "f78e5d1e0f74532ff2e9269a18c7202dc25159e9", "source-reference": "5ec4b91df4ce83a6dad94f79112b4cd218811bf4",
"commit-date": "1342010717" "commit-date": "1342207366"
}, },
{ {
"package": "symfony/security", "package": "symfony/security",
...@@ -226,8 +226,8 @@ ...@@ -226,8 +226,8 @@
{ {
"package": "symfony/security", "package": "symfony/security",
"version": "dev-master", "version": "dev-master",
"source-reference": "13553948b9f2401aacaee5af09a555963412afde", "source-reference": "3b049875ecbce16411dd55fdd12a7b470db84b30",
"commit-date": "1342173351" "commit-date": "1342274847"
}, },
{ {
"package": "symfony/translation", "package": "symfony/translation",
...@@ -238,8 +238,8 @@ ...@@ -238,8 +238,8 @@
{ {
"package": "symfony/translation", "package": "symfony/translation",
"version": "dev-master", "version": "dev-master",
"source-reference": "d2ce6bcdaf479b2121e35fa850fd229817c1ee2a", "source-reference": "346b3ea27852fa63a0ed57228e6635a231e6d492",
"commit-date": "1341851012" "commit-date": "1342336904"
}, },
{ {
"package": "symfony/twig-bridge", "package": "symfony/twig-bridge",
...@@ -250,8 +250,8 @@ ...@@ -250,8 +250,8 @@
{ {
"package": "symfony/twig-bridge", "package": "symfony/twig-bridge",
"version": "dev-master", "version": "dev-master",
"source-reference": "b86963b52d5d305ab2a64973a10aca6642659ecb", "source-reference": "944be0979f02e929b61d0a6633dd51bef0f5c618",
"commit-date": "1342207366" "commit-date": "1342260629"
}, },
{ {
"package": "symfony/validator", "package": "symfony/validator",
...@@ -262,8 +262,8 @@ ...@@ -262,8 +262,8 @@
{ {
"package": "symfony/validator", "package": "symfony/validator",
"version": "dev-master", "version": "dev-master",
"source-reference": "6cd8997a1df02353584883057c840296fa28644e", "source-reference": "03ddc6bbb27202599f4aab9c960da7a10b6d4873",
"commit-date": "1342176696" "commit-date": "1342337058"
}, },
{ {
"package": "twig/twig", "package": "twig/twig",
...@@ -274,8 +274,8 @@ ...@@ -274,8 +274,8 @@
{ {
"package": "twig/twig", "package": "twig/twig",
"version": "dev-master", "version": "dev-master",
"source-reference": "3f9f587ba72f9da84266b93ee1d0fc025b6b010f", "source-reference": "17e2c36a58c4b17a58a3befa783d16ac19776df5",
"commit-date": "1342197076" "commit-date": "1342275003"
} }
], ],
"aliases": [ "aliases": [
......
src/Silex/Provider/SecurityServiceProvider.php
View file @ 9deb79a2
...@@ -47,6 +47,7 @@ use Symfony\Component\Security\Http\EntryPoint\BasicAuthenticationEntryPoint; ...@@ -47,6 +47,7 @@ use Symfony\Component\Security\Http\EntryPoint\BasicAuthenticationEntryPoint;
use Symfony\Component\Security\Http\EntryPoint\RetryAuthenticationEntryPoint; use Symfony\Component\Security\Http\EntryPoint\RetryAuthenticationEntryPoint;
use Symfony\Component\Security\Http\Session\SessionAuthenticationStrategy; use Symfony\Component\Security\Http\Session\SessionAuthenticationStrategy;
use Symfony\Component\Security\Http\Logout\SessionLogoutHandler; use Symfony\Component\Security\Http\Logout\SessionLogoutHandler;
use Symfony\Component\Security\Http\Logout\DefaultLogoutSuccessHandler;
use Symfony\Component\Security\Http\AccessMap; use Symfony\Component\Security\Http\AccessMap;
use Symfony\Component\Security\Http\HttpUtils; use Symfony\Component\Security\Http\HttpUtils;
...@@ -415,15 +416,28 @@ class SecurityServiceProvider implements ServiceProviderInterface ...@@ -415,15 +416,28 @@ class SecurityServiceProvider implements ServiceProviderInterface
}); });
}); });
$app['security.authentication_listener.logout._proto'] = $app->protect(function ($providerKey, $options) use ($app, $that) { $app['security.authentication.logout_handler._proto'] = $app->protect(function ($name, $options) use ($app) {
return $app->share(function () use ($app, $providerKey, $options, $that) { return $app->share(function () use ($name, $options, $app) {
return new DefaultLogoutSuccessHandler(
$app['security.http_utils'],
isset($options['target_url']) ? $options['target_url'] : '/'
);
});
});
$app['security.authentication_listener.logout._proto'] = $app->protect(function ($name, $options) use ($app, $that) {
return $app->share(function () use ($app, $name, $options, $that) {
$that->addFakeRoute(array('get', $tmp = isset($options['logout_path']) ? $options['logout_path'] : '/logout', str_replace('/', '_', ltrim($tmp, '/')))); $that->addFakeRoute(array('get', $tmp = isset($options['logout_path']) ? $options['logout_path'] : '/logout', str_replace('/', '_', ltrim($tmp, '/'))));
if (!isset($app['security.authentication.logout_handler.'.$name])) {
$app['security.authentication.logout_handler.'.$name] = $app['security.authentication.logout_handler._proto']($name, $options);
}
$listener = new LogoutListener( $listener = new LogoutListener(
$app['security'], $app['security'],
$app['security.http_utils'], $app['security.http_utils'],
$app['security.authentication.logout_handler.'.$name],
$options, $options,
null, // LogoutSuccessHandlerInterface
isset($options['with_csrf']) && $options['with_csrf'] && isset($app['form.csrf_provider']) ? $app['form.csrf_provider'] : null isset($options['with_csrf']) && $options['with_csrf'] && isset($app['form.csrf_provider']) ? $app['form.csrf_provider'] : null
); );
......
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