Merge pull request #5347 from marc1706/ticket/15746-master

[ticket/15746] Update symfony to latest on master
This commit is contained in:
Marc Alexander 2018-09-13 18:53:32 +02:00 committed by GitHub
commit 2482e39e1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 245 additions and 232 deletions

475
phpBB/composer.lock generated

File diff suppressed because it is too large Load diff

View file

@ -486,7 +486,7 @@ class container_builder
$cached_container_dump = $dumper->dump(array(
'class' => 'phpbb_cache_container',
'base_class' => 'Symfony\\Component\\DependencyInjection\\ContainerBuilder',
'base_class' => 'Symfony\\Component\\DependencyInjection\\Container',
));
$cache->write($cached_container_dump, $this->container->getResources());