diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-06-27 21:27:55 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-07-07 01:02:20 +0200 |
| commit | ef1346c931a2ddd095d5dbf296cb598dca6edfe8 (patch) | |
| tree | 15d223e36d5c4524b8bd12265e2c79b7d534300a /phpBB/phpbb | |
| parent | e7804ecce4511d8befdcc28f6705c3589c47c878 (diff) | |
| download | forums-ef1346c931a2ddd095d5dbf296cb598dca6edfe8.tar forums-ef1346c931a2ddd095d5dbf296cb598dca6edfe8.tar.gz forums-ef1346c931a2ddd095d5dbf296cb598dca6edfe8.tar.bz2 forums-ef1346c931a2ddd095d5dbf296cb598dca6edfe8.tar.xz forums-ef1346c931a2ddd095d5dbf296cb598dca6edfe8.zip | |
[ticket/12775] Update phpBB/install/index.php
PHPBB3-12775
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/di/container_factory.php | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/phpBB/phpbb/di/container_factory.php b/phpBB/phpbb/di/container_factory.php index 548bbf153f..a83c79f517 100644 --- a/phpBB/phpbb/di/container_factory.php +++ b/phpBB/phpbb/di/container_factory.php @@ -14,7 +14,6 @@ namespace phpbb\di; use Symfony\Component\DependencyInjection\ContainerBuilder; -use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\DependencyInjection\Dumper\PhpDumper; class container_factory @@ -28,7 +27,7 @@ class container_factory /** * The container under construction * - * @var ContainerInterface + * @var ContainerBuilder */ protected $container; @@ -87,6 +86,13 @@ class container_factory protected $dump_container = true; /** + * Indicates if the container should be compiled automatically (default to true). + * + * @var bool + */ + protected $compile_container = true; + + /** * Custom parameters to inject into the container. * * Default to true: @@ -159,7 +165,10 @@ class container_factory $this->inject_custom_parameters(); - $this->container->compile(); + if ($this->compile_container) + { + $this->container->compile(); + } if ($this->dump_container && defined('DEBUG')) { @@ -228,6 +237,16 @@ class container_factory } /** + * Set if the container should be compiled automatically (default to true). + * + * @var bool $dump_container + */ + public function set_compile_container($compile_container) + { + $this->compile_container = $compile_container; + } + + /** * Set a custom path to find the configuration of the container * * @param string $config_path |