diff --git a/phpBB/config/default/container/services_files.yml b/phpBB/config/default/container/services_files.yml
index 72a22d5f00..96682d6713 100644
--- a/phpBB/config/default/container/services_files.yml
+++ b/phpBB/config/default/container/services_files.yml
@@ -42,6 +42,7 @@ services:
         arguments:
             - '@files.factory'
             - '@language'
+            - '@php_ini'
             - '@plupload'
             - '@request'
 
@@ -51,6 +52,7 @@ services:
         arguments:
             - '@files.factory'
             - '@language'
+            - '@php_ini'
             - '@plupload'
             - '@request'
 
diff --git a/phpBB/phpbb/avatar/driver/driver.php b/phpBB/phpbb/avatar/driver/driver.php
index 45681f3e59..7f8e3795fe 100644
--- a/phpBB/phpbb/avatar/driver/driver.php
+++ b/phpBB/phpbb/avatar/driver/driver.php
@@ -81,6 +81,7 @@ abstract class driver implements \phpbb\avatar\driver\driver_interface
 	* @param string $php_ext PHP file extension
 	* @param \phpbb\path_helper $path_helper phpBB path helper
 	* @param \phpbb\cache\driver\driver_interface $cache Cache driver
+	* @param \bantu\IniGetWrapper\IniGetWrapper $php_ini Init get wrapper
 	*/
 	public function __construct(\phpbb\config\config $config, \FastImageSize\FastImageSize $imagesize, $phpbb_root_path, $php_ext, \phpbb\path_helper $path_helper, \phpbb\cache\driver\driver_interface $cache = null)
 	{
diff --git a/phpBB/phpbb/files/types/form.php b/phpBB/phpbb/files/types/form.php
index 872c0f014c..2c3beb6e02 100644
--- a/phpBB/phpbb/files/types/form.php
+++ b/phpBB/phpbb/files/types/form.php
@@ -13,6 +13,7 @@
 
 namespace phpbb\files\types;
 
+use bantu\IniGetWrapper\IniGetWrapper;
 use phpbb\files\factory;
 use phpbb\files\filespec;
 use phpbb\language\language;
@@ -27,6 +28,9 @@ class form extends base
 	/** @var language */
 	protected $language;
 
+	/** @var IniGetWrapper */
+	protected $php_ini;
+
 	/** @var plupload */
 	protected $plupload;
 
@@ -41,13 +45,15 @@ class form extends base
 	 *
 	 * @param factory			$factory	Files factory
 	 * @param language			$language	Language class
+	 * @param IniGetWrapper		$php_ini	ini_get() wrapper
 	 * @param plupload			$plupload	Plupload
 	 * @param request_interface	$request	Request object
 	 */
-	public function __construct(factory $factory, language $language, plupload $plupload, request_interface $request)
+	public function __construct(factory $factory, language $language, IniGetWrapper $php_ini, plupload $plupload, request_interface $request)
 	{
 		$this->factory = $factory;
 		$this->language = $language;
+		$this->php_ini = $php_ini;
 		$this->plupload = $plupload;
 		$this->request = $request;
 	}
diff --git a/phpBB/phpbb/files/types/form_storage.php b/phpBB/phpbb/files/types/form_storage.php
index b80be689c9..09bd850538 100644
--- a/phpBB/phpbb/files/types/form_storage.php
+++ b/phpBB/phpbb/files/types/form_storage.php
@@ -13,6 +13,7 @@
 
 namespace phpbb\files\types;
 
+use bantu\IniGetWrapper\IniGetWrapper;
 use phpbb\files\factory;
 use phpbb\files\filespec;
 use phpbb\language\language;
@@ -27,6 +28,9 @@ class form_storage extends base
 	/** @var language */
 	protected $language;
 
+	/** @var IniGetWrapper */
+	protected $php_ini;
+
 	/** @var plupload */
 	protected $plupload;
 
@@ -41,13 +45,15 @@ class form_storage extends base
 	 *
 	 * @param factory			$factory	Files factory
 	 * @param language			$language	Language class
+	 * @param IniGetWrapper		$php_ini	ini_get() wrapper
 	 * @param plupload			$plupload	Plupload
 	 * @param request_interface	$request	Request object
 	 */
-	public function __construct(factory $factory, language $language, plupload $plupload, request_interface $request)
+	public function __construct(factory $factory, language $language, IniGetWrapper $php_ini, plupload $plupload, request_interface $request)
 	{
 		$this->factory = $factory;
 		$this->language = $language;
+		$this->php_ini = $php_ini;
 		$this->plupload = $plupload;
 		$this->request = $request;
 	}
diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php
index c276281fee..2866a1673d 100644
--- a/tests/avatar/manager_test.php
+++ b/tests/avatar/manager_test.php
@@ -89,6 +89,8 @@ class phpbb_avatar_manager_test extends \phpbb_database_test_case
 
 		$files_factory = new \phpbb\files\factory($phpbb_container);
 
+		$php_ini = new \bantu\IniGetWrapper\IniGetWrapper;
+
 		foreach ($this->avatar_drivers() as $driver)
 		{
 			if ($driver !== 'upload')
@@ -102,7 +104,7 @@ class phpbb_avatar_manager_test extends \phpbb_database_test_case
 			{
 				$cur_avatar = $this->getMockBuilder('\phpbb\avatar\driver\\' . $driver)
 				->setMethods(array('get_name'))
-				->setConstructorArgs(array($this->config, $phpbb_root_path, $phpEx, $storage, $path_helper, $dispatcher, $files_factory, $cache))
+				->setConstructorArgs(array($this->config, $phpbb_root_path, $phpEx, $storage, $path_helper, $dispatcher, $files_factory, $php_ini))
 				->getMock();
 			}
 			$cur_avatar->expects($this->any())