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