mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-03 04:55:36 +02:00
Code Issues Releases Wiki Activity

[ticket/15276] Use InitGetWrapper

Browse Source 
PHPBB3-15276
This commit is contained in:
Rubén Calvo 2017-09-07 13:29:35 +02:00
parent fe20aa058f
commit 354dda5cc8
4 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/config/default/container/services_files.yml
View File

@ -42,7 +42,6 @@ services:
arguments:
- '@files.factory'
- '@language'
- '@php_ini'
- '@plupload'
- '@request'
@ -52,7 +51,6 @@ services:
arguments:
- '@files.factory'
- '@language'
- '@php_ini'
- '@plupload'
- '@request'

12
phpBB/phpbb/avatar/driver/upload.php
View File

@ -13,6 +13,7 @@
namespace phpbb\avatar\driver;
use bantu\IniGetWrapper\IniGetWrapper;
use \phpbb\storage\exception\exception as storage_exception;
/**
@ -35,6 +36,11 @@ class upload extends \phpbb\avatar\driver\driver
*/
protected $files_factory;
/**
* @var IniGetWrapper
*/
protected $php_ini;
/**
* Construct a driver object
*
@ -45,9 +51,10 @@ class upload extends \phpbb\avatar\driver\driver
* @param \phpbb\path_helper $path_helper phpBB path helper
* @param \phpbb\event\dispatcher_interface $dispatcher phpBB Event dispatcher object
* @param \phpbb\files\factory $files_factory File classes factory
* @param IniGetWrapper $php_ini ini_get() wrapper
* @param \phpbb\cache\driver\driver_interface $cache Cache driver
*/
public function __construct(\phpbb\config\config $config, $phpbb_root_path, $php_ext, \phpbb\storage\storage $storage, \phpbb\path_helper $path_helper, \phpbb\event\dispatcher_interface $dispatcher, \phpbb\files\factory $files_factory, \phpbb\cache\driver\driver_interface $cache = null)
public function __construct(\phpbb\config\config $config, $phpbb_root_path, $php_ext, \phpbb\storage\storage $storage, \phpbb\path_helper $path_helper, \phpbb\event\dispatcher_interface $dispatcher, \phpbb\files\factory $files_factory, IniGetWrapper $php_ini, \phpbb\cache\driver\driver_interface $cache = null)
{
$this->config = $config;
$this->phpbb_root_path = $phpbb_root_path;
@ -56,6 +63,7 @@ class upload extends \phpbb\avatar\driver\driver
$this->path_helper = $path_helper;
$this->dispatcher = $dispatcher;
$this->files_factory = $files_factory;
$this->php_ini = $php_ini;
$this->cache = $cache;
}
@ -303,6 +311,6 @@ class upload extends \phpbb\avatar\driver\driver
*/
protected function can_upload()
{
return (@ini_get('file_uploads') || strtolower(@ini_get('file_uploads')) == 'on');
return $this->php_ini->getBool('file_uploads');
}
}

8
phpBB/phpbb/files/types/form.php
View File

@ -13,7 +13,6 @@
namespace phpbb\files\types;
use bantu\IniGetWrapper\IniGetWrapper;
use phpbb\files\factory;
use phpbb\files\filespec;
use phpbb\language\language;
@ -28,9 +27,6 @@ class form extends base
/** @var language */
protected $language;
/** @var IniGetWrapper */
protected $php_ini;
/** @var plupload */
protected $plupload;
@ -45,15 +41,13 @@ 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, IniGetWrapper $php_ini, plupload $plupload, request_interface $request)
public function __construct(factory $factory, language $language, plupload $plupload, request_interface $request)
{
$this->factory = $factory;
$this->language = $language;
$this->php_ini = $php_ini;
$this->plupload = $plupload;
$this->request = $request;
}

8
phpBB/phpbb/files/types/form_storage.php
View File

@ -13,7 +13,6 @@
namespace phpbb\files\types;
use bantu\IniGetWrapper\IniGetWrapper;
use phpbb\files\factory;
use phpbb\files\filespec;
use phpbb\language\language;
@ -28,9 +27,6 @@ class form_storage extends base
/** @var language */
protected $language;
/** @var IniGetWrapper */
protected $php_ini;
/** @var plupload */
protected $plupload;
@ -45,15 +41,13 @@ 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, IniGetWrapper $php_ini, plupload $plupload, request_interface $request)
public function __construct(factory $factory, language $language, plupload $plupload, request_interface $request)
{
$this->factory = $factory;
$this->language = $language;
$this->php_ini = $php_ini;
$this->plupload = $plupload;
$this->request = $request;
}