Merge branch '3.2.x'

tests/di/create_container_test.php

@@ -46,6 +46,7 @@ namespace
 		{
 			$container = $this->builder->get_container();
 			$this->assertInstanceOf('Symfony\Component\DependencyInjection\ContainerBuilder', $container);
+			$this->assertFalse($container->hasParameter('container_exception'));
 
 			// Checks the core services
 			$this->assertTrue($container->hasParameter('core'));
@@ -54,7 +55,7 @@ namespace
 			$this->assertTrue($container->isFrozen());
 
 			// Checks inject_config
-			$this->assertTrue($container->hasParameter('dbal.dbhost'));
+			$this->assertTrue($container->hasParameter('core.table_prefix'));
 
 			// Checks use_extensions
 			$this->assertTrue($container->hasParameter('enabled'));

tests/di/fixtures/config/production/container/environment.yml

@@ -10,6 +10,9 @@ services:
         arguments:
             - '@service_container'
 
+    dbal.conn.driver:
+        synthetic: true
+
     dispatcher:
         class: phpbb\db\driver\container_mock
 

tests/di/fixtures/config/test/container/environment.yml

@@ -10,6 +10,9 @@ services:
         arguments:
             - '@service_container'
 
+    dbal.conn.driver:
+        synthetic: true
+
     dispatcher:
         class: phpbb\db\driver\container_mock
 

tests/di/fixtures/other_config/production/container/environment.yml

@@ -10,6 +10,9 @@ services:
         arguments:
             - '@service_container'
 
+    dbal.conn.driver:
+        synthetic: true
+
     dispatcher:
         class: phpbb\db\driver\container_mock
 

tests/di/fixtures/other_config/test/container/environment.yml

@@ -10,6 +10,9 @@ services:
         arguments:
             - '@service_container'
 
+    dbal.conn.driver:
+        synthetic: true
+
     dispatcher:
         class: phpbb\db\driver\container_mock
 

tests/mock/phpbb_di_container_builder.php

@@ -27,4 +27,12 @@ class phpbb_mock_phpbb_di_container_builder extends \phpbb\di\container_builder
 	{
 		return $this->phpbb_root_path . '../../tmp/autoload.' . $this->php_ext;
 	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected function inject_dbal_driver()
+	{
+		return;
+	}
 }

tests/test_framework/phpbb_functional_test_case.php

@@ -304,6 +304,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 				],
 				'cache.driver.class' => 'phpbb\cache\driver\file'
 			])
+			->with_config(new \phpbb\config_php_file($phpbb_root_path, $phpEx))
 			->without_compiled_container()
 			->get_container();