3 files changed, 111 insertions, 8 deletions
diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php
index b6854673c2..ac1a1a1733 100644
--- a/phpBB/phpbb/di/container_builder.php
+++ b/phpBB/phpbb/di/container_builder.php
@@ -14,7 +14,6 @@
 namespace phpbb\di;
 
 use phpbb\filesystem\filesystem;
-use Symfony\Bridge\ProxyManager\LazyProxy\Instantiator\RuntimeInstantiator;
 use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper;
 use Symfony\Component\Config\ConfigCache;
 use Symfony\Component\Config\FileLocator;
@@ -52,6 +51,11 @@ class container_builder
 	protected $container;
 
 	/**
+	 * @var \phpbb\db\driver\driver_interface
+	 */
+	protected $dbal_connection = null;
+
+	/**
 	 * Indicates whether extensions should be used (default to true).
 	 *
 	 * @var bool
@@ -198,6 +202,8 @@ class container_builder
 				$this->container->set('config.php', $this->config_php_file);
 			}
 
+			$this->inject_dbal_driver();
+
 			return $this->container;
 		}
 		catch (\Exception $e)
@@ -488,7 +494,7 @@ class container_builder
 	protected function create_container(array $extensions)
 	{
 		$container = new ContainerBuilder(new ParameterBag($this->get_core_parameters()));
-		$container->setProxyInstantiator(new RuntimeInstantiator());
+		$container->setProxyInstantiator(new proxy_instantiator($this->get_cache_dir()));
 
 		$extensions_alias = array();
 
@@ -512,7 +518,38 @@ class container_builder
 		{
 			$this->container->setParameter($key, $value);
 		}
+	}
 
+	/**
+	 * Inject the dbal connection driver into container
+	 */
+	protected function inject_dbal_driver()
+	{
+		if (empty($this->config_php_file))
+		{
+			return;
+		}
+
+		$config_data = $this->config_php_file->get_all();
+		if (!empty($config_data))
+		{
+			if ($this->dbal_connection === null)
+			{
+				$dbal_driver_class = $this->config_php_file->convert_30_dbms_to_31($this->config_php_file->get('dbms'));
+				/** @var \phpbb\db\driver\driver_interface $dbal_connection */
+				$this->dbal_connection = new $dbal_driver_class();
+				$this->dbal_connection->sql_connect(
+					$this->config_php_file->get('dbhost'),
+					$this->config_php_file->get('dbuser'),
+					$this->config_php_file->get('dbpasswd'),
+					$this->config_php_file->get('dbname'),
+					$this->config_php_file->get('dbport'),
+					false,
+					defined('PHPBB_DB_NEW_LINK') && PHPBB_DB_NEW_LINK
+				);
+			}
+			$this->container->set('dbal.conn.driver', $this->dbal_connection);
+		}
 	}
 
 	/**
diff --git a/phpBB/phpbb/di/extension/config.php b/phpBB/phpbb/di/extension/config.php
index 7984a783df..8c9de48823 100644
--- a/phpBB/phpbb/di/extension/config.php
+++ b/phpBB/phpbb/di/extension/config.php
@@ -43,12 +43,6 @@ class config extends Extension
 			'core.adm_relative_path'	=> $this->config_php->get('phpbb_adm_relative_path') ? $this->config_php->get('phpbb_adm_relative_path') : 'adm/',
 			'core.table_prefix'			=> $this->config_php->get('table_prefix'),
 			'cache.driver.class'		=> $this->convert_30_acm_type($this->config_php->get('acm_type')),
-			'dbal.driver.class'			=> $this->config_php->convert_30_dbms_to_31($this->config_php->get('dbms')),
-			'dbal.dbhost'				=> $this->config_php->get('dbhost'),
-			'dbal.dbuser'				=> $this->config_php->get('dbuser'),
-			'dbal.dbpasswd'				=> $this->config_php->get('dbpasswd'),
-			'dbal.dbname'				=> $this->config_php->get('dbname'),
-			'dbal.dbport'				=> $this->config_php->get('dbport'),
 			'dbal.new_link'				=> defined('PHPBB_DB_NEW_LINK') && PHPBB_DB_NEW_LINK,
 		);
 		$parameter_bag = $container->getParameterBag();
diff --git a/phpBB/phpbb/di/proxy_instantiator.php b/phpBB/phpbb/di/proxy_instantiator.php
new file mode 100644
index 0000000000..70295a3dec
--- /dev/null
+++ b/phpBB/phpbb/di/proxy_instantiator.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\di;
+
+use ProxyManager\Configuration;
+use ProxyManager\Factory\LazyLoadingValueHolderFactory;
+use ProxyManager\GeneratorStrategy\EvaluatingGeneratorStrategy;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\LazyProxy\Instantiator\InstantiatorInterface;
+
+/**
+ * Runtime lazy loading proxy generator extended for allowing use while using
+ * open_basedir restrictions
+ *
+ * Original author: Marco Pivetta <ocramius@gmail.com>
+ */
+class proxy_instantiator implements InstantiatorInterface
+{
+	/**
+	 * @var LazyLoadingValueHolderFactory
+	 */
+	private $factory;
+
+	/**
+	 * proxy_instantiator constructor
+	 * @param string $cache_dir Cache dir for fall back when using open_basedir
+	 */
+	public function __construct($cache_dir)
+	{
+		$config = new Configuration();
+
+		// Prevent trying to write to system temp dir in case of open_basedir
+		// restrictions being in effect
+		$tmp_dir = (function_exists('sys_get_temp_dir')) ? sys_get_temp_dir() : '';
+		if (empty($tmp_dir) || !@file_exists($tmp_dir) || !@is_writable($tmp_dir))
+		{
+			$config->setProxiesTargetDir($cache_dir);
+		}
+		$config->setGeneratorStrategy(new EvaluatingGeneratorStrategy());
+
+		$this->factory = new LazyLoadingValueHolderFactory($config);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function instantiateProxy(ContainerInterface $container, Definition $definition, $id, $realInstantiator)
+	{
+		return $this->factory->createProxy(
+			$definition->getClass(),
+			function (&$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) use ($realInstantiator) {
+				$wrappedInstance = call_user_func($realInstantiator);
+
+				$proxy->setProxyInitializer(null);
+
+				return true;
+			}
+		);
+	}
+}