mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-18 06:21:19 +02:00
Code Issues Releases Wiki Activity

Merge pull request #4236 from Nicofuma/ticket/13616

Browse Source 
[ticket/13616] Uses symfony/proxy-manager-bridge to lazy load twig lexer
This commit is contained in:
Máté Bartus
2016-04-13 10:11:24 +02:00
parent 560bee1be4 5754cbfec4
commit 4c257d47a6
23 changed files with 354 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/phpbb/di/container_builder.php
View File

@@ -14,6 +14,8 @@
namespace phpbb\di;
use phpbb\filesystem\filesystem;
use Symfony\Bridge\ProxyManager\LazyProxy\Instantiator\RuntimeInstantiator;
use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper;
use Symfony\Component\Config\ConfigCache;
use Symfony\Component\Config\FileLocator;
use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -460,7 +462,10 @@ class container_builder
{
try
{
$dumper = new PhpDumper($this->container);
$dumper = new PhpDumper($this->container);
$proxy_dumper = new ProxyDumper();
$dumper->setProxyDumper($proxy_dumper);
$cached_container_dump = $dumper->dump(array(
'class' => 'phpbb_cache_container',
'base_class' => 'Symfony\\Component\\DependencyInjection\\ContainerBuilder',
@@ -483,6 +488,7 @@ class container_builder
protected function create_container(array $extensions)
{
$container = new ContainerBuilder(new ParameterBag($this->get_core_parameters()));
$container->setProxyInstantiator(new RuntimeInstantiator());
$extensions_alias = array();

8
phpBB/phpbb/di/extension/core.php
View File

@@ -24,6 +24,8 @@ use Symfony\Component\HttpKernel\DependencyInjection\Extension;
*/
class core extends Extension
{
const TWIG_OPTIONS_POSITION = 6;
/**
* Config path
* @var string
@@ -71,7 +73,7 @@ class core extends Extension
// Set the Twig options if defined in the environment
$definition = $container->getDefinition('template.twig.environment');
$twig_environment_options = $definition->getArgument(7);
$twig_environment_options = $definition->getArgument(static::TWIG_OPTIONS_POSITION);
if ($config['twig']['debug'])
{
$twig_environment_options['debug'] = true;
@@ -81,8 +83,8 @@ class core extends Extension
$twig_environment_options['auto_reload'] = true;
}
// Replace the 8th argument, the options passed to the environment
$definition->replaceArgument(7, $twig_environment_options);
// Replace the 7th argument, the options passed to the environment
$definition->replaceArgument(static::TWIG_OPTIONS_POSITION, $twig_environment_options);
if ($config['twig']['enable_debug_extension'])
{