From 761fa9da52e92efafa6839938113ddb55cd85f17 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <tristan.darricau@sensiolabs.com>
Date: Tue, 15 Dec 2015 20:13:59 +0100
Subject: [PATCH] [ticket/14306] Doesn't try to build a "safe" container in the
 dev env

PHPBB3-14306
---
 phpBB/phpbb/di/container_builder.php | 30 +++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php
index 95d6483e34..6e6fb5c7fb 100644
--- a/phpBB/phpbb/di/container_builder.php
+++ b/phpBB/phpbb/di/container_builder.php
@@ -113,7 +113,7 @@ class container_builder
 	 * @param string $phpbb_root_path Path to the phpbb includes directory.
 	 * @param string $php_ext php file extension
 	 */
-	function __construct($phpbb_root_path, $php_ext)
+	public function __construct($phpbb_root_path, $php_ext)
 	{
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
@@ -191,14 +191,26 @@ class container_builder
 		}
 		catch (\Exception $e)
 		{
-			return $this
-				->without_extensions()
-				->without_cache()
-				->with_custom_parameters(array_merge($this->custom_parameters, [
-					'container_exception' => $e,
-				]))
-				->get_container()
-			;
+			// Don't try to recover if we are in the development environment
+			if ($this->get_environment() === 'development') {
+				throw $e;
+			}
+
+			try
+			{
+				return $this
+					->without_extensions()
+					->without_cache()
+					->with_custom_parameters(array_merge($this->custom_parameters, [
+						'container_exception' => $e,
+					]))
+					->get_container();
+			}
+			catch (\Exception $_)
+			{
+				// Rethrow the original exception if it's still failing
+				throw $e;
+			}
 		}
 	}