Merge pull request #7 from frederikbosch/master

Moved the resolveHandler method to a seperate class HandlerResolver.

src/Phroute/Dispatcher.php

@@ -8,18 +8,28 @@ class Dispatcher {
     private $staticRouteMap;
     private $variableRouteData;
     private $filters;
+    private $handlerResolver;
     public $matchedRoute;
 
     /**
      * Create a new route dispatcher.
      *
      * @param RouteCollector $data
      */
-    public function __construct(RouteCollector $data)
+    public function __construct(RouteCollector $data, HandlerResolverInterface $resolver = null)
     {
         list($this->staticRouteMap, $this->variableRouteData) = $data->getData();
 
         $this->filters = $data->getFilters();
+
+        if ($resolver === null)
+        {
+        	$this->handlerResolver = new HandlerResolver();
+        }
+        else
+        {
+        	$this->handlerResolver = $resolver;
+        }
     }
 
     /**
@@ -40,29 +50,13 @@ public function dispatch($httpMethod, $uri)
             return $response;
         }
 
-        $resolvedHandler = $this->resolveHandler($handler);
+        $resolvedHandler = $this->handlerResolver->resolve($handler);
 
         $response = call_user_func_array($resolvedHandler, $vars);
 
         return $this->dispatchFilters($afterFilter, $response);
     }
 
-    /**
-     * Create an instance of the given filter handler.
-     *
-     * @param $handler
-     * @return array
-     */
-    private function resolveHandler($handler)
-    {
-        if(is_array($handler) and is_string($handler[0]))
-        {
-            $handler[0] = new $handler[0];
-        }
-
-        return $handler;
-    }
-
     /**
      * Dispatch a route filter.
      *
@@ -74,7 +68,9 @@ private function dispatchFilters($filters, $response = null)
     {
         while($filter = array_shift($filters))
         {
-            if(($filteredResponse = call_user_func($this->resolveHandler($filter), $response)) !== null)
+        	$handler = $this->handlerResolver->resolve($filter);
+
+            if(($filteredResponse = call_user_func($handler, $response)) !== null)
             {
                 return $filteredResponse;
             }

src/Phroute/HandlerResolver.php

@@ -0,0 +1,22 @@
+<?php
+namespace Phroute;
+
+class HandlerResolver implements HandlerResolverInterface {
+
+	/**
+	 * Create an instance of the given handler.
+	 *
+	 * @param $handler
+	 * @return array
+	 */
+
+	public function resolve ($handler)
+	{
+		if(is_array($handler) and is_string($handler[0]))
+		{
+			$handler[0] = new $handler[0];
+		}
+
+		return $handler;
+	}
+}

src/Phroute/HandlerResolverInterface.php

@@ -0,0 +1,14 @@
+<?php
+namespace Phroute;
+
+interface HandlerResolverInterface {
+
+	/**
+	 * Create an instance of the given handler.
+	 *
+	 * @param $handler
+	 * @return array
+	 */
+
+	public function resolve($handler);
+}