makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12620] Fix tests

Browse source 
PHPBB3-12620
This commit is contained in:
Tristan Darricau 2014-11-19 20:54:14 +01:00
parent ac0ff219c6
commit 48950be82b
5 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/config/development/routing/environment.yml
View file

@ -1,2 +1,2 @@
core.default:
resource: "../default/routing.yml"
resource: "../../default/routing/routing.yml"

2
phpBB/config/production/routing/environment.yml
View file

@ -1,2 +1,2 @@
core.default:
resource: "../default/routing.yml"
resource: "../../default/routing/routing.yml"

2
phpBB/config/test/routing/environment.yml
View file

@ -1,2 +1,2 @@
core.default:
resource: "../default/routing.yml"
resource: "../../default/routing/routing.yml"

10
phpBB/includes/functions_install.php
View file

@ -450,15 +450,7 @@ function phpbb_create_config_file_data($data, $dbms, $debug = false, $debug_cont
$config_data .= "\n@define('PHPBB_INSTALLED', true);\n";
$config_data .= "// @define('PHPBB_DISPLAY_LOAD_TIME', true);\n";
if ($debug)
{
$config_data .= "@define('PHPBB_ENVIRONMENT', 'development');\n";
}
else
{
$config_data .= "@define('PHPBB_ENVIRONMENT', 'production');\n";
}
$config_data .= "@define('PHPBB_ENVIRONMENT', 'test');\n";
if ($debug_container)
{

8
phpBB/includes/functions_url_matcher.php
View file

@ -55,7 +55,9 @@ function phpbb_get_url_matcher(\phpbb\extension\manager $manager, RequestContext
*/
function phpbb_create_dumped_url_matcher(\phpbb\extension\manager $manager, $root_path, $config_cache)
{
$provider = new \phpbb\controller\provider($root_path);
global $phpbb_container;
$provider = new \phpbb\controller\provider($phpbb_container->getParameter('core.environment'), $root_path);
$provider->find_routing_files($manager->all_enabled());
$routes = $provider->find()->get_routes();
$dumper = new PhpMatcherDumper($routes);
@ -75,7 +77,9 @@ function phpbb_create_dumped_url_matcher(\phpbb\extension\manager $manager, $roo
*/
function phpbb_create_url_matcher(\phpbb\extension\manager $manager, RequestContext $context, $root_path)
{
$provider = new \phpbb\controller\provider($root_path);
global $phpbb_container;
$provider = new \phpbb\controller\provider($phpbb_container->getParameter('core.environment'), $root_path);
$provider->find_routing_files($manager->all_enabled());
$routes = $provider->find()->get_routes();
return new UrlMatcher($routes, $context);