From ed282199acc83ba6e598657e4427c541bf2a1d04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= <rubencm@gmail.com>
Date: Thu, 7 Sep 2017 14:59:55 +0200
Subject: [PATCH] [ticket/15276] Revert some changes

PHPBB3-15276
---
 phpBB/phpbb/avatar/driver/upload.php       | 20 --------------------
 phpBB/phpbb/files/types/form.php           |  3 ---
 phpBB/phpbb/files/types/form_storage.php   |  3 ---
 phpBB/phpbb/files/types/local.php          |  3 ---
 phpBB/phpbb/files/types/remote.php         |  3 ---
 phpBB/phpbb/files/types/remote_storage.php |  3 ---
 6 files changed, 35 deletions(-)

diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php
index f1ea533a89..a808e7b2a1 100644
--- a/phpBB/phpbb/avatar/driver/upload.php
+++ b/phpBB/phpbb/avatar/driver/upload.php
@@ -21,31 +21,11 @@ use \phpbb\storage\exception\exception as storage_exception;
 */
 class upload extends \phpbb\avatar\driver\driver
 {
-	/**
-	 * @var \phpbb\config\config
-	 */
-	protected $config;
-
-	/**
-	 * @var string
-	 */
-	protected $phpbb_root_path;
-
-	/**
-	 * @var string
-	 */
-	protected $php_ext;
-
 	/**
 	 * @var \phpbb\storage\storage
 	 */
 	protected $storage;
 
-	/**
-	 * @var \phpbb\path_helper
-	 */
-	protected $path_helper;
-
 	/**
 	* @var \phpbb\event\dispatcher_interface
 	*/
diff --git a/phpBB/phpbb/files/types/form.php b/phpBB/phpbb/files/types/form.php
index 2c3beb6e02..81a4a29c92 100644
--- a/phpBB/phpbb/files/types/form.php
+++ b/phpBB/phpbb/files/types/form.php
@@ -28,9 +28,6 @@ class form extends base
 	/** @var language */
 	protected $language;
 
-	/** @var IniGetWrapper */
-	protected $php_ini;
-
 	/** @var plupload */
 	protected $plupload;
 
diff --git a/phpBB/phpbb/files/types/form_storage.php b/phpBB/phpbb/files/types/form_storage.php
index 09bd850538..eff474044a 100644
--- a/phpBB/phpbb/files/types/form_storage.php
+++ b/phpBB/phpbb/files/types/form_storage.php
@@ -28,9 +28,6 @@ class form_storage extends base
 	/** @var language */
 	protected $language;
 
-	/** @var IniGetWrapper */
-	protected $php_ini;
-
 	/** @var plupload */
 	protected $plupload;
 
diff --git a/phpBB/phpbb/files/types/local.php b/phpBB/phpbb/files/types/local.php
index 4dfe4f7506..fc80052fac 100644
--- a/phpBB/phpbb/files/types/local.php
+++ b/phpBB/phpbb/files/types/local.php
@@ -27,9 +27,6 @@ class local extends base
 	/** @var language */
 	protected $language;
 
-	/** @var IniGetWrapper */
-	protected $php_ini;
-
 	/** @var request_interface */
 	protected $request;
 
diff --git a/phpBB/phpbb/files/types/remote.php b/phpBB/phpbb/files/types/remote.php
index 1fdba0ca32..7caa871c18 100644
--- a/phpBB/phpbb/files/types/remote.php
+++ b/phpBB/phpbb/files/types/remote.php
@@ -31,9 +31,6 @@ class remote extends base
 	/** @var language */
 	protected $language;
 
-	/** @var IniGetWrapper */
-	protected $php_ini;
-
 	/** @var request_interface */
 	protected $request;
 
diff --git a/phpBB/phpbb/files/types/remote_storage.php b/phpBB/phpbb/files/types/remote_storage.php
index 16c061655c..bf7ea1272b 100644
--- a/phpBB/phpbb/files/types/remote_storage.php
+++ b/phpBB/phpbb/files/types/remote_storage.php
@@ -31,9 +31,6 @@ class remote_storage extends base
 	/** @var language */
 	protected $language;
 
-	/** @var IniGetWrapper */
-	protected $php_ini;
-
 	/** @var request_interface */
 	protected $request;