diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-07-07 00:08:34 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-07-07 01:02:50 +0200 |
| commit | e2cbaf4f1a0b0ddcba45babbe922076ff149a83d (patch) | |
| tree | 8a4846f5b03a2a0045be2bab64bc88f09478fd07 | |
| parent | 5b11ee8c97e88367fc39b90b6a871e3bf16f7d1e (diff) | |
| download | forums-e2cbaf4f1a0b0ddcba45babbe922076ff149a83d.tar forums-e2cbaf4f1a0b0ddcba45babbe922076ff149a83d.tar.gz forums-e2cbaf4f1a0b0ddcba45babbe922076ff149a83d.tar.bz2 forums-e2cbaf4f1a0b0ddcba45babbe922076ff149a83d.tar.xz forums-e2cbaf4f1a0b0ddcba45babbe922076ff149a83d.zip | |
[ticket/12775] Add the definition of dbal.conn in fixtures/config/services.yml
PHPBB3-12775
| -rw-r--r-- | phpBB/phpbb/di/container_builder.php | 5 | ||||
| -rw-r--r-- | tests/di/fixtures/config/services.yml | 11 | ||||
| -rw-r--r-- | tests/di/fixtures/other_config/services.yml | 11 |
3 files changed, 20 insertions, 7 deletions
diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php index 65db92ada0..ab10073013 100644 --- a/phpBB/phpbb/di/container_builder.php +++ b/phpBB/phpbb/di/container_builder.php @@ -183,7 +183,10 @@ class container_builder $this->container->set('config.php', $this->config_php_file); - $this->inject_dbal(); + if ($this->compile_container) + { + $this->inject_dbal(); + } return $this->container; } diff --git a/tests/di/fixtures/config/services.yml b/tests/di/fixtures/config/services.yml index 71bc14f69a..f2a22ae109 100644 --- a/tests/di/fixtures/config/services.yml +++ b/tests/di/fixtures/config/services.yml @@ -2,8 +2,13 @@ parameters: core: true services: - dispatcher: - class: phpbb\db\driver\container_mock - config.php: synthetic: true + + dbal.conn: + class: phpbb\db\driver\factory + arguments: + - @service_container + + dispatcher: + class: phpbb\db\driver\container_mock diff --git a/tests/di/fixtures/other_config/services.yml b/tests/di/fixtures/other_config/services.yml index 5974d3b758..c299bfc648 100644 --- a/tests/di/fixtures/other_config/services.yml +++ b/tests/di/fixtures/other_config/services.yml @@ -2,8 +2,13 @@ parameters: other_config: true services: - dispatcher: - class: phpbb\db\driver\container_mock - config.php: synthetic: true + + dbal.conn: + class: phpbb\db\driver\factory + arguments: + - @service_container + + dispatcher: + class: phpbb\db\driver\container_mock |