mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-22 00:05:49 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1522 from igorw/feature/bootstrap-dic

Browse Source 
[feature/bootstrap-dic] Bootstrap container from config.php
This commit is contained in:
Nils Adermann
2013-07-11 15:28:26 -07:00
parent 382ae5a01e 1a5d685f45
commit b1d3c1bf69
3 changed files with 74 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/di/create_container_test.php
View File

@@ -40,11 +40,12 @@ class phpbb_di_container_test extends phpbb_test_case
public function test_phpbb_create_compiled_container()
{
$phpbb_root_path = __DIR__ . '/../../phpBB/';
$config_file = __DIR__ . '/fixtures/config.php';
$extensions = array(
new phpbb_di_extension_config(__DIR__ . '/fixtures/config.php'),
new phpbb_di_extension_core($phpbb_root_path),
);
$container = phpbb_create_compiled_container($extensions, array(), $phpbb_root_path, 'php');
$container = phpbb_create_compiled_container($config_file, $extensions, array(), $phpbb_root_path, 'php');
$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
$this->assertTrue($container->isFrozen());

5
tests/template/template_test_case.php
View File

@@ -84,7 +84,10 @@ class phpbb_template_template_test_case extends phpbb_test_case
protected function tearDown()
{
$this->template->clear_cache();
if ($this->template)
{
$this->template->clear_cache();
}
}
protected function run_template($file, array $vars, array $block_vars, array $destroy, $expected, $lang_vars = array())