4 files changed, 119 insertions, 3 deletions
diff --git a/phpBB/phpbb/db/migration/data/v320/v320rc2.php b/phpBB/phpbb/db/migration/data/v320/v320rc2.php
new file mode 100644
index 0000000000..ec9bb62732
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v320/v320rc2.php
@@ -0,0 +1,40 @@
+<?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\db\migration\data\v320;
+
+use phpbb\db\migration\migration;
+
+class v320rc2 extends migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.2.0-RC2', '>=');
+	}
+
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\db\migration\data\v31x\remove_duplicate_migrations',
+			'\phpbb\db\migration\data\v31x\add_log_time_index',
+			'\phpbb\db\migration\data\v320\add_help_phpbb',
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.2.0-RC2')),
+		);
+	}
+}
diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php
index b6854673c2..4d5f189f12 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;
@@ -488,7 +487,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();
 
diff --git a/phpBB/phpbb/di/proxy_instantiator.php b/phpBB/phpbb/di/proxy_instantiator.php
new file mode 100644
index 0000000000..a388e82c0e
--- /dev/null
+++ b/phpBB/phpbb/di/proxy_instantiator.php
@@ -0,0 +1,77 @@
+<?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 bantu\IniGetWrapper\IniGetWrapper;
+use phpbb\filesystem\filesystem;
+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
+		$ini_wrapper = new IniGetWrapper();
+		$filesystem = new filesystem();
+		$tmp_dir = (function_exists('sys_get_temp_dir')) ? sys_get_temp_dir() : '';
+		if (empty($tmp_dir) || $ini_wrapper->getString('open_basedir') &&
+			(!$filesystem->exists($tmp_dir) || !$filesystem->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;
+			}
+		);
+	}
+}
diff --git a/phpBB/phpbb/install/module/update_filesystem/task/show_file_status.php b/phpBB/phpbb/install/module/update_filesystem/task/show_file_status.php
index 7f18950cf6..cf1e4cf4ac 100644
--- a/phpBB/phpbb/install/module/update_filesystem/task/show_file_status.php
+++ b/phpBB/phpbb/install/module/update_filesystem/task/show_file_status.php
@@ -92,7 +92,7 @@ class show_file_status extends task_base
 			// Create archive for merge conflicts
 			if (!empty($merge_conflicts))
 			{
-				$compression_method = $this->installer_config->get('compression_method', '');
+				$compression_method = $this->installer_config->get('file_update_compression', '');
 				$conflict_archive = $this->file_updater->init($compression_method);
 				$this->installer_config->set('update_file_conflict_archive', $conflict_archive);