Skip to content

Commit 14e8113

Browse files
committed
[ticket/14576] Move common required files to bootstrap
PHPBB3-14576
1 parent c9ffef2 commit 14e8113

141 files changed

Lines changed: 10 additions & 289 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

tests/attachment/upload_test.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
*
1212
*/
1313

14-
require_once(dirname(__FILE__) . '/../../phpBB/includes/functions.php');
1514
require_once(dirname(__FILE__) . '/../../phpBB/includes/functions_posting.php');
1615

1716
class phpbb_attachment_upload_test extends \phpbb_database_test_case

tests/auth/provider_apache_test.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
*
1212
*/
1313

14-
require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
15-
require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
16-
1714
class phpbb_auth_provider_apache_test extends phpbb_database_test_case
1815
{
1916
protected $provider;

tests/auth/provider_db_test.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
*
1212
*/
1313

14-
require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
15-
require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
16-
1714
class phpbb_auth_provider_db_test extends phpbb_database_test_case
1815
{
1916
public function getDataSet()

tests/bbcode/parser_test.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
*
1212
*/
1313

14-
require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
15-
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
1614
require_once dirname(__FILE__) . '/../../phpBB/includes/bbcode.php';
1715
require_once dirname(__FILE__) . '/../../phpBB/includes/message_parser.php';
1816

tests/bbcode/url_bbcode_test.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
*
1212
*/
1313

14-
require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
15-
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
1614
require_once dirname(__FILE__) . '/../../phpBB/includes/bbcode.php';
1715
require_once dirname(__FILE__) . '/../../phpBB/includes/message_parser.php';
1816

tests/bootstrap.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
$table_prefix = 'phpbb_';
2424
require_once $phpbb_root_path . 'includes/constants.php';
2525
require_once $phpbb_root_path . 'phpbb/class_loader.' . $phpEx;
26-
require_once($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx);
26+
require_once $phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx;
27+
require_once $phpbb_root_path . 'includes/functions.' . $phpEx;
28+
require_once $phpbb_root_path . 'includes/functions_content.' . $phpEx;
29+
require_once $phpbb_root_path . 'includes/functions_compatibility.' . $phpEx;
2730

2831
$phpbb_class_loader_mock = new \phpbb\class_loader('phpbb_mock_', $phpbb_root_path . '../tests/mock/', "php");
2932
$phpbb_class_loader_mock->register();

tests/captcha/qa_test.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
*
1212
*/
1313

14-
require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
15-
1614
class phpbb_captcha_qa_test extends \phpbb_database_test_case
1715
{
1816
protected $request;

tests/compress/compress_test.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
*
1212
*/
1313

14-
require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
1514
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_admin.php';
1615
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_compress.php';
1716

tests/console/cron/run_test.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use phpbb\console\command\cron\run;
1717

1818
require_once dirname(__FILE__) . '/tasks/simple.php';
19-
require_once dirname(__FILE__) . '/../../../phpBB/includes/functions.php';
2019

2120
class phpbb_console_command_cron_run_test extends phpbb_database_test_case
2221
{

tests/console/thumbnail_test.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
*
1212
*/
1313

14-
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_compatibility.php';
15-
require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
16-
1714
use Symfony\Component\Console\Application;
1815
use Symfony\Component\Console\Tester\CommandTester;
1916
use phpbb\console\command\thumbnail\generate;

0 commit comments

Comments
 (0)