mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 16:27:38 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords

Browse Source 
Conflicts:
	phpBB/includes/functions.php
This commit is contained in:
Marc Alexander
2013-10-03 10:04:59 +02:00
parent 93531e7fb0 49ce2c13b2
commit 7006db7a2d
38 changed files with 388 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/test_framework/phpbb_functional_test_case.php
View File

@@ -203,13 +203,7 @@ class phpbb_functional_test_case extends phpbb_test_case
$container,
$db,
$config,
new phpbb\filesystem(
new phpbb\symfony_request(
new phpbb_mock_request()
),
$phpbb_root_path,
$php_ext
),
new phpbb\filesystem(),
self::$config['table_prefix'] . 'ext',
dirname(__FILE__) . '/',
$php_ext,