diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-06-26 16:39:01 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-07-07 01:02:04 +0200 |
| commit | cdf87e0078e3c4d78bfd1b9d12100eb1451b5633 (patch) | |
| tree | b4ec0c65e60e41c4823a07ae2c2b8cd41e205a81 /phpBB/phpbb/di/extension | |
| parent | f8eca98b3f21a45181d04fa1eb00a0e4645e90de (diff) | |
| download | forums-cdf87e0078e3c4d78bfd1b9d12100eb1451b5633.tar forums-cdf87e0078e3c4d78bfd1b9d12100eb1451b5633.tar.gz forums-cdf87e0078e3c4d78bfd1b9d12100eb1451b5633.tar.bz2 forums-cdf87e0078e3c4d78bfd1b9d12100eb1451b5633.tar.xz forums-cdf87e0078e3c4d78bfd1b9d12100eb1451b5633.zip | |
[ticket/12775] Add a conter_factory class and remove functions_container
PHPBB3-12775
Diffstat (limited to 'phpBB/phpbb/di/extension')
| -rw-r--r-- | phpBB/phpbb/di/extension/config.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/phpbb/di/extension/config.php b/phpBB/phpbb/di/extension/config.php index a7d7284f85..8a26d44858 100644 --- a/phpBB/phpbb/di/extension/config.php +++ b/phpBB/phpbb/di/extension/config.php @@ -21,9 +21,12 @@ use Symfony\Component\HttpKernel\DependencyInjection\Extension; */ class config extends Extension { - public function __construct($config_file) + /** @var array */ + protected $config_file_data; + + public function __construct($config_file_data) { - $this->config_file = $config_file; + $this->config_file_data = $config_file_data; } /** @@ -36,7 +39,7 @@ class config extends Extension */ public function load(array $config, ContainerBuilder $container) { - require($this->config_file); + extract($this->config_file_data); $container->setParameter('core.adm_relative_path', (isset($phpbb_adm_relative_path) ? $phpbb_adm_relative_path : 'adm/')); $container->setParameter('core.table_prefix', $table_prefix); |