Revive old controller classes for improved backwards compatibility

classes/Ergo/Routing/RequestFilter.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Ergo\Routing;
+
+interface RequestFilter
+{
+	public function filter($request);
+}

classes/Ergo/Routing/RequestFilterChain.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Ergo\Routing;
+
+class RequestFilterChain
+{
+	private $_filters=array();
+
+	/**
+	 * Filter a request, fail if a null result is returned
+	 */
+	public function filter($request)
+	{
+		foreach($this->_filters as $filter)
+		{
+			if(!$request = $filter->filter($request))
+			{
+				throw new Exception("Filter returned a null request");
+			}
+		}
+
+		return $request;
+	}
+
+	public function addFilter(RequestFilter $filter)
+	{
+		$this->_filters[] = $filter;
+		return $this;
+	}
+}

classes/Ergo/Routing/RoutedController.php

@@ -0,0 +1,107 @@
+<?php
+
+namespace Ergo\Routing;
+
+/**
+ * Routes a request to a controller method based on path and request method.
+ */
+class RoutedController implements Controller
+{
+	private $_router;
+	private $_controllerFactory;
+	private $_controllers=array();
+	private $_filterChain;
+
+	/**
+	 * @param Router
+	 */
+	public function __construct($router=null)
+	{
+		$this->_filterChain = new RequestFilterChain();
+		$this->_router = isset($params['router']) ?
+			$params['router'] : new Router();
+	}
+
+	/**
+	 * Adds an {@link RequestFilter} to the controller
+	 */
+	public function addRequestFilter(RequestFilter $filter)
+	{
+		$this->_filterChain->addFilter($filter);
+		return $this;
+	}
+
+	/**
+	 * Executes a php script in the context of the controller for configuration
+	 */
+	public function configure($script)
+	{
+		require($script);
+	}
+
+	/**
+	 * Sets an optional controller factory to use to build controllers
+	 */
+	public function setControllerResolver(ControllerResolver $factory)
+	{
+		$this->_controllerFactory = $factory;
+	}
+
+	/**
+	 * Gets a controller for a path, either from a locally registered
+	 * controller or one from a controller factory
+	 */
+	private function _controllerFor($name)
+	{
+		if(isset($this->_controllers[$name]) && is_string($this->_controllers[$name]))
+		{
+			return $this->_controllerFor($this->_controllers[$name]);
+		}
+		else if(isset($this->_controllers[$name]) && is_object($this->_controllers[$name]))
+		{
+			return $this->_controllers[$name];
+		}
+		else if(isset($this->_controllerFactory))
+		{
+			return $this->_controllerFactory->resolve($name);
+		}
+		else
+		{
+			throw new Exception("No controller found for $name");
+		}
+	}
+
+	/* (non-phpdoc)
+	 * @see Controller::execute
+	 */
+	public function execute($request)
+	{
+		$url = $request->getUrl();
+		$path = $url->getPath();
+
+		$match = $this->_router->lookup($path);
+		return $this->_controllerFor($match->getName())->execute(
+			new RoutedRequest(
+				$this->_filterChain->filter($request),
+					$match, $this->_router));
+	}
+
+	/**
+	 * Defines a url, a route name and an optional controller
+	 * @param $url string the url to connect the route to
+	 * @param $name string an arbitrary controller name, must be unique
+	 * @param $controller mixed either a controller class, or the name of another route
+	 */
+	public function connect($url, $name, $controller=null)
+	{
+		$this->_router->connect($url, $name, $controller);
+
+		// register the controller if one is provided
+		if(!is_null($controller))
+		{
+			$this->_controllers[$name] = $controller;
+		}
+
+		return $this;
+	}
+}