mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'EXreaction/ticket/11832' into develop

Browse Source 
* EXreaction/ticket/11832:
  [ticket/11832] Correct paths in tests
  [ticket/11832] Correct ROOT_PATH variable
  [ticket/11832] get_url() from phpbb_template_asset should return web path
  [ticket/11832] Fix INCLUDE(JS/CSS)
  [ticket/11832] Fix constructions of phpbb_filesystem
  [ticket/11832] Fix smiley paths
  [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_request
  [ticket/11832] Fix build_url and the S_LOGIN_ACTION
  [ticket/11832] Changing comments to say app.php rather than index.php
  [ticket/11832] We must instantiate the $phpbb_filesystem in common
  [ticket/11832] Fix the web path corrections
  [ticket/11832] More extensive testing
  [ticket/11832] Use dirname(__FILE__)
  [ticket/11832] Use $phpbb_filesystem instead of the container in append_sid
  Revert "[ticket/11832] Make $phpbb_container a global initiated by the framework"
  [ticket/11832] Make $phpbb_container a global initiated by the framework
  [ticket/11832] Fix log tests
  [ticket/11832] update_web_root_path helper and tests
  [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)
This commit is contained in:
Joas Schilling
2013-09-16 21:33:52 +02:00
parent ae6f37d559 cd141883a5
commit 6ba2fb6d62
26 changed files with 557 additions and 161 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,7 +203,13 @@ class phpbb_functional_test_case extends phpbb_test_case
$container,
$db,
$config,
new phpbb_filesystem(),
new phpbb_filesystem(
new phpbb_symfony_request(
new phpbb_mock_request()
),
$phpbb_root_path,
$php_ext
),
self::$config['table_prefix'] . 'ext',
dirname(__FILE__) . '/',
$php_ext,