2 files changed, 68 insertions, 49 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 7cf5611dca..88ce142195 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -5447,52 +5447,3 @@ function phpbb_to_numeric($input)
 {
 	return ($input > PHP_INT_MAX) ? (float) $input : (int) $input;
 }
-
-/**
-* Create and/or return the cached phpbb_url_matcher class
-*
-* If the class already exists, it instantiates it
-*
-* @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 phpbb_url_matcher
-*/
-function phpbb_create_url_matcher(phpbb_extension_finder $finder, RequestContext $context, $root_path, $php_ext)
-{
-	$matcher = phpbb_load_url_matcher($finder, $context, $root_path, $php_ext);
-	if ($matcher === false)
-	{
-		$provider = new phpbb_controller_provider();
-		$dumper = new PhpMatcherDumper($provider->get_paths($finder)->find());
-		$cached_url_matcher_dump = $dumper->dump(array(
-			'class'			=> 'phpbb_url_matcher',
-		));
-
-		file_put_contents($root_path . 'cache/url_matcher' . $php_ext, $cached_url_matcher_dump);
-		return phpbb_load_url_matcher($finder, $context, $root_path, $php_ext);
-	}
-
-	return $matcher;
-}
-
-/**
-* Load the cached phpbb_url_matcher class
-*
-* @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 phpbb_url_matcher|bool False if the file doesn't exist
-*/
-function phpbb_load_url_matcher(phpbb_extension_finder $finder, RequestContext $context, $root_path, $php_ext)
-{
-	if (file_exists($root_path . 'cache/url_matcher' . $php_ext))
-	{
-		include($root_path . 'cache/url_matcher' . $php_ext);
-		return new phpbb_url_matcher($context);
-	}
-
-	return false;
-}
diff --git a/phpBB/includes/functions_url_matcher.php b/phpBB/includes/functions_url_matcher.php
new file mode 100644
index 0000000000..0a6e90703c
--- /dev/null
+++ b/phpBB/includes/functions_url_matcher.php
@@ -0,0 +1,68 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2005 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use Symfony\Component\Routing\Matcher\Dumper\PhpMatcherDumper;
+use Symfony\Component\Routing\RequestContext;
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+/**
+* Create and/or return the cached phpbb_url_matcher class
+*
+* If the class already exists, it instantiates it
+*
+* @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 phpbb_url_matcher
+*/
+function phpbb_create_url_matcher(phpbb_extension_finder $finder, RequestContext $context, $root_path, $php_ext)
+{
+	$matcher = phpbb_load_url_matcher($finder, $context, $root_path, $php_ext);
+	if ($matcher === false)
+	{
+		$provider = new phpbb_controller_provider();
+		$dumper = new PhpMatcherDumper($provider->get_paths($finder)->find());
+		$cached_url_matcher_dump = $dumper->dump(array(
+			'class'			=> 'phpbb_url_matcher',
+		));
+
+		file_put_contents($root_path . 'cache/url_matcher' . $php_ext, $cached_url_matcher_dump);
+		return phpbb_load_url_matcher($finder, $context, $root_path, $php_ext);
+	}
+
+	return $matcher;
+}
+
+/**
+* Load the cached phpbb_url_matcher class
+*
+* @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 phpbb_url_matcher|bool False if the file doesn't exist
+*/
+function phpbb_load_url_matcher(phpbb_extension_finder $finder, RequestContext $context, $root_path, $php_ext)
+{
+	if (file_exists($root_path . 'cache/url_matcher' . $php_ext))
+	{
+		include($root_path . 'cache/url_matcher' . $php_ext);
+		return new phpbb_url_matcher($context);
+	}
+
+	return false;
+}