aboutsummaryrefslogtreecommitdiffstats
path: root/tests/mock
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-09-14 21:18:20 +0200
committerTristan Darricau <github@nicofuma.fr>2014-11-20 16:03:48 +0100
commita5bfc76a73a213a388126d0f697ba64f27a4b00d (patch)
tree2608ef47b98a746c536512ce0b919c27796ffd2c /tests/mock
parent3b1c611566399c1e06bd737ec283b141e3c410f5 (diff)
downloadforums-a5bfc76a73a213a388126d0f697ba64f27a4b00d.tar
forums-a5bfc76a73a213a388126d0f697ba64f27a4b00d.tar.gz
forums-a5bfc76a73a213a388126d0f697ba64f27a4b00d.tar.bz2
forums-a5bfc76a73a213a388126d0f697ba64f27a4b00d.tar.xz
forums-a5bfc76a73a213a388126d0f697ba64f27a4b00d.zip
[ticket/13063] Introduces a new \phpbb\routing\router class
PHPBB3-13063
Diffstat (limited to 'tests/mock')
-rw-r--r--tests/mock/controller_helper.php5
-rw-r--r--tests/mock/router.php27
2 files changed, 29 insertions, 3 deletions
diff --git a/tests/mock/controller_helper.php b/tests/mock/controller_helper.php
index ae3e7bf432..7e4a808906 100644
--- a/tests/mock/controller_helper.php
+++ b/tests/mock/controller_helper.php
@@ -13,7 +13,7 @@
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\request\request_interface $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\routing\router $router, \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;
@@ -23,8 +23,7 @@ class phpbb_mock_controller_helper extends \phpbb\controller\helper
$this->filesystem = $filesystem;
$this->phpbb_root_path = $phpbb_root_path;
$this->php_ext = $php_ext;
- $provider->find_routing_files($manager->get_finder());
- $this->route_collection = $provider->find($phpbb_root_path_ext)->get_routes();
+ $this->router = $router;
}
public function get_current_url()
diff --git a/tests/mock/router.php b/tests/mock/router.php
new file mode 100644
index 0000000000..01faa338c5
--- /dev/null
+++ b/tests/mock/router.php
@@ -0,0 +1,27 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+class phpbb_mock_router extends \phpbb\routing\router
+{
+ public function get_matcher()
+ {
+ $this->create_new_url_matcher();
+ return parent::get_matcher();
+ }
+
+ public function get_generator()
+ {
+ $this->create_new_url_generator();
+ return parent::get_generator();
+ }
+}