mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-12 03:34:04 +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

2
tests/template/extension_test.php
View File

@@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/template_test_case.php';
require_once __DIR__ . '/template_test_case.php';
class phpbb_template_extension_test extends phpbb_template_template_test_case
{

4
tests/template/includephp_test.php
View File

@@ -13,7 +13,7 @@
use phpbb\filesystem\helper as filesystem_helper;
require_once dirname(__FILE__) . '/template_test_case.php';
require_once __DIR__ . '/template_test_case.php';
class phpbb_template_includephp_test extends phpbb_template_template_test_case
{
@@ -41,7 +41,7 @@ class phpbb_template_includephp_test extends phpbb_template_template_test_case
{
global $phpbb_root_path;
$path_to_php = str_replace('\\', '/', dirname(__FILE__)) . '/templates/_dummy_include.php.inc';
$path_to_php = str_replace('\\', '/', __DIR__) . '/templates/_dummy_include.php.inc';
$this->assertTrue(filesystem_helper::is_absolute_path($path_to_php));
$template_text = "Path is absolute.\n<!-- INCLUDEPHP $path_to_php -->";

2
tests/template/subdir/includephp_from_subdir_test.php
View File

@@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/../template_test_case.php';
require_once __DIR__ . '/../template_test_case.php';
class phpbb_template_subdir_includephp_from_subdir_test extends phpbb_template_template_test_case
{

4
tests/template/template_allfolder_test.php
View File

@@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/template_test_case.php';
require_once __DIR__ . '/template_test_case.php';
class phpbb_template_allfolder_test extends phpbb_template_template_test_case
{
@@ -45,7 +45,7 @@ class phpbb_template_allfolder_test extends phpbb_template_template_test_case
);
$this->extension_manager = new phpbb_mock_extension_manager(
dirname(__FILE__) . '/',
__DIR__ . '/',
array(
'vendor4/bar' => array(
'ext_name' => 'vendor4/bar',

6
tests/template/template_events_test.php
View File

@@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/template_test_case.php';
require_once __DIR__ . '/template_test_case.php';
class phpbb_template_template_events_test extends phpbb_template_template_test_case
{
@@ -134,9 +134,9 @@ Zeta test event in all',
$defaults = $this->config_defaults();
$config = new \phpbb\config\config(array_merge($defaults, $new_config));
$this->template_path = dirname(__FILE__) . "/datasets/$dataset/styles/silver/template";
$this->template_path = __DIR__ . "/datasets/$dataset/styles/silver/template";
$this->extension_manager = new phpbb_mock_filesystem_extension_manager(
dirname(__FILE__) . "/datasets/$dataset/"
__DIR__ . "/datasets/$dataset/"
);
$filesystem = new \phpbb\filesystem\filesystem();

4
tests/template/template_includecss_test.php
View File

@@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/template_test_case_with_tree.php';
require_once __DIR__ . '/template_test_case_with_tree.php';
class phpbb_template_template_includecss_test extends phpbb_template_template_test_case_with_tree
{
@@ -68,7 +68,7 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te
$this->user,
array(new \phpbb\template\twig\extension($context, $twig, $this->user)),
new phpbb_mock_extension_manager(
dirname(__FILE__) . '/',
__DIR__ . '/',
array(
'include/css' => array(
'ext_name' => 'include/css',

2
tests/template/template_includejs_test.php
View File

@@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/template_test_case_with_tree.php';
require_once __DIR__ . '/template_test_case_with_tree.php';
class phpbb_template_template_includejs_test extends phpbb_template_template_test_case_with_tree
{

2
tests/template/template_inheritance_test.php
View File

@@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/template_test_case_with_tree.php';
require_once __DIR__ . '/template_test_case_with_tree.php';
class phpbb_template_template_inheritance_test extends phpbb_template_template_test_case_with_tree
{

2
tests/template/template_parser_test.php
View File

@@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/template_test_case.php';
require_once __DIR__ . '/template_test_case.php';
class phpbb_template_template_parser_test extends phpbb_template_template_test_case
{

2
tests/template/template_test.php
View File

@@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/template_test_case.php';
require_once __DIR__ . '/template_test_case.php';
class phpbb_template_template_test extends phpbb_template_template_test_case
{

2
tests/template/template_test_case_with_tree.php
View File

@@ -11,7 +11,7 @@
*
*/
require_once dirname(__FILE__) . '/template_test_case.php';
require_once __DIR__ . '/template_test_case.php';
class phpbb_template_template_test_case_with_tree extends phpbb_template_template_test_case
{