mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-12 11:44:08 +02:00
Code Issues Releases Wiki Activity

[ticket/15311] Move get_temp_dir to another service

Browse Source 
PHPBB3-15311
This commit is contained in:
Rubén Calvo
2018-05-30 23:15:31 +02:00
parent d156bf3757
commit b43268e8fc
52 changed files with 160 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
phpBB/phpbb/db/extractor/base_extractor.php
View File

@@ -22,9 +22,9 @@ use phpbb\db\extractor\exception\extractor_not_initialized_exception;
abstract class base_extractor implements extractor_interface
{
/**
* @var \phpbb\filesystem\filesystem
* @var \phpbb\filesystem\temp
*/
protected $filesystem;
protected $temp;
/**
* @var \phpbb\request\request_interface
@@ -84,12 +84,13 @@ abstract class base_extractor implements extractor_interface
/**
* Constructor
*
* @param \phpbb\filesystem\temp $temp
* @param \phpbb\request\request_interface $request
* @param \phpbb\db\driver\driver_interface $db
*/
public function __construct(\phpbb\filesystem\filesystem $filesystem, \phpbb\request\request_interface $request, \phpbb\db\driver\driver_interface $db)
public function __construct(\phpbb\filesystem\temp $temp, \phpbb\request\request_interface $request, \phpbb\db\driver\driver_interface $db)
{
$this->filesystem = $filesystem;
$this->temp = $temp;
$this->request = $request;
$this->db = $db;
$this->fp = null;
@@ -163,7 +164,7 @@ abstract class base_extractor implements extractor_interface
if ($store === true)
{
$file = $this->filesystem->get_temp_dir() . '/' . $filename . $ext;
$file = $this->temp->get_temp_dir() . '/' . $filename . $ext;
$this->fp = $open($file, 'w');