From 557a82ac4d93db40d8775148a901b7f3693434e7 Mon Sep 17 00:00:00 2001 From: thewilkybarkid Date: Thu, 3 Jul 2014 13:17:18 +0100 Subject: [PATCH] Remove Expression Language services when the component is unavailable --- .../SecurityBundle/DependencyInjection/SecurityExtension.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php index a9b9b0e92a..000573baaa 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php @@ -66,6 +66,11 @@ class SecurityExtension extends Extension $loader->load('templating_twig.xml'); $loader->load('collectors.xml'); + if (!class_exists('Symfony\Component\ExpressionLanguage\ExpressionLanguage')) { + $container->removeDefinition('security.expression_language'); + $container->removeDefinition('security.access.expression_voter'); + } + // set some global scalars $container->setParameter('security.access.denied_url', $config['access_denied_url']); $container->setParameter('security.authentication.manager.erase_credentials', $config['erase_credentials']);