[ticket/13063] Introduces a new \phpbb\routing\router class

PHPBB3-13063
author: Tristan Darricau <github@nicofuma.fr> 2014-09-14 21:18:20 +0200
committer: Tristan Darricau <github@nicofuma.fr> 2014-11-20 16:03:48 +0100
commit: a5bfc76a73a213a388126d0f697ba64f27a4b00d (patch)
tree: 2608ef47b98a746c536512ce0b919c27796ffd2c
parent: 3b1c611566399c1e06bd737ec283b141e3c410f5 (diff)
download: forums-a5bfc76a73a213a388126d0f697ba64f27a4b00d.tar
forums-a5bfc76a73a213a388126d0f697ba64f27a4b00d.tar.gz
forums-a5bfc76a73a213a388126d0f697ba64f27a4b00d.tar.bz2
forums-a5bfc76a73a213a388126d0f697ba64f27a4b00d.tar.xz
forums-a5bfc76a73a213a388126d0f697ba64f27a4b00d.zip
11 files changed, 379 insertions, 209 deletions
diff --git a/phpBB/config/services.yml b/phpBB/config/services.yml
index 6be694a14c..de4744cd45 100644
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -73,7 +73,7 @@ services:
             - @template
             - @user
             - @config
-            - @controller.provider
+            - @router
             - @ext.manager
             - @symfony_request
             - @request
@@ -89,11 +89,6 @@ services:
             - %core.root_path%
             - @template
 
-    controller.provider:
-        class: phpbb\controller\provider
-        calls:
-            - [find, [%core.root_path%]]
-
     ext.manager:
         class: phpbb\extension\manager
         arguments:
@@ -157,6 +152,20 @@ services:
             - null
             - %core.disable_super_globals%
 
+    router:
+        class: phpbb\routing\router
+        arguments:
+            - @ext.manager
+            - %core.root_path%
+            - %core.php_ext%
+
+    router.listener:
+        class: Symfony\Component\HttpKernel\EventListener\RouterListener
+        arguments:
+            - @router
+        tags:
+            - { name: kernel.event_subscriber }
+
     # WARNING: The Symfony request does not escape the input and should be used very carefully
     #           prefer the phpbb request (service @request) as possible
     symfony_request:
diff --git a/phpBB/phpbb/cache/driver/base.php b/phpBB/phpbb/cache/driver/base.php
index b357431589..c83b928a12 100644
--- a/phpBB/phpbb/cache/driver/base.php
+++ b/phpBB/phpbb/cache/driver/base.php
@@ -50,6 +50,7 @@ abstract class base implements \phpbb\cache\driver\driver_interface
 			}
 			else if (strpos($filename, 'container_') === 0 ||
 				strpos($filename, 'url_matcher') === 0 ||
+				strpos($filename, 'url_generator') === 0 ||
 				strpos($filename, 'sql_') === 0 ||
 				strpos($filename, 'data_') === 0)
 			{
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php
index 52e6947c2c..f4535af711 100644
--- a/phpBB/phpbb/controller/helper.php
+++ b/phpBB/phpbb/controller/helper.php
@@ -14,7 +14,6 @@
 namespace phpbb\controller;
 
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Generator\UrlGenerator;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Component\Routing\RequestContext;
 
@@ -41,6 +40,11 @@ class helper
 	*/
 	protected $config;
 
+	/**
+	* @var \phpbb\routing\router phpBB router
+	*/
+	protected $router;
+
 	/* @var \phpbb\symfony_request */
 	protected $symfony_request;
 
@@ -70,7 +74,7 @@ class helper
 	* @param \phpbb\template\template $template Template object
 	* @param \phpbb\user $user User object
 	* @param \phpbb\config\config $config Config object
-	* @param \phpbb\controller\provider $provider Path provider
+	* @param \phpbb\routing\router $router phpBB router
 	* @param \phpbb\extension\manager $manager Extension manager object
 	* @param \phpbb\symfony_request $symfony_request Symfony Request object
 	* @param \phpbb\request\request_interface $request phpBB request object
@@ -78,18 +82,17 @@ class helper
 	* @param string $phpbb_root_path phpBB root path
 	* @param string $php_ext PHP file extension
 	*/
-	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)
+	public function __construct(\phpbb\template\template $template, \phpbb\user $user, \phpbb\config\config $config, \phpbb\routing\router $router, \phpbb\extension\manager $manager, \phpbb\symfony_request $symfony_request, \phpbb\request\request_interface $request, \phpbb\filesystem $filesystem, $phpbb_root_path, $php_ext)
 	{
 		$this->template = $template;
 		$this->user = $user;
 		$this->config = $config;
+		$this->router = $router;
 		$this->symfony_request = $symfony_request;
 		$this->request = $request;
 		$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)->get_routes();
 	}
 
 	/**
@@ -162,8 +165,8 @@ class helper
 
 		$context->setBaseUrl($base_url);
 
-		$url_generator = new UrlGenerator($this->route_collection, $context);
-		$route_url = $url_generator->generate($route, $params, $reference_type);
+		$this->router->setContext($context);
+		$route_url = $this->router->generate($route, $params, $reference_type);
 
 		if ($is_amp)
 		{
diff --git a/phpBB/phpbb/controller/provider.php b/phpBB/phpbb/controller/provider.php
deleted file mode 100644
index 7e26848290..0000000000
--- a/phpBB/phpbb/controller/provider.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?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.
-*
-*/
-
-namespace phpbb\controller;
-
-use Symfony\Component\Routing\RouteCollection;
-use Symfony\Component\Routing\Loader\YamlFileLoader;
-use Symfony\Component\Config\FileLocator;
-
-/**
-* Controller interface
-*/
-class provider
-{
-	/**
-	* YAML file(s) containing route information
-	* @var array
-	*/
-	protected $routing_files;
-
-	/**
-	* Collection of the routes in phpBB and all found extensions
-	* @var RouteCollection
-	*/
-	protected $routes;
-
-	/**
-	* Construct method
-	*
-	* @param array $routing_files Array of strings containing paths
-	*							to YAML files holding route information
-	*/
-	public function __construct($routing_files = array())
-	{
-		$this->routing_files = $routing_files;
-	}
-
-	/**
-	* Find the list of routing files
-	*
-	* @param \phpbb\finder $finder
-	* @return null
-	*/
-	public function find_routing_files(\phpbb\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()
-		));
-	}
-
-	/**
-	* Find a list of controllers
-	*
-	* @param string $base_path Base path to prepend to file paths
-	* @return provider
-	*/
-	public function find($base_path = '')
-	{
-		$this->routes = new RouteCollection;
-		foreach ($this->routing_files as $file_path)
-		{
-			$loader = new YamlFileLoader(new FileLocator(phpbb_realpath($base_path)));
-			$this->routes->addCollection($loader->load($file_path));
-		}
-
-		return $this;
-	}
-
-	/**
-	* Get the list of routes
-	*
-	* @return RouteCollection Get the route collection
-	*/
-	public function get_routes()
-	{
-		return $this->routes;
-	}
-}
diff --git a/phpBB/phpbb/event/kernel_request_subscriber.php b/phpBB/phpbb/event/kernel_request_subscriber.php
deleted file mode 100644
index ee9f29a59d..0000000000
--- a/phpBB/phpbb/event/kernel_request_subscriber.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?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.
-*
-*/
-
-namespace phpbb\event;
-
-use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\KernelEvents;
-use Symfony\Component\HttpKernel\Event\GetResponseEvent;
-use Symfony\Component\HttpKernel\EventListener\RouterListener;
-use Symfony\Component\Routing\RequestContext;
-
-class kernel_request_subscriber implements EventSubscriberInterface
-{
-	/**
-	* Extension manager object
-	* @var \phpbb\extension\manager
-	*/
-	protected $manager;
-
-	/**
-	* PHP file extension
-	* @var string
-	*/
-	protected $php_ext;
-
-	/**
-	* Root path
-	* @var string
-	*/
-	protected $root_path;
-
-	/**
-	* Construct method
-	*
-	* @param \phpbb\extension\manager $manager Extension manager object
-	* @param string $root_path Root path
-	* @param string $php_ext PHP file extension
-	*/
-	public function __construct(\phpbb\extension\manager $manager, $root_path, $php_ext)
-	{
-		$this->root_path = $root_path;
-		$this->php_ext = $php_ext;
-		$this->manager = $manager;
-	}
-
-	/**
-	* This listener is run when the KernelEvents::REQUEST event is triggered
-	*
-	* This is responsible for setting up the routing information
-	*
-	* @param GetResponseEvent $event
-	* @throws \BadMethodCallException
-	* @return null
-	*/
-	public function on_kernel_request(GetResponseEvent $event)
-	{
-		$request = $event->getRequest();
-		$context = new RequestContext();
-		$context->fromRequest($request);
-
-		$matcher = phpbb_get_url_matcher($this->manager, $context, $this->root_path, $this->php_ext);
-		$router_listener = new RouterListener($matcher, $context);
-		$router_listener->onKernelRequest($event);
-	}
-
-	public static function getSubscribedEvents()
-	{
-		return array(
-			KernelEvents::REQUEST		=> 'on_kernel_request',
-		);
-	}
-}
diff --git a/phpBB/phpbb/routing/router.php b/phpBB/phpbb/routing/router.php
new file mode 100644
index 0000000000..cebf19e702
--- /dev/null
+++ b/phpBB/phpbb/routing/router.php
@@ -0,0 +1,304 @@
+<?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.
+*
+*/
+
+namespace phpbb\routing;
+
+use Symfony\Component\Routing\Matcher\Dumper\PhpMatcherDumper;
+use Symfony\Component\Routing\Generator\Dumper\PhpGeneratorDumper;
+use Symfony\Component\Routing\Matcher\UrlMatcher;
+use Symfony\Component\Routing\Generator\UrlGenerator;
+use Symfony\Component\Routing\RequestContext;
+use Symfony\Component\Routing\RouteCollection;
+use Symfony\Component\Routing\RouterInterface;
+use Symfony\Component\Routing\Loader\YamlFileLoader;
+use Symfony\Component\Config\FileLocator;
+use phpbb\extension\manager;
+
+/**
+* Integration of all pieces of the routing system for easier use.
+*/
+class router implements RouterInterface
+{
+	/**
+	* @var manager Extension manager
+	*/
+	protected $extension_manager;
+
+	/**
+	* @var string phpBB root path
+	*/
+	protected $phpbb_root_path;
+
+	/**
+	* @var string PHP file extensions
+	*/
+	protected $php_ext;
+
+	/**
+	* @var array YAML file(s) containing route information
+	*/
+	protected $routing_files;
+
+	/**
+	* @var \Symfony\Component\Routing\Matcher\UrlMatcherInterface|null
+	*/
+	protected $matcher;
+
+	/**
+	* @var \Symfony\Component\Routing\Generator\UrlGeneratorInterface|null
+	*/
+	protected $generator;
+
+	/**
+	* @var RequestContext
+	*/
+	protected $context;
+
+	/**
+	* @var RouteCollection|null
+	*/
+	protected $route_collection;
+
+	/**
+	* Construct method
+	*
+	* @param manager $extension_manager The extension manager
+	* @param string $phpbb_root_path    phpBB root path
+	* @param string $php_ext            PHP file extension
+	* @param array  $routing_files      Array of strings containing paths
+	*                                   to YAML files holding route information
+	*/
+	public function __construct(manager $extension_manager, $phpbb_root_path, $php_ext, $routing_files = array())
+	{
+		$this->extension_manager	= $extension_manager;
+		$this->routing_files		= $routing_files;
+		$this->phpbb_root_path		= $phpbb_root_path;
+		$this->php_ext				= $php_ext;
+		$this->context				= new RequestContext();
+	}
+
+	/**
+	* Find the list of routing files
+	*
+	* @param \phpbb\finder $finder
+	* @return router
+	*/
+	public function find_routing_files(\phpbb\finder $finder)
+	{
+		if ($this->routing_files === null || empty($this->routing_files))
+		{
+			// 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()
+			));
+		}
+
+		return $this;
+	}
+
+	/**
+	* Find a list of controllers
+	*
+	* @param string $base_path Base path to prepend to file paths
+	* @return router
+	*/
+	public function find($base_path = '')
+	{
+		if ($this->route_collection === null || $this->route_collection->count() === 0)
+		{
+			$this->route_collection = new RouteCollection;
+			foreach ($this->routing_files as $file_path)
+			{
+				$loader = new YamlFileLoader(new FileLocator(phpbb_realpath($base_path)));
+				$this->route_collection->addCollection($loader->load($file_path));
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	* Get the list of routes
+	*
+	* @return RouteCollection Get the route collection
+	*/
+	public function get_routes()
+	{
+		if ($this->route_collection == null || empty($this->routing_files))
+		{
+			$this->find_routing_files($this->extension_manager->get_finder())
+				->find($this->phpbb_root_path);
+		}
+
+		return $this->route_collection;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function getRouteCollection()
+	{
+		return $this->get_routes();
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function setContext(RequestContext $context)
+	{
+		$this->context = $context;
+
+		if ($this->matcher !== null)
+		{
+			$this->get_matcher()->setContext($context);
+		}
+		if ($this->generator !== null)
+		{
+			$this->get_generator()->setContext($context);
+		}
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function getContext()
+	{
+		return $this->context;
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function generate($name, $parameters = array(), $referenceType = self::ABSOLUTE_PATH)
+	{
+		return $this->get_generator()->generate($name, $parameters, $referenceType);
+	}
+
+	/**
+	* {@inheritdoc}
+	*/
+	public function match($pathinfo)
+	{
+		return $this->get_matcher()->match($pathinfo);
+	}
+
+	/**
+	* Gets the UrlMatcher instance associated with this Router.
+	*
+	* @return \Symfony\Component\Routing\Matcher\UrlMatcherInterface A UrlMatcherInterface instance
+	*/
+	public function get_matcher()
+	{
+		if ($this->matcher !== null)
+		{
+			return $this->matcher;
+		}
+
+		if (defined('DEBUG'))
+		{
+			$this->create_new_url_matcher();
+		}
+		else
+		{
+			$this->create_dumped_url_matcher();
+		}
+
+		return $this->matcher;
+	}
+	/**
+	* Creates a new dumped URL Matcher (dump it if necessary)
+	*/
+	protected function create_dumped_url_matcher()
+	{
+		if (!file_exists($this->phpbb_root_path . 'cache/url_matcher.' . $this->php_ext))
+		{
+			$dumper = new PhpMatcherDumper($this->get_routes());
+
+			$options = array(
+				'class' => 'phpbb_url_matcher',
+			);
+
+			$dump = $dumper->dump($options);
+			file_put_contents($this->phpbb_root_path . 'cache/url_matcher.' . $this->php_ext, $dump);
+		}
+
+		require_once($this->phpbb_root_path . 'cache/url_matcher.' . $this->php_ext);
+
+		$this->matcher = new phpbb_url_matcher($this->context);
+	}
+
+	/**
+	* Creates a new URL Matcher
+	*/
+	protected function create_new_url_matcher()
+	{
+		$this->matcher = new UrlMatcher($this->get_routes(), $this->context);
+	}
+
+	/**
+	* Gets the UrlGenerator instance associated with this Router.
+	*
+	* @return \Symfony\Component\Routing\Generator\UrlGeneratorInterface A UrlGeneratorInterface instance
+	*/
+	public function get_generator()
+	{
+		if ($this->generator !== null)
+		{
+			return $this->generator;
+		}
+
+		if (defined('DEBUG'))
+		{
+			$this->create_new_url_generator();
+		}
+		else
+		{
+			$this->create_dumped_url_generator();
+		}
+
+		return $this->generator;
+	}
+
+	/**
+	* Creates a new dumped URL Generator (dump it if necessary)
+	*/
+	protected function create_dumped_url_generator()
+	{
+		if (!file_exists($this->phpbb_root_path . 'cache/url_generator.' . $this->php_ext))
+		{
+			$dumper = new PhpGeneratorDumper($this->get_routes());
+
+			$options = array(
+				'class' => 'phpbb_url_generator',
+			);
+
+			$dump = $dumper->dump($options);
+			file_put_contents($this->phpbb_root_path . 'cache/url_generator.' . $this->php_ext, $dump);
+		}
+
+		require_once($this->phpbb_root_path . 'cache/url_generator.' . $this->php_ext);
+
+		$this->generator = new phpbb_url_generator($this->context);
+	}
+
+	/**
+	* Creates a new URL Generator
+	*/
+	protected function create_new_url_generator()
+	{
+		$this->generator = new UrlGenerator($this->get_routes(), $this->context);
+	}
+}
diff --git a/tests/controller/common_helper_route.php b/tests/controller/common_helper_route.php
index 5e15eb3ee1..1234c372fe 100644
--- a/tests/controller/common_helper_route.php
+++ b/tests/controller/common_helper_route.php
@@ -119,9 +119,9 @@ abstract class phpbb_controller_common_helper_route extends phpbb_test_case
 			new phpbb_mock_cache()
 		);
 		$finder->set_extensions(array_keys($this->extension_manager->all_enabled()));
-		$this->provider = new \phpbb\controller\provider();
-		$this->provider->find_routing_files($finder);
-		$this->provider->find(dirname(__FILE__) . '/');
+		$this->router = new phpbb_mock_router($this->extension_manager, dirname(__FILE__) . '/', 'php');
+		$this->router->find_routing_files($finder);
+		$this->router->find(dirname(__FILE__) . '/');
 		// Set correct current phpBB root path
 		$this->root_path = $this->get_phpbb_root_path();
 	}
@@ -161,7 +161,8 @@ abstract class phpbb_controller_common_helper_route extends phpbb_test_case
 	*/
 	public function test_helper_url_no_rewrite($route, $params, $is_amp, $session_id, $expected, $description)
 	{
-		$this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $this->provider, $this->extension_manager, $this->symfony_request, $this->request, $this->filesystem, $this->root_path, 'php', dirname(__FILE__) . '/');
+		$this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '0'));
+		$this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $this->router, $this->extension_manager, $this->symfony_request, $this->request, $this->filesystem, $this->root_path, 'php', dirname(__FILE__) . '/');
 		$this->assertEquals($expected, $this->helper->route($route, $params, $is_amp, $session_id));
 	}
 
@@ -201,7 +202,7 @@ abstract class phpbb_controller_common_helper_route extends phpbb_test_case
 	public function test_helper_url_with_rewrite($route, $params, $is_amp, $session_id, $expected, $description)
 	{
 		$this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '1'));
-		$this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $this->provider, $this->extension_manager, $this->symfony_request, $this->request, $this->filesystem, $this->root_path, 'php', dirname(__FILE__) . '/');
+		$this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $this->router, $this->extension_manager, $this->symfony_request, $this->request, $this->filesystem, $this->root_path, 'php', dirname(__FILE__) . '/');
 		$this->assertEquals($expected, $this->helper->route($route, $params, $is_amp, $session_id));
 	}
 
@@ -241,7 +242,7 @@ abstract class phpbb_controller_common_helper_route extends phpbb_test_case
 	public function test_helper_url_absolute($route, $params, $is_amp, $session_id, $expected, $description)
 	{
 		$this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '0'));
-		$this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $this->provider, $this->extension_manager, $this->symfony_request, $this->request, $this->filesystem, $this->root_path, 'php', dirname(__FILE__) . '/');
+		$this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $this->router, $this->extension_manager, $this->symfony_request, $this->request, $this->filesystem, $this->root_path, 'php', dirname(__FILE__) . '/');
 		$this->assertEquals($expected, $this->helper->route($route, $params, $is_amp, $session_id, UrlGeneratorInterface::ABSOLUTE_URL));
 	}
 
@@ -281,7 +282,7 @@ abstract class phpbb_controller_common_helper_route extends phpbb_test_case
 	public function test_helper_url_relative_path($route, $params, $is_amp, $session_id, $expected, $description)
 	{
 		$this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '0'));
-		$this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $this->provider, $this->extension_manager, $this->symfony_request, $this->request, $this->filesystem, $this->root_path, 'php', dirname(__FILE__) . '/');
+		$this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $this->router, $this->extension_manager, $this->symfony_request, $this->request, $this->filesystem, $this->root_path, 'php', dirname(__FILE__) . '/');
 		$this->assertEquals($expected, $this->helper->route($route, $params, $is_amp, $session_id, UrlGeneratorInterface::RELATIVE_PATH));
 	}
 
@@ -321,7 +322,7 @@ abstract class phpbb_controller_common_helper_route extends phpbb_test_case
 	public function test_helper_url_network($route, $params, $is_amp, $session_id, $expected, $description)
 	{
 		$this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '0'));
-		$this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $this->provider, $this->extension_manager, $this->symfony_request, $this->request, $this->filesystem, $this->root_path, 'php', dirname(__FILE__) . '/');
+		$this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $this->router, $this->extension_manager, $this->symfony_request, $this->request, $this->filesystem, $this->root_path, 'php', dirname(__FILE__) . '/');
 		$this->assertEquals($expected, $this->helper->route($route, $params, $is_amp, $session_id, UrlGeneratorInterface::NETWORK_PATH));
 	}
 //TODO
@@ -361,7 +362,7 @@ abstract class phpbb_controller_common_helper_route extends phpbb_test_case
 	public function test_helper_url_absolute_with_rewrite($route, $params, $is_amp, $session_id, $expected, $description)
 	{
 		$this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '1'));
-		$this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $this->provider, $this->extension_manager, $this->symfony_request, $this->request, $this->filesystem, $this->root_path, 'php', dirname(__FILE__) . '/');
+		$this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $this->router, $this->extension_manager, $this->symfony_request, $this->request, $this->filesystem, $this->root_path, 'php', dirname(__FILE__) . '/');
 		$this->assertEquals($expected, $this->helper->route($route, $params, $is_amp, $session_id, UrlGeneratorInterface::ABSOLUTE_URL));
 	}
 
@@ -401,7 +402,7 @@ abstract class phpbb_controller_common_helper_route extends phpbb_test_case
 	public function test_helper_url_relative_path_with_rewrite($route, $params, $is_amp, $session_id, $expected, $description)
 	{
 		$this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '1'));
-		$this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $this->provider, $this->extension_manager, $this->symfony_request, $this->request, $this->filesystem, $this->root_path, 'php', dirname(__FILE__) . '/');
+		$this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $this->router, $this->extension_manager, $this->symfony_request, $this->request, $this->filesystem, $this->root_path, 'php', dirname(__FILE__) . '/');
 		$this->assertEquals($expected, $this->helper->route($route, $params, $is_amp, $session_id, UrlGeneratorInterface::RELATIVE_PATH));
 	}
 
@@ -441,7 +442,7 @@ abstract class phpbb_controller_common_helper_route extends phpbb_test_case
 	public function test_helper_url_network_with_rewrite($route, $params, $is_amp, $session_id, $expected, $description)
 	{
 		$this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '1'));
-		$this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $this->provider, $this->extension_manager, $this->symfony_request, $this->request, $this->filesystem, $this->root_path, 'php', dirname(__FILE__) . '/');
+		$this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $this->router, $this->extension_manager, $this->symfony_request, $this->request, $this->filesystem, $this->root_path, 'php', dirname(__FILE__) . '/');
 		$this->assertEquals($expected, $this->helper->route($route, $params, $is_amp, $session_id, UrlGeneratorInterface::NETWORK_PATH));
 	}
 }
diff --git a/tests/controller/controller_test.php b/tests/controller/controller_test.php
index 62feee3fed..cd90dda751 100644
--- a/tests/controller/controller_test.php
+++ b/tests/controller/controller_test.php
@@ -33,11 +33,11 @@ class phpbb_controller_controller_test extends phpbb_test_case
 			));
 	}
 
-	public function test_provider()
+	public function test_router_find_files()
 	{
-		$provider = new \phpbb\controller\provider();
-		$provider->find_routing_files($this->extension_manager->get_finder());
-		$routes = $provider->find(__DIR__)->get_routes();
+		$router = new \phpbb\routing\router($this->extension_manager, dirname(__FILE__) . '/', 'php');
+		$router->find_routing_files($this->extension_manager->get_finder());
+		$routes = $router->find(__DIR__)->get_routes();
 
 		// This will need to be updated if any new routes are defined
 		$this->assertInstanceOf('Symfony\Component\Routing\Route', $routes->get('core_controller'));
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();
+	}
+}
diff --git a/tests/pagination/pagination_test.php b/tests/pagination/pagination_test.php
index 494c667198..de939e280d 100644
--- a/tests/pagination/pagination_test.php
+++ b/tests/pagination/pagination_test.php
@@ -44,9 +44,9 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case
 		$finder->set_extensions(array_keys($manager->all_enabled()));
 
 		$this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '1'));
-		$provider = new \phpbb\controller\provider();
-		$provider->find_routing_files($finder);
-		$provider->find(dirname(__FILE__) . '/');
+		$router = new phpbb_mock_router($manager, dirname(__FILE__) . '/', 'php');
+		$router->find_routing_files($finder);
+		$router->find(dirname(__FILE__) . '/');
 
 		$request = new phpbb_mock_request();
 		$request->overwrite('SCRIPT_NAME', '/app.php', \phpbb\request\request_interface::SERVER);
@@ -57,7 +57,7 @@ class phpbb_pagination_pagination_test extends phpbb_template_template_test_case
 			$request
 		);
 
-		$this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $provider, $manager, $symfony_request, $request, $filesystem, '', 'php', dirname(__FILE__) . '/');
+		$this->helper = new phpbb_mock_controller_helper($this->template, $this->user, $this->config, $router, $manager, $symfony_request, $request, $filesystem, '', 'php', dirname(__FILE__) . '/');
 		$this->pagination = new \phpbb\pagination($this->template, $this->user, $this->helper, $phpbb_dispatcher);
 	}
author	Tristan Darricau <github@nicofuma.fr>	2014-09-14 21:18:20 +0200
committer	Tristan Darricau <github@nicofuma.fr>	2014-11-20 16:03:48 +0100
commit	a5bfc76a73a213a388126d0f697ba64f27a4b00d (patch)
tree	2608ef47b98a746c536512ce0b919c27796ffd2c
parent	3b1c611566399c1e06bd737ec283b141e3c410f5 (diff)
download	forums-a5bfc76a73a213a388126d0f697ba64f27a4b00d.tar forums-a5bfc76a73a213a388126d0f697ba64f27a4b00d.tar.gz forums-a5bfc76a73a213a388126d0f697ba64f27a4b00d.tar.bz2 forums-a5bfc76a73a213a388126d0f697ba64f27a4b00d.tar.xz forums-a5bfc76a73a213a388126d0f697ba64f27a4b00d.zip