diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-09-27 10:47:10 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-09-27 10:47:10 +0200 |
| commit | 663b4b2eb74e8edb076c962662ff5124e94353ea (patch) | |
| tree | 0ff449c776397b2b66fc7d567f93bbb7d62ea2e3 /phpBB/includes/functions_url_matcher.php | |
| parent | 01512104b5823d15eed64d362b41b9594f870f0c (diff) | |
| parent | 8db820be634cfce0fdb079fdbaee2c49661a7870 (diff) | |
| download | forums-663b4b2eb74e8edb076c962662ff5124e94353ea.tar forums-663b4b2eb74e8edb076c962662ff5124e94353ea.tar.gz forums-663b4b2eb74e8edb076c962662ff5124e94353ea.tar.bz2 forums-663b4b2eb74e8edb076c962662ff5124e94353ea.tar.xz forums-663b4b2eb74e8edb076c962662ff5124e94353ea.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwords
Conflicts:
phpBB/develop/create_schema_files.php
Diffstat (limited to 'phpBB/includes/functions_url_matcher.php')
| -rw-r--r-- | phpBB/includes/functions_url_matcher.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/includes/functions_url_matcher.php b/phpBB/includes/functions_url_matcher.php index a89ab7b126..fdde302e3b 100644 --- a/phpBB/includes/functions_url_matcher.php +++ b/phpBB/includes/functions_url_matcher.php @@ -22,13 +22,13 @@ if (!defined('IN_PHPBB')) /** * Create a new UrlMatcher class and dump it into the cache file * -* @param phpbb_extension_finder $finder Extension finder +* @param \phpbb\extension\finder $finder Extension finder * @param RequestContext $context Symfony RequestContext object * @param string $root_path Root path * @param string $php_ext PHP extension * @return null */ -function phpbb_get_url_matcher(phpbb_extension_finder $finder, RequestContext $context, $root_path, $php_ext) +function phpbb_get_url_matcher(\phpbb\extension\finder $finder, RequestContext $context, $root_path, $php_ext) { if (defined('DEBUG')) { @@ -46,14 +46,14 @@ function phpbb_get_url_matcher(phpbb_extension_finder $finder, RequestContext $c /** * Create a new UrlMatcher class and dump it into the cache file * -* @param phpbb_extension_finder $finder Extension finder +* @param \phpbb\extension\finder $finder Extension finder * @param string $root_path Root path * @param string $php_ext PHP extension * @return null */ -function phpbb_create_dumped_url_matcher(phpbb_extension_finder $finder, $root_path, $php_ext) +function phpbb_create_dumped_url_matcher(\phpbb\extension\finder $finder, $root_path, $php_ext) { - $provider = new phpbb_controller_provider(); + $provider = new \phpbb\controller\provider(); $routes = $provider->import_paths_from_finder($finder)->find(); $dumper = new PhpMatcherDumper($routes); $cached_url_matcher_dump = $dumper->dump(array( @@ -66,13 +66,13 @@ function phpbb_create_dumped_url_matcher(phpbb_extension_finder $finder, $root_p /** * Create a non-cached UrlMatcher * -* @param phpbb_extension_finder $finder Extension finder +* @param \phpbb\extension\finder $finder Extension finder * @param RequestContext $context Symfony RequestContext object * @return UrlMatcher */ -function phpbb_create_url_matcher(phpbb_extension_finder $finder, RequestContext $context) +function phpbb_create_url_matcher(\phpbb\extension\finder $finder, RequestContext $context) { - $provider = new phpbb_controller_provider(); + $provider = new \phpbb\controller\provider(); $routes = $provider->import_paths_from_finder($finder)->find(); return new UrlMatcher($routes, $context); } |