mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Marc Alexander
2021-03-04 17:04:17 +01:00
parent 1306e63fd7 7a310cc7d9
commit b46e242013
211 changed files with 395 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/console/cache/purge_test.php vendored
View File

@@ -15,7 +15,7 @@ use Symfony\Component\Console\Application;
use Symfony\Component\Console\Tester\CommandTester;
use phpbb\console\command\cache\purge;
require_once dirname(__FILE__) . '/../../../phpBB/includes/functions_admin.php';
require_once __DIR__ . '/../../../phpBB/includes/functions_admin.php';
class phpbb_console_command_cache_purge_test extends phpbb_test_case
{
@@ -30,7 +30,7 @@ class phpbb_console_command_cache_purge_test extends phpbb_test_case
{
global $phpbb_root_path, $phpEx;
$this->cache_dir = dirname(__FILE__) . '/tmp/cache/';
$this->cache_dir = __DIR__ . '/tmp/cache/';
if (file_exists($this->cache_dir))
{

4
tests/console/cron/cron_list_test.php
View File

@@ -11,8 +11,8 @@
*
*/
require_once dirname(__FILE__) . '/tasks/simple_ready.php';
require_once dirname(__FILE__) . '/tasks/simple_not_ready.php';
require_once __DIR__ . '/tasks/simple_ready.php';
require_once __DIR__ . '/tasks/simple_not_ready.php';
use Symfony\Component\Console\Application;
use Symfony\Component\Console\Tester\CommandTester;

4
tests/console/cron/run_test.php
View File

@@ -15,7 +15,7 @@ use Symfony\Component\Console\Application;
use Symfony\Component\Console\Tester\CommandTester;
use phpbb\console\command\cron\run;
require_once dirname(__FILE__) . '/tasks/simple.php';
require_once __DIR__ . '/tasks/simple.php';
class phpbb_console_command_cron_run_test extends phpbb_database_test_case
{
@@ -29,7 +29,7 @@ class phpbb_console_command_cron_run_test extends phpbb_database_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/config.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/config.xml');
}
protected function setUp(): void

10
tests/console/thumbnail_test.php
View File

@@ -29,7 +29,7 @@ class phpbb_console_command_thumbnail_test extends phpbb_database_test_case
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/thumbnail.xml');
return $this->createXMLDataSet(__DIR__ . '/fixtures/thumbnail.xml');
}
protected function setUp(): void
@@ -68,10 +68,10 @@ class phpbb_console_command_thumbnail_test extends phpbb_database_test_case
$phpbb_filesystem = new \phpbb\filesystem\filesystem();
copy(dirname(__FILE__) . '/fixtures/png.png', $this->phpbb_root_path . 'files/test_png_1');
copy(dirname(__FILE__) . '/fixtures/png.png', $this->phpbb_root_path . 'files/test_png_2');
copy(dirname(__FILE__) . '/fixtures/png.png', $this->phpbb_root_path . 'files/thumb_test_png_2');
copy(dirname(__FILE__) . '/fixtures/txt.txt', $this->phpbb_root_path . 'files/test_txt');
copy(__DIR__ . '/fixtures/png.png', $this->phpbb_root_path . 'files/test_png_1');
copy(__DIR__ . '/fixtures/png.png', $this->phpbb_root_path . 'files/test_png_2');
copy(__DIR__ . '/fixtures/png.png', $this->phpbb_root_path . 'files/thumb_test_png_2');
copy(__DIR__ . '/fixtures/txt.txt', $this->phpbb_root_path . 'files/test_txt');
}
protected function tearDown(): void

6
tests/console/update/check_test.php
View File

@@ -15,9 +15,9 @@ use Symfony\Component\Console\Application;
use Symfony\Component\Console\Tester\CommandTester;
use phpbb\console\command\update\check;
require_once dirname(__FILE__) . '/../../../phpBB/includes/functions_admin.php';
require_once dirname(__FILE__) . '/../../../phpBB/includes/functions.php';
require_once dirname(__FILE__) . '/../../../phpBB/includes/utf/utf_tools.php';
require_once __DIR__ . '/../../../phpBB/includes/functions_admin.php';
require_once __DIR__ . '/../../../phpBB/includes/functions.php';
require_once __DIR__ . '/../../../phpBB/includes/utf/utf_tools.php';
/**
* @slow

2
tests/console/user/activate_test.php
View File

@@ -15,7 +15,7 @@ use Symfony\Component\Console\Application;
use Symfony\Component\Console\Tester\CommandTester;
use phpbb\console\command\user\activate;
require_once dirname(__FILE__) . '/base.php';
require_once __DIR__ . '/base.php';
class phpbb_console_user_activate_test extends phpbb_console_user_base
{

2
tests/console/user/add_test.php
View File

@@ -18,7 +18,7 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Question\Question;
require_once dirname(__FILE__) . '/base.php';
require_once __DIR__ . '/base.php';
class phpbb_console_user_add_test extends phpbb_console_user_base
{

2
tests/console/user/base.php
View File

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

2
tests/console/user/delete_test.php
View File

@@ -15,7 +15,7 @@ use Symfony\Component\Console\Application;
use Symfony\Component\Console\Tester\CommandTester;
use phpbb\console\command\user\delete;
require_once dirname(__FILE__) . '/base.php';
require_once __DIR__ . '/base.php';
class phpbb_console_user_delete_test extends phpbb_console_user_base
{

2
tests/console/user/reclean_test.php
View File

@@ -15,7 +15,7 @@ use Symfony\Component\Console\Application;
use Symfony\Component\Console\Tester\CommandTester;
use phpbb\console\command\user\reclean;
require_once dirname(__FILE__) . '/base.php';
require_once __DIR__ . '/base.php';
class phpbb_console_user_reclean_test extends phpbb_console_user_base
{