From a8ba4a99e32631ce1f581043dc08366c8abc2b4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= <rubencm@gmail.com>
Date: Thu, 7 Sep 2017 15:10:52 +0200
Subject: [PATCH] [ticket/15276] Remove unused code

PHPBB3-15276
---
 phpBB/phpbb/avatar/driver/driver.php       | 1 -
 phpBB/phpbb/files/types/form.php           | 6 ------
 phpBB/phpbb/files/types/form_storage.php   | 7 -------
 phpBB/phpbb/files/types/local.php          | 6 ------
 phpBB/phpbb/files/types/remote.php         | 6 ------
 phpBB/phpbb/files/types/remote_storage.php | 7 -------
 6 files changed, 33 deletions(-)

diff --git a/phpBB/phpbb/avatar/driver/driver.php b/phpBB/phpbb/avatar/driver/driver.php
index 7f8e3795fe..45681f3e59 100644
--- a/phpBB/phpbb/avatar/driver/driver.php
+++ b/phpBB/phpbb/avatar/driver/driver.php
@@ -81,7 +81,6 @@ 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 81a4a29c92..a915476191 100644
--- a/phpBB/phpbb/files/types/form.php
+++ b/phpBB/phpbb/files/types/form.php
@@ -25,18 +25,12 @@ class form extends base
 	/** @var factory Files factory */
 	protected $factory;
 
-	/** @var language */
-	protected $language;
-
 	/** @var plupload */
 	protected $plupload;
 
 	/** @var request_interface */
 	protected $request;
 
-	/** @var \phpbb\files\upload */
-	protected $upload;
-
 	/**
 	 * Construct a form upload type
 	 *
diff --git a/phpBB/phpbb/files/types/form_storage.php b/phpBB/phpbb/files/types/form_storage.php
index eff474044a..29bef283bd 100644
--- a/phpBB/phpbb/files/types/form_storage.php
+++ b/phpBB/phpbb/files/types/form_storage.php
@@ -25,18 +25,12 @@ class form_storage extends base
 	/** @var factory Files factory */
 	protected $factory;
 
-	/** @var language */
-	protected $language;
-
 	/** @var plupload */
 	protected $plupload;
 
 	/** @var request_interface */
 	protected $request;
 
-	/** @var \phpbb\files\upload */
-	protected $upload;
-
 	/**
 	 * Construct a form upload type
 	 *
@@ -71,7 +65,6 @@ class form_storage extends base
 	 * @param string $form_name Form name assigned to the file input field (if it is an array, the key has to be specified)
 	 *
 	 * @return filespec $file Object "filespec" is returned, all further operations can be done with this object
-	 * @access public
 	 */
 	protected function form_upload($form_name)
 	{
diff --git a/phpBB/phpbb/files/types/local.php b/phpBB/phpbb/files/types/local.php
index fc80052fac..67948ea6df 100644
--- a/phpBB/phpbb/files/types/local.php
+++ b/phpBB/phpbb/files/types/local.php
@@ -24,15 +24,9 @@ class local extends base
 	/** @var factory Files factory */
 	protected $factory;
 
-	/** @var language */
-	protected $language;
-
 	/** @var request_interface */
 	protected $request;
 
-	/** @var \phpbb\files\upload */
-	protected $upload;
-
 	/**
 	 * Construct a form upload type
 	 *
diff --git a/phpBB/phpbb/files/types/remote.php b/phpBB/phpbb/files/types/remote.php
index 7caa871c18..e64e360b6a 100644
--- a/phpBB/phpbb/files/types/remote.php
+++ b/phpBB/phpbb/files/types/remote.php
@@ -28,15 +28,9 @@ class remote extends base
 	/** @var factory Files factory */
 	protected $factory;
 
-	/** @var language */
-	protected $language;
-
 	/** @var request_interface */
 	protected $request;
 
-	/** @var \phpbb\files\upload */
-	protected $upload;
-
 	/** @var string phpBB root path */
 	protected $phpbb_root_path;
 
diff --git a/phpBB/phpbb/files/types/remote_storage.php b/phpBB/phpbb/files/types/remote_storage.php
index bf7ea1272b..3e6953703e 100644
--- a/phpBB/phpbb/files/types/remote_storage.php
+++ b/phpBB/phpbb/files/types/remote_storage.php
@@ -28,15 +28,9 @@ class remote_storage extends base
 	/** @var factory Files factory */
 	protected $factory;
 
-	/** @var language */
-	protected $language;
-
 	/** @var request_interface */
 	protected $request;
 
-	/** @var \phpbb\files\upload */
-	protected $upload;
-
 	/** @var string phpBB root path */
 	protected $phpbb_root_path;
 
@@ -75,7 +69,6 @@ class remote_storage extends base
 	 *
 	 * @param string $upload_url URL pointing to file to upload, for example http://www.foobar.com/example.gif
 	 * @return filespec $file Object "filespec" is returned, all further operations can be done with this object
-	 * @access public
 	 */
 	protected function remote_upload($upload_url)
 	{