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

12
tests/controller/common_helper_route.php
View File

@@ -38,7 +38,7 @@ abstract class phpbb_controller_common_helper_route extends phpbb_database_test_
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__) . '/../fixtures/empty.xml');
return $this->createXMLDataSet(__DIR__ . '/../fixtures/empty.xml');
}
protected function setUp(): void
@@ -46,7 +46,7 @@ abstract class phpbb_controller_common_helper_route extends phpbb_database_test_
global $phpbb_dispatcher, $phpbb_root_path, $phpEx;
$this->extension_manager = new phpbb_mock_extension_manager(
dirname(__FILE__) . '/',
__DIR__ . '/',
array(
'vendor2/foo' => array(
'ext_name' => 'vendor2/foo',
@@ -137,7 +137,7 @@ abstract class phpbb_controller_common_helper_route extends phpbb_database_test_
$twig->setLexer(new \phpbb\template\twig\lexer($twig));
$this->extension_manager = new phpbb_mock_extension_manager(
dirname(__FILE__) . '/',
__DIR__ . '/',
array(
'vendor2/foo' => array(
'ext_name' => 'vendor2/foo',
@@ -148,10 +148,10 @@ abstract class phpbb_controller_common_helper_route extends phpbb_database_test_
);
$loader = new \Symfony\Component\Routing\Loader\YamlFileLoader(
new \phpbb\routing\file_locator(dirname(__FILE__) . '/')
new \phpbb\routing\file_locator(__DIR__ . '/')
);
$resources_locator = new \phpbb\routing\resources_locator\default_resources_locator(dirname(__FILE__) . '/', PHPBB_ENVIRONMENT, $this->extension_manager);
$this->router = new phpbb_mock_router($container, $resources_locator, $loader, 'php', dirname(__FILE__) . '/', true, true);
$resources_locator = new \phpbb\routing\resources_locator\default_resources_locator(__DIR__ . '/', PHPBB_ENVIRONMENT, $this->extension_manager);
$this->router = new phpbb_mock_router($container, $resources_locator, $loader, 'php', __DIR__ . '/', true, true);
$this->auth = new \phpbb\auth\auth();
$this->cache = new \phpbb\cache\driver\dummy();
$this->db = $this->new_dbal();