Merge branch 'master' into php8

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

View file

@ -429,8 +429,6 @@ class ConfigurationCombinationsTest extends TestCase
Helper::confBackup();
$this->_path = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'privatebin_data';
$this->_model = Filesystem::getInstance(array('dir' => $this->_path));
ServerSalt::setPath($this->_path);
TrafficLimiter::setPath($this->_path);
$this->reset();
}
@ -450,8 +448,6 @@ class ConfigurationCombinationsTest extends TestCase
if ($this->_model->exists(Helper::getPasteId()))
$this->_model->delete(Helper::getPasteId());
$configuration['model_options']['dir'] = $this->_path;
$configuration['traffic']['dir'] = $this->_path;
$configuration['purge']['dir'] = $this->_path;
Helper::createIniFile(CONF, $configuration);
}