fix merge

This commit is contained in:
Nicolas Grekas 2018-02-04 14:10:03 +01:00
parent 752c7cbbbe
commit f2d54fe694

View File

@ -412,7 +412,7 @@ class SecurityExtension extends Extension
} elseif ('remember_me' === $key) { } elseif ('remember_me' === $key) {
// RememberMeFactory will use the firewall secret when created // RememberMeFactory will use the firewall secret when created
$userProvider = null; $userProvider = null;
} elseif($defaultProvider) { } elseif ($defaultProvider) {
$userProvider = $defaultProvider; $userProvider = $defaultProvider;
} else { } else {
throw new InvalidConfigurationException(sprintf('Not configuring explicitly the provider for the "%s" listener on "%s" firewall is ambiguous as there is more than one registered provider.', $key, $id)); throw new InvalidConfigurationException(sprintf('Not configuring explicitly the provider for the "%s" listener on "%s" firewall is ambiguous as there is more than one registered provider.', $key, $id));