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

Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700

Browse Source 
* github-phpbb/develop:
  [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)

Conflicts:
	phpBB/common.php
	phpBB/config/services.yml
	phpBB/includes/bbcode.php
	phpBB/includes/functions.php
	phpBB/includes/functions_messenger.php
	phpBB/install/index.php
	phpBB/phpbb/filesystem.php
	phpBB/phpbb/template/twig/environment.php
	phpBB/phpbb/template/twig/node/includeasset.php
	phpBB/phpbb/template/twig/twig.php
	tests/controller/helper_url_test.php
	tests/dbal/migrator_test.php
	tests/extension/manager_test.php
	tests/extension/metadata_manager_test.php
	tests/filesystem/clean_path_test.php
	tests/mock/extension_manager.php
	tests/template/template_events_test.php
	tests/template/template_test_case.php
	tests/template/template_test_case_with_tree.php
	tests/test_framework/phpbb_functional_test_case.php
This commit is contained in:
Nils Adermann
2013-09-17 16:56:50 +02:00
parent 13ba981fc3 6ba2fb6d62
commit f039a3308a
26 changed files with 558 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/controller/helper_url_test.php
View File

@@ -49,7 +49,14 @@ class phpbb_controller_helper_url_test extends phpbb_test_case
$phpbb_dispatcher = new phpbb_mock_event_dispatcher;
$this->user = $this->getMock('\phpbb\user');
$this->template = new \phpbb\template\twig\twig($phpbb_root_path, $phpEx, $config, $this->user, new \phpbb\template\context());
$phpbb_filesystem = new \phpbb\filesystem(
new \phpbb\symfony\request(
new phpbb_mock_request()
),
$phpbb_root_path,
$phpEx
);
$this->template = new phpbb\template\twig\twig($phpbb_filesystem, $config, $this->user, new \phpbb\template\context());
// We don't use mod_rewrite in these tests
$config = new \phpbb\config\config(array('enable_mod_rewrite' => '0'));
@@ -94,7 +101,14 @@ class phpbb_controller_helper_url_test extends phpbb_test_case
$phpbb_dispatcher = new phpbb_mock_event_dispatcher;
$this->user = $this->getMock('\phpbb\user');
$this->template = new \phpbb\template\twig\twig($phpbb_root_path, $phpEx, $config, $this->user, new \phpbb\template\context());
$phpbb_filesystem = new \phpbb\filesystem(
new \phpbb\symfony\request(
new phpbb_mock_request()
),
$phpbb_root_path,
$phpEx
);
$this->template = new \phpbb\template\twig\twig($phpbb_filesystem, $config, $this->user, new \phpbb\template\context());
$config = new \phpbb\config\config(array('enable_mod_rewrite' => '1'));
$helper = new \phpbb\controller\helper($this->template, $this->user, $config, '', 'php');