makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4019 from prototech/ticket/14273

Browse source 
[ticket/14273] Remove unused core.root_path dependency in files.upload service
This commit is contained in:
Marc Alexander 2015-11-06 21:47:05 +01:00
commit d8760568b6
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/config/default/container/services_files.yml
View file

@ -25,7 +25,6 @@ services:
- @language - @language
- @php_ini - @php_ini
- @request - @request
- %core.root_path%
files.types.form: files.types.form:
class: phpbb\files\types\form class: phpbb\files\types\form

7
phpBB/phpbb/files/upload.php
View file

@ -65,9 +65,6 @@ class upload
/** @var request_interface Request class */ /** @var request_interface Request class */
protected $request; protected $request;
/** @var string phpBB root path */
protected $phpbb_root_path;
/** /**
* Init file upload class. * Init file upload class.
* *
@ -76,16 +73,14 @@ class upload
* @param language $language Language class * @param language $language Language class
* @param \bantu\IniGetWrapper\IniGetWrapper $php_ini ini_get() wrapper * @param \bantu\IniGetWrapper\IniGetWrapper $php_ini ini_get() wrapper
* @param request_interface $request Request class * @param request_interface $request Request class
* @param string $phpbb_root_path phpBB root path
*/ */
public function __construct(filesystem_interface $filesystem, factory $factory, language $language, \bantu\IniGetWrapper\IniGetWrapper $php_ini, request_interface $request, $phpbb_root_path) public function __construct(filesystem_interface $filesystem, factory $factory, language $language, \bantu\IniGetWrapper\IniGetWrapper $php_ini, request_interface $request)
{ {
$this->filesystem = $filesystem; $this->filesystem = $filesystem;
$this->factory = $factory; $this->factory = $factory;
$this->language = $language; $this->language = $language;
$this->php_ini = $php_ini; $this->php_ini = $php_ini;
$this->request = $request; $this->request = $request;
$this->phpbb_root_path = $phpbb_root_path;
} }
/** /**