mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-24 01:20:40 +01:00
Code Issues Releases Wiki Activity

[ticket/15276] Use IniGetWrapper

Browse Source 
PHPBB3-15276
This commit is contained in:
Rubén Calvo 2017-09-07 14:50:55 +02:00
parent 5ff182ce25
commit 9fcf30d504
5 changed files with 20 additions and 3 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,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'

1
phpBB/phpbb/avatar/driver/driver.php
View File

@ -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)
{

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

@ -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;
}

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

@ -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;
}

4
tests/avatar/manager_test.php
View File

@ -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())