1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +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

@@ -15,7 +15,7 @@ class phpbb_functions_language_select_test extends phpbb_database_test_case
{
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/language_select.xml');
return $this->createXMLDataSet(__DIR__.'/fixtures/language_select.xml');
}
static public function language_select_data()

View File

@@ -17,7 +17,7 @@ class phpbb_functions_obtain_online_test extends phpbb_database_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/obtain_online.xml');
return $this->createXMLDataSet(__DIR__.'/fixtures/obtain_online.xml');
}
protected function setUp(): void

View File

@@ -11,13 +11,13 @@
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php';
require_once __DIR__ . '/../../phpBB/includes/functions_user.php';
class phpbb_get_banned_user_ids_test extends phpbb_database_test_case
{
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/banned_users.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/banned_users.xml');
}
public function phpbb_get_banned_user_ids_data()

View File

@@ -15,7 +15,7 @@ class phpbb_functions_style_select_test extends phpbb_database_test_case
{
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/style_select.xml');
return $this->createXMLDataSet(__DIR__.'/fixtures/style_select.xml');
}
static public function style_select_data()

View File

@@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php';
require_once __DIR__ . '/../../phpBB/includes/functions_user.php';
class phpbb_functions_user_delete_test extends phpbb_database_test_case
{
@@ -20,7 +20,7 @@ class phpbb_functions_user_delete_test extends phpbb_database_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/user_delete.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/user_delete.xml');
}
protected function setUp(): void

View File

@@ -11,8 +11,8 @@
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php';
require_once dirname(__FILE__) . '/validate_data_helper.php';
require_once __DIR__ . '/../../phpBB/includes/functions_user.php';
require_once __DIR__ . '/validate_data_helper.php';
class phpbb_functions_validate_date_test extends phpbb_test_case
{

View File

@@ -7,9 +7,9 @@
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php';
require_once dirname(__FILE__) . '/../mock/user.php';
require_once dirname(__FILE__) . '/validate_data_helper.php';
require_once __DIR__ . '/../../phpBB/includes/functions_user.php';
require_once __DIR__ . '/../mock/user.php';
require_once __DIR__ . '/validate_data_helper.php';
class phpbb_functions_validate_email_test extends phpbb_database_test_case
{
@@ -19,7 +19,7 @@ class phpbb_functions_validate_email_test extends phpbb_database_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/validate_email.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/validate_email.xml');
}
protected function setUp(): void

View File

@@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php';
require_once __DIR__ . '/../../phpBB/includes/functions_user.php';
class phpbb_functions_validate_hex_colour_test extends phpbb_test_case
{

View File

@@ -11,8 +11,8 @@
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php';
require_once dirname(__FILE__) . '/validate_data_helper.php';
require_once __DIR__ . '/../../phpBB/includes/functions_user.php';
require_once __DIR__ . '/validate_data_helper.php';
class phpbb_functions_validate_jabber_test extends phpbb_test_case
{

View File

@@ -11,8 +11,8 @@
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php';
require_once dirname(__FILE__) . '/validate_data_helper.php';
require_once __DIR__ . '/../../phpBB/includes/functions_user.php';
require_once __DIR__ . '/validate_data_helper.php';
class phpbb_functions_validate_lang_iso_test extends phpbb_database_test_case
{
@@ -21,7 +21,7 @@ class phpbb_functions_validate_lang_iso_test extends phpbb_database_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/language_select.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/language_select.xml');
}
protected function setUp(): void

View File

@@ -11,8 +11,8 @@
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php';
require_once dirname(__FILE__) . '/validate_data_helper.php';
require_once __DIR__ . '/../../phpBB/includes/functions_user.php';
require_once __DIR__ . '/validate_data_helper.php';
class phpbb_functions_validate_match_test extends phpbb_test_case
{

View File

@@ -11,8 +11,8 @@
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php';
require_once dirname(__FILE__) . '/validate_data_helper.php';
require_once __DIR__ . '/../../phpBB/includes/functions_user.php';
require_once __DIR__ . '/validate_data_helper.php';
class phpbb_functions_validate_num_test extends phpbb_test_case
{

View File

@@ -11,8 +11,8 @@
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php';
require_once dirname(__FILE__) . '/validate_data_helper.php';
require_once __DIR__ . '/../../phpBB/includes/functions_user.php';
require_once __DIR__ . '/validate_data_helper.php';
class phpbb_functions_validate_password_test extends phpbb_test_case
{

View File

@@ -11,8 +11,8 @@
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php';
require_once dirname(__FILE__) . '/validate_data_helper.php';
require_once __DIR__ . '/../../phpBB/includes/functions_user.php';
require_once __DIR__ . '/validate_data_helper.php';
class phpbb_functions_validate_string_test extends phpbb_test_case
{

View File

@@ -11,9 +11,9 @@
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php';
require_once dirname(__FILE__) . '/../mock/user.php';
require_once dirname(__FILE__) . '/validate_data_helper.php';
require_once __DIR__ . '/../../phpBB/includes/functions_user.php';
require_once __DIR__ . '/../mock/user.php';
require_once __DIR__ . '/validate_data_helper.php';
class phpbb_functions_validate_user_email_test extends phpbb_database_test_case
{
@@ -23,7 +23,7 @@ class phpbb_functions_validate_user_email_test extends phpbb_database_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/validate_email.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/validate_email.xml');
}
protected function setUp(): void

View File

@@ -11,9 +11,9 @@
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php';
require_once dirname(__FILE__) . '/../mock/cache.php';
require_once dirname(__FILE__) . '/validate_data_helper.php';
require_once __DIR__ . '/../../phpBB/includes/functions_user.php';
require_once __DIR__ . '/../mock/cache.php';
require_once __DIR__ . '/validate_data_helper.php';
class phpbb_functions_validate_data_test extends phpbb_database_test_case
{
@@ -23,7 +23,7 @@ class phpbb_functions_validate_data_test extends phpbb_database_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/validate_username.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/validate_username.xml');
}
protected function setUp(): void

View File

@@ -11,8 +11,8 @@
*
*/
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php';
require_once dirname(__FILE__) . '/validate_data_helper.php';
require_once __DIR__ . '/../../phpBB/includes/functions_user.php';
require_once __DIR__ . '/validate_data_helper.php';
class phpbb_functions_validate_with_method_test extends phpbb_test_case
{