From 06158693c7b846518abfe9d72491fc7376e457f3 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 19 Oct 2012 19:54:19 -0400
Subject: [feature/controller] Implement a front controller

PHPBB3-10864
---
 phpBB/includes/controller/provider.php | 94 ++++++++++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 phpBB/includes/controller/provider.php

(limited to 'phpBB/includes/controller/provider.php')

diff --git a/phpBB/includes/controller/provider.php b/phpBB/includes/controller/provider.php
new file mode 100644
index 0000000000..25deedb5d1
--- /dev/null
+++ b/phpBB/includes/controller/provider.php
@@ -0,0 +1,94 @@
+<?php
+/**
+*
+* @package controller
+* @copyright (c) 2012 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+/**
+* @ignore
+*/
+if (!defined('IN_PHPBB'))
+{
+	exit;
+}
+
+use Symfony\Component\Routing\RouteCollection;
+use Symfony\Component\Routing\Loader\YamlFileLoader;
+use Symfony\Component\Config\FileLocator;
+
+/**
+* Controller interface
+* @package phpBB3
+*/
+class phpbb_controller_provider
+{
+	/**
+	* YAML file(s) containing route information
+	* @var array
+	*/
+	protected $routing_paths;
+
+	/**
+	* Construct method
+	*
+	* @param array() $routing_paths Array of strings containing paths
+	*							to YAML files holding route information
+	*/
+	public function __construct($routing_paths = array())
+	{
+		$this->set_paths($routing_paths);
+	}
+
+	/**
+	* Locate paths containing routing files
+	* This sets an internal property but does not return the paths.
+	*
+	* @return The current instance of this object for method chaining
+	*/
+	public function get_paths(phpbb_extension_finder $finder)
+	{
+		// We hardcode the path to the core config directory
+		// because the finder cannot find it
+		$this->set_paths(array_merge(array('config'), array_map('dirname', array_keys($finder
+			->directory('config')
+			->prefix('routing')
+			->suffix('yml')
+			->find()
+		))));
+
+		return $this;
+	}
+
+	/**
+	* Set the $routing_paths property with a given list of paths
+	*
+	* @return The current instance of this object for method chaining
+	*/
+	public function set_paths(array $paths)
+	{
+		$this->routing_paths = $paths;
+
+		return $this;
+	}
+
+	/**
+	* Get a list of controllers and return it
+	*
+	* @param string $base_path Base path to prepend to file paths
+	* @return array Array of controllers and their route information
+	*/
+	public function find($base_path = '')
+	{
+		$routes = new RouteCollection;
+		foreach ($this->routing_paths as $path)
+		{
+			$loader = new YamlFileLoader(new FileLocator($base_path . $path));
+			$routes->addCollection($loader->load('routing.yml'));
+		}
+
+		return $routes;
+	}
+}
-- 
cgit v1.2.1


From db1d49d559a337f7266a9e9f0cfaf3eb025b0ed1 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Thu, 15 Nov 2012 13:59:30 -0500
Subject: [feature/controller] Rename get_paths to import_paths_from_finder

Also removed unused variable from url_matcher function

PHPBB3-10864
---
 phpBB/includes/controller/provider.php | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

(limited to 'phpBB/includes/controller/provider.php')

diff --git a/phpBB/includes/controller/provider.php b/phpBB/includes/controller/provider.php
index 25deedb5d1..b2a5b9f6b2 100644
--- a/phpBB/includes/controller/provider.php
+++ b/phpBB/includes/controller/provider.php
@@ -39,7 +39,7 @@ class phpbb_controller_provider
 	*/
 	public function __construct($routing_paths = array())
 	{
-		$this->set_paths($routing_paths);
+		$this->routing_paths = $routing_paths;
 	}
 
 	/**
@@ -48,28 +48,16 @@ class phpbb_controller_provider
 	*
 	* @return The current instance of this object for method chaining
 	*/
-	public function get_paths(phpbb_extension_finder $finder)
+	public function import_paths_from_finder(phpbb_extension_finder $finder)
 	{
 		// We hardcode the path to the core config directory
 		// because the finder cannot find it
-		$this->set_paths(array_merge(array('config'), array_map('dirname', array_keys($finder
+		$this->routing_paths = array_merge(array('config'), array_map('dirname', array_keys($finder
 			->directory('config')
 			->prefix('routing')
 			->suffix('yml')
 			->find()
-		))));
-
-		return $this;
-	}
-
-	/**
-	* Set the $routing_paths property with a given list of paths
-	*
-	* @return The current instance of this object for method chaining
-	*/
-	public function set_paths(array $paths)
-	{
-		$this->routing_paths = $paths;
+		)));
 
 		return $this;
 	}
-- 
cgit v1.2.1