Infra-Mirrors/PrivateBin
1
0
Fork 0
mirror of https://github.com/PrivateBin/PrivateBin.git synced 2025-08-03 03:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into php8

Browse source
This commit is contained in:
El RIDO 2021-10-07 22:17:11 +02:00
commit 3f469f715f
No known key found for this signature in database
GPG key ID: 0F5C940A6BD81F92
119 changed files with 6872 additions and 790 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tst/JsonApiTest.php
View file

@ -17,7 +17,7 @@ class JsonApiTest extends TestCase
/* Setup Routine */
$this->_path = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'privatebin_data';
$this->_model = Filesystem::getInstance(array('dir' => $this->_path));
ServerSalt::setPath($this->_path);
ServerSalt::setStore($this->_model);
$_POST = array();
$_GET = array();
@ -26,8 +26,6 @@ class JsonApiTest extends TestCase
$this->_model->delete(Helper::getPasteId());
}
$options = parse_ini_file(CONF_SAMPLE, true);
$options['purge']['dir'] = $this->_path;
$options['traffic']['dir'] = $this->_path;
$options['model_options']['dir'] = $this->_path;
Helper::confBackup();
Helper::createIniFile(CONF, $options);