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

Merge branch '4.2' into 4.3

Browse Source
This commit is contained in:
Tobias Schultze 2019-07-05 23:01:41 +02:00
commit d27c5307f0
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View File

@ -1859,7 +1859,7 @@ class FrameworkExtension extends Extension
if (!$container->getParameter('kernel.debug')) { if (!$container->getParameter('kernel.debug')) {
$propertyAccessDefinition->setFactory([PropertyAccessor::class, 'createCache']); $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('cache.pool', ['clearer' => 'cache.system_clearer']);
$propertyAccessDefinition->addTag('monolog.logger', ['channel' => 'cache']); $propertyAccessDefinition->addTag('monolog.logger', ['channel' => 'cache']);
} else { } else {

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');

4
src/Symfony/Component/Messenger/Tests/DependencyInjection/MessengerPassTest.php
View File

@ -494,10 +494,8 @@ class MessengerPassTest extends TestCase
public function testRegistersTraceableBusesToCollector() public function testRegistersTraceableBusesToCollector()
{ {
$dataCollector = $this->getMockBuilder(MessengerDataCollector::class)->getMock();
$container = $this->getContainerBuilder($fooBusId = 'messenger.bus.foo'); $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); $container->setParameter('kernel.debug', true);
(new MessengerPass())->process($container); (new MessengerPass())->process($container);