5 files changed, 40 insertions, 42 deletions
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 90a2f3b187..fdd8a33135 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -95,6 +95,7 @@ services:
             - @user
             - @config
             - @controller.provider
+            - @ext.manager
             - %core.root_path%
             - %core.php_ext%
 
@@ -107,8 +108,6 @@ services:
 
     controller.provider:
         class: phpbb\controller\provider
-        arguments:
-            - @ext.finder
         calls:
             - [find, [%core.root_path%]]
 
@@ -175,16 +174,6 @@ services:
             - %core.php_ext%
             - @cache.driver
 
-    ext.finder:
-        class: phpbb\extension\finder
-        arguments:
-            - @ext.manager
-            - @filesystem
-            - %core.root_path%
-            - @cache.driver
-            - %core.php_ext%
-            - _ext_finder
-
     filesystem:
         class: phpbb\filesystem
 
@@ -217,7 +206,7 @@ services:
     kernel_request_subscriber:
         class: phpbb\event\kernel_request_subscriber
         arguments:
-            - @ext.finder
+            - @ext.manager
             - %core.root_path%
             - %core.php_ext%
         tags:
diff --git a/phpBB/includes/functions_url_matcher.php b/phpBB/includes/functions_url_matcher.php
index 8e5ae20f93..bc91a38012 100644
--- a/phpBB/includes/functions_url_matcher.php
+++ b/phpBB/includes/functions_url_matcher.php
@@ -22,22 +22,22 @@ 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\manager $manager Extension manager
 * @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\manager $manager, RequestContext $context, $root_path, $php_ext)
 {
 	if (defined('DEBUG'))
 	{
-		return phpbb_create_url_matcher($finder, $context, $root_path);
+		return phpbb_create_url_matcher($manager, $context, $root_path);
 	}
 
 	if (!phpbb_url_matcher_dumped($root_path, $php_ext))
 	{
-		phpbb_create_dumped_url_matcher($finder, $root_path, $php_ext);
+		phpbb_create_dumped_url_matcher($manager, $root_path, $php_ext);
 	}
 
 	return phpbb_load_url_matcher($context, $root_path, $php_ext);
@@ -46,14 +46,15 @@ function phpbb_get_url_matcher(\phpbb\extension\finder $finder, RequestContext $
 /**
 * Create a new UrlMatcher class and dump it into the cache file
 *
-* @param \phpbb\extension\finder $finder Extension finder
+* @param \phpbb\extension\manager $manager Extension manager
 * @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\manager $manager, $root_path, $php_ext)
 {
-	$provider = new \phpbb\controller\provider($finder);
+	$provider = new \phpbb\controller\provider();
+	$provider->set_ext_finder($manager->get_finder());
 	$routes = $provider->find($root_path)->get_routes();
 	$dumper = new PhpMatcherDumper($routes);
 	$cached_url_matcher_dump = $dumper->dump(array(
@@ -66,13 +67,14 @@ function phpbb_create_dumped_url_matcher(\phpbb\extension\finder $finder, $root_
 /**
 * Create a non-cached UrlMatcher
 *
-* @param \phpbb\extension\finder $finder Extension finder
+* @param \phpbb\extension\manager $manager Extension manager
 * @param RequestContext $context Symfony RequestContext object
 * @return UrlMatcher
 */
-function phpbb_create_url_matcher(\phpbb\extension\finder $finder, RequestContext $context, $root_path)
+function phpbb_create_url_matcher(\phpbb\extension\manager $manager, RequestContext $context, $root_path)
 {
-	$provider = new \phpbb\controller\provider($finder);
+	$provider = new \phpbb\controller\provider();
+	$provider->set_ext_finder($manager->get_finder());
 	$routes = $provider->find($root_path)->get_routes();
 	return new UrlMatcher($routes, $context);
 }
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php
index 54c30c93fc..9f9f45d730 100644
--- a/phpBB/phpbb/controller/helper.php
+++ b/phpBB/phpbb/controller/helper.php
@@ -56,16 +56,18 @@ class helper
 	* @param \phpbb\user $user User object
 	* @param \phpbb\config\config $config Config object
 	* @param \phpbb\controller\provider $provider Path provider
+	* @param \phpbb\extension\manager $manager Extension manager object
 	* @param string $phpbb_root_path phpBB root path
 	* @param string $php_ext PHP extension
 	*/
-	public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\config\config $config, \phpbb\controller\provider $provider, $phpbb_root_path, $php_ext)
+	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)
 	{
 		$this->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->get_routes();
 	}
 
diff --git a/phpBB/phpbb/controller/provider.php b/phpBB/phpbb/controller/provider.php
index 2c7493f64c..7e33db1f74 100644
--- a/phpBB/phpbb/controller/provider.php
+++ b/phpBB/phpbb/controller/provider.php
@@ -37,20 +37,24 @@ class provider
 	* @param array() $routing_files Array of strings containing paths
 	*							to YAML files holding route information
 	*/
-	public function __construct(\phpbb\extension\finder $finder = null, $routing_files = array())
+	public function __construct($routing_files = array())
 	{
 		$this->routing_files = $routing_files;
+	}
 
-		if ($finder)
-		{
-			// We hardcode the path to the core config directory
-			// because the finder cannot find it
-			$this->routing_files = array_merge($this->routing_files, array('config/routing.yml'), array_keys($finder
-					->directory('/config')
-					->suffix('routing.yml')
-					->find()
-			));
-		}
+	/**
+	* @param \phpbb\extension\finder $finder
+	* @return null
+	*/
+	public function set_ext_finder(\phpbb\extension\finder $finder)
+	{
+		// We hardcode the path to the core config directory
+		// because the finder cannot find it
+		$this->routing_files = array_merge($this->routing_files, array('config/routing.yml'), array_keys($finder
+				->directory('config')
+				->suffix('routing.yml')
+				->find()
+		));
 	}
 
 	/**
diff --git a/phpBB/phpbb/event/kernel_request_subscriber.php b/phpBB/phpbb/event/kernel_request_subscriber.php
index 7d5418498b..a39d622273 100644
--- a/phpBB/phpbb/event/kernel_request_subscriber.php
+++ b/phpBB/phpbb/event/kernel_request_subscriber.php
@@ -18,10 +18,10 @@ use Symfony\Component\Routing\RequestContext;
 class kernel_request_subscriber implements EventSubscriberInterface
 {
 	/**
-	* Extension finder object
-	* @var \phpbb\extension\finder
+	* Extension manager object
+	* @var \phpbb\extension\manager
 	*/
-	protected $finder;
+	protected $manager;
 
 	/**
 	* PHP extension
@@ -38,15 +38,15 @@ class kernel_request_subscriber implements EventSubscriberInterface
 	/**
 	* Construct method
 	*
-	* @param \phpbb\extension\finder $finder Extension finder object
+	* @param \phpbb\extension\manager $manager Extension manager object
 	* @param string $root_path Root path
 	* @param string $php_ext PHP extension
 	*/
-	public function __construct(\phpbb\extension\finder $finder, $root_path, $php_ext)
+	public function __construct(\phpbb\extension\manager $manager, $root_path, $php_ext)
 	{
-		$this->finder = $finder;
 		$this->root_path = $root_path;
 		$this->php_ext = $php_ext;
+		$this->manager = $manager;
 	}
 
 	/**
@@ -55,6 +55,7 @@ class kernel_request_subscriber implements EventSubscriberInterface
 	* This is responsible for setting up the routing information
 	*
 	* @param GetResponseEvent $event
+	* @throws \BadMethodCallException
 	* @return null
 	*/
 	public function on_kernel_request(GetResponseEvent $event)
@@ -63,7 +64,7 @@ class kernel_request_subscriber implements EventSubscriberInterface
 		$context = new RequestContext();
 		$context->fromRequest($request);
 
-		$matcher = phpbb_get_url_matcher($this->finder, $context, $this->root_path, $this->php_ext);
+		$matcher = phpbb_get_url_matcher($this->manager, $context, $this->root_path, $this->php_ext);
 		$router_listener = new RouterListener($matcher, $context);
 		$router_listener->onKernelRequest($event);
 	}