1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 03:04:09 +02:00

Merge branch 'ticket/15392' into ticket/15392-master

This commit is contained in:
Marc Alexander
2021-03-04 17:04:17 +01:00
211 changed files with 395 additions and 396 deletions

View File

@@ -19,7 +19,7 @@ class phpbb_passwords_helper_test extends \phpbb_test_case
$config = new \phpbb\config\config(array());
$request = new phpbb_mock_request(array(), array(), array(), array(), array('password' => 'fööbar'));
$this->driver_helper = new \phpbb\passwords\driver\helper($config);
$phpbb_root_path = dirname(__FILE__) . '/../../phpBB/';
$phpbb_root_path = __DIR__ . '/../../phpBB/';
$php_ext = 'php';
// Initialize argon2 default options

View File

@@ -25,7 +25,7 @@ class phpbb_passwords_manager_test extends \phpbb_test_case
$config = new \phpbb\config\config(array());
$this->driver_helper = new \phpbb\passwords\driver\helper($config);
$request = new phpbb_mock_request(array(), array(), array(), array(), array('password' => 'töst'));
$phpbb_root_path = dirname(__FILE__) . '/../../phpBB/';
$phpbb_root_path = __DIR__ . '/../../phpBB/';
$php_ext = 'php';
$this->passwords_drivers = array(