From 8d9133a30e576d9f4315bc914b56c7be5481ebf4 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Sat, 3 May 2014 14:00:47 +0200 Subject: [ticket/11497] Use a mock object to define the root folder for the finder PHPBB3-11497 --- tests/mock/controller_helper.php | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 tests/mock/controller_helper.php (limited to 'tests/mock/controller_helper.php') diff --git a/tests/mock/controller_helper.php b/tests/mock/controller_helper.php new file mode 100644 index 0000000000..c53d7265c4 --- /dev/null +++ b/tests/mock/controller_helper.php @@ -0,0 +1,22 @@ +template = $template; + $this->user = $user; + $this->config = $config; + $this->phpbb_root_path = $phpbb_root_path; + $this->php_ext = $php_ext; + $provider->set_ext_finder($manager->get_finder()); + $this->route_collection = $provider->find($phpbb_root_path_ext)->get_routes(); + } +} -- cgit v1.2.1 From 78e1d119f5b1f92da8ffe068d947035b6f5305ea Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Sat, 3 May 2014 19:16:40 +0200 Subject: [ticket/11497] Change the date in the package declaration PHPBB3-11497 --- tests/mock/controller_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/mock/controller_helper.php') diff --git a/tests/mock/controller_helper.php b/tests/mock/controller_helper.php index c53d7265c4..d46d89b367 100644 --- a/tests/mock/controller_helper.php +++ b/tests/mock/controller_helper.php @@ -2,7 +2,7 @@ /** * * @package testing -* @copyright (c) 2011 phpBB Group +* @copyright (c) 2014 phpBB Group * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2 * */ -- cgit v1.2.1 From 346c6f39980fe060b57549a8364f2e5dece1eb83 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Mon, 5 May 2014 18:20:14 +0200 Subject: [ticket/11497] Rename set_ext_finder in find_routing_files PHPBB3-11497 --- tests/mock/controller_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/mock/controller_helper.php') diff --git a/tests/mock/controller_helper.php b/tests/mock/controller_helper.php index d46d89b367..01ac6494d0 100644 --- a/tests/mock/controller_helper.php +++ b/tests/mock/controller_helper.php @@ -16,7 +16,7 @@ class phpbb_mock_controller_helper extends \phpbb\controller\helper $this->config = $config; $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; - $provider->set_ext_finder($manager->get_finder()); + $provider->find_routing_files($manager->get_finder()); $this->route_collection = $provider->find($phpbb_root_path_ext)->get_routes(); } } -- cgit v1.2.1 From a759704b39fc1c1353f865a633759b1369589b67 Mon Sep 17 00:00:00 2001 From: Yuriy Rusko Date: Tue, 27 May 2014 20:18:06 +0200 Subject: [ticket/12594] Remove @package tags and update file headers PHPBB3-12594 --- tests/mock/controller_helper.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'tests/mock/controller_helper.php') diff --git a/tests/mock/controller_helper.php b/tests/mock/controller_helper.php index 01ac6494d0..9f70f8e96c 100644 --- a/tests/mock/controller_helper.php +++ b/tests/mock/controller_helper.php @@ -1,9 +1,13 @@ +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. * */ -- cgit v1.2.1 From b4d7192b62c98b0738711a7b7647a47129adb902 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Tue, 8 Jul 2014 00:20:33 +0200 Subject: [ticket/12787] Updates phpbb_mock_controller_helper PHPBB3-12787 --- tests/mock/controller_helper.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tests/mock/controller_helper.php') diff --git a/tests/mock/controller_helper.php b/tests/mock/controller_helper.php index 9f70f8e96c..f9d231258e 100644 --- a/tests/mock/controller_helper.php +++ b/tests/mock/controller_helper.php @@ -23,4 +23,9 @@ class phpbb_mock_controller_helper extends \phpbb\controller\helper $provider->find_routing_files($manager->get_finder()); $this->route_collection = $provider->find($phpbb_root_path_ext)->get_routes(); } + + public function get_current_url() + { + return ''; + } } -- cgit v1.2.1 From cb3eb84665db10e6fe55e11e694d39e742f313a4 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Thu, 4 Sep 2014 16:45:53 +0200 Subject: [ticket/13034] Fix the route generated for the frontend not in the phpbb root PHPBB3-13034 --- tests/mock/controller_helper.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests/mock/controller_helper.php') diff --git a/tests/mock/controller_helper.php b/tests/mock/controller_helper.php index f9d231258e..fd49f4bdc8 100644 --- a/tests/mock/controller_helper.php +++ b/tests/mock/controller_helper.php @@ -13,11 +13,12 @@ class phpbb_mock_controller_helper extends \phpbb\controller\helper { - public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\config\config $config, \phpbb\controller\provider $provider, \phpbb\extension\manager $manager, $phpbb_root_path, $php_ext, $phpbb_root_path_ext) + public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\config\config $config, \phpbb\controller\provider $provider, \phpbb\extension\manager $manager, \phpbb\symfony_request $symfony_request, $phpbb_root_path, $php_ext, $phpbb_root_path_ext) { $this->template = $template; $this->user = $user; $this->config = $config; + $this->symfony_request = $symfony_request; $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; $provider->find_routing_files($manager->get_finder()); -- cgit v1.2.1 From f4260e261ff03cbe1467f4c9400310bacf72ffff Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Tue, 16 Sep 2014 01:25:36 +0200 Subject: [ticket/13034] Fix tests PHPBB3-13034 --- tests/mock/controller_helper.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests/mock/controller_helper.php') diff --git a/tests/mock/controller_helper.php b/tests/mock/controller_helper.php index fd49f4bdc8..9c13c309f2 100644 --- a/tests/mock/controller_helper.php +++ b/tests/mock/controller_helper.php @@ -13,12 +13,13 @@ class phpbb_mock_controller_helper extends \phpbb\controller\helper { - public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\config\config $config, \phpbb\controller\provider $provider, \phpbb\extension\manager $manager, \phpbb\symfony_request $symfony_request, $phpbb_root_path, $php_ext, $phpbb_root_path_ext) + public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\config\config $config, \phpbb\controller\provider $provider, \phpbb\extension\manager $manager, \phpbb\symfony_request $symfony_request, \phpbb\filesystem $filesystem, $phpbb_root_path, $php_ext, $phpbb_root_path_ext) { $this->template = $template; $this->user = $user; $this->config = $config; $this->symfony_request = $symfony_request; + $this->filesystem = $filesystem; $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; $provider->find_routing_files($manager->get_finder()); -- cgit v1.2.1 From 0dfe1d0d8b007ec7b7cae0715cfb2e5f4e33bad4 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Wed, 12 Nov 2014 11:44:56 +0100 Subject: [ticket/13280] Output escaping for the symfony request object PHPBB3-13280 --- tests/mock/controller_helper.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests/mock/controller_helper.php') diff --git a/tests/mock/controller_helper.php b/tests/mock/controller_helper.php index 9c13c309f2..ae3e7bf432 100644 --- a/tests/mock/controller_helper.php +++ b/tests/mock/controller_helper.php @@ -13,12 +13,13 @@ class phpbb_mock_controller_helper extends \phpbb\controller\helper { - public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\config\config $config, \phpbb\controller\provider $provider, \phpbb\extension\manager $manager, \phpbb\symfony_request $symfony_request, \phpbb\filesystem $filesystem, $phpbb_root_path, $php_ext, $phpbb_root_path_ext) + public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\config\config $config, \phpbb\controller\provider $provider, \phpbb\extension\manager $manager, \phpbb\symfony_request $symfony_request, \phpbb\request\request_interface $request, \phpbb\filesystem $filesystem, $phpbb_root_path, $php_ext, $phpbb_root_path_ext) { $this->template = $template; $this->user = $user; $this->config = $config; $this->symfony_request = $symfony_request; + $this->request = $request; $this->filesystem = $filesystem; $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; -- cgit v1.2.1