diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '4.3' into 4.4

Browse Source
This commit is contained in:
Tobias Schultze 2019-07-05 23:02:06 +02:00
commit 6811aaa8e0
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
View File

@ -34,7 +34,8 @@ use Symfony\Component\Security\Core\Encoder\NativePasswordEncoder;
use Symfony\Component\Security\Core\Encoder\SodiumPasswordEncoder; use Symfony\Component\Security\Core\Encoder\SodiumPasswordEncoder;
use Symfony\Component\Security\Core\User\UserProviderInterface; use Symfony\Component\Security\Core\User\UserProviderInterface;
use Symfony\Component\Security\Http\Controller\UserValueResolver; use Symfony\Component\Security\Http\Controller\UserValueResolver;
use Symfony\Component\Templating\PhpEngine; use Symfony\Component\Templating\Helper\Helper;
use Twig\Extension\AbstractExtension;
/** /**
* SecurityExtension. * SecurityExtension.
@ -100,10 +101,15 @@ class SecurityExtension extends Extension implements PrependExtensionInterface
$loader->load('security.xml'); $loader->load('security.xml');
$loader->load('security_listeners.xml'); $loader->load('security_listeners.xml');
$loader->load('security_rememberme.xml'); $loader->load('security_rememberme.xml');
if (class_exists(PhpEngine::class)) {
if (class_exists(Helper::class)) {
$loader->load('templating_php.xml'); $loader->load('templating_php.xml');
} }
$loader->load('templating_twig.xml');
if (class_exists(AbstractExtension::class)) {
$loader->load('templating_twig.xml');
}
$loader->load('collectors.xml'); $loader->load('collectors.xml');
$loader->load('guard.xml'); $loader->load('guard.xml');