Merge branch '4.2' into 4.3
This commit is contained in:
commit
d27c5307f0
@ -1859,7 +1859,7 @@ class FrameworkExtension extends Extension
|
||||
|
||||
if (!$container->getParameter('kernel.debug')) {
|
||||
$propertyAccessDefinition->setFactory([PropertyAccessor::class, 'createCache']);
|
||||
$propertyAccessDefinition->setArguments([null, null, $version, new Reference('logger', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)]);
|
||||
$propertyAccessDefinition->setArguments([null, 0, $version, new Reference('logger', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)]);
|
||||
$propertyAccessDefinition->addTag('cache.pool', ['clearer' => 'cache.system_clearer']);
|
||||
$propertyAccessDefinition->addTag('monolog.logger', ['channel' => 'cache']);
|
||||
} else {
|
||||
|
@ -34,7 +34,8 @@ use Symfony\Component\Security\Core\Encoder\NativePasswordEncoder;
|
||||
use Symfony\Component\Security\Core\Encoder\SodiumPasswordEncoder;
|
||||
use Symfony\Component\Security\Core\User\UserProviderInterface;
|
||||
use Symfony\Component\Security\Http\Controller\UserValueResolver;
|
||||
use Symfony\Component\Templating\PhpEngine;
|
||||
use Symfony\Component\Templating\Helper\Helper;
|
||||
use Twig\Extension\AbstractExtension;
|
||||
|
||||
/**
|
||||
* SecurityExtension.
|
||||
@ -100,10 +101,15 @@ class SecurityExtension extends Extension implements PrependExtensionInterface
|
||||
$loader->load('security.xml');
|
||||
$loader->load('security_listeners.xml');
|
||||
$loader->load('security_rememberme.xml');
|
||||
if (class_exists(PhpEngine::class)) {
|
||||
|
||||
if (class_exists(Helper::class)) {
|
||||
$loader->load('templating_php.xml');
|
||||
}
|
||||
|
||||
if (class_exists(AbstractExtension::class)) {
|
||||
$loader->load('templating_twig.xml');
|
||||
}
|
||||
|
||||
$loader->load('collectors.xml');
|
||||
$loader->load('guard.xml');
|
||||
|
||||
|
@ -494,10 +494,8 @@ class MessengerPassTest extends TestCase
|
||||
|
||||
public function testRegistersTraceableBusesToCollector()
|
||||
{
|
||||
$dataCollector = $this->getMockBuilder(MessengerDataCollector::class)->getMock();
|
||||
|
||||
$container = $this->getContainerBuilder($fooBusId = 'messenger.bus.foo');
|
||||
$container->register('data_collector.messenger', $dataCollector);
|
||||
$container->register('data_collector.messenger', MessengerDataCollector::class);
|
||||
$container->setParameter('kernel.debug', true);
|
||||
|
||||
(new MessengerPass())->process($container);
|
||||
|
Reference in New Issue
Block a user