HakimCh / Router

Router.php

Spacing +6 added lines, -6 removed lines

@@ -29,7 +29,7 @@ 
 		$this->setRoutes($routes);
 		$this->setBasePath($basePath);
         $this->parser = $parser;
-		if(!$server) {
+		if (!$server) {
 			$this->server = $_SERVER;
 		}
     }
@@ -87,11 +87,11 @@ 
 
 		foreach ($this->routes as $handler) {
 
-			if(!$this->parser->methodMatch($handler[0], $requestMethod, $handler[1], $requestUrl)) continue;
+			if (!$this->parser->methodMatch($handler[0], $requestMethod, $handler[1], $requestUrl)) continue;
 
 			return array(
                 'target' => $handler[2],
-                'params' => array_filter($this->parser->getParams(), function ($k) { return !is_numeric($k); }, ARRAY_FILTER_USE_KEY),
+                'params' => array_filter($this->parser->getParams(), function($k) { return !is_numeric($k); }, ARRAY_FILTER_USE_KEY),
                 'name'   => $handler[3]
             );
 		}
@@ -106,8 +106,8 @@ 
      */
     public function __call($method, $arguments)
 	{
-		if(!in_array($method, array('get', 'post', 'delete', 'put', 'patch', 'update', 'all'))) {
-			throw new RouterException($method . ' not exist in the '. __CLASS__);
+		if (!in_array($method, array('get', 'post', 'delete', 'put', 'patch', 'update', 'all'))) {
+			throw new RouterException($method . ' not exist in the ' . __CLASS__);
 		}
 
 		$methods = $method == 'all' ? implode('|', $this->all) : $method;
@@ -143,7 +143,7 @@ 
         if (!is_array($routes) && !$routes instanceof Traversable) {
             throw new RouterException('Routes should be an array or an instance of Traversable');
         }
-        if(!empty($routes)) {
+        if (!empty($routes)) {
             foreach ($routes as $route) {
                 call_user_func_array(array($this, 'map'), $route);
             }

Braces +3 added lines, -1 removed lines

@@ -87,7 +87,9 @@
 
 		foreach ($this->routes as $handler) {
 
-			if(!$this->parser->methodMatch($handler[0], $requestMethod, $handler[1], $requestUrl)) continue;
+			if(!$this->parser->methodMatch($handler[0], $requestMethod, $handler[1], $requestUrl)) {
+				continue;
+			}
 
 			return array(
                 'target' => $handler[2],

Indentation +103 added lines, -103 removed lines

@@ -10,29 +10,29 @@ 
 	protected $namedRoutes = [];
 	protected $basePath = '';
 	protected $all = ['get', 'post'];
-    protected $server;
-    /**
-     * @var RouterParser
-     */
-    private $parser;
-
-    /**
-     * Create router in one call from config.
-     *
-     * @param RouterParser $parser
-     * @param array $routes
-     * @param string $basePath
-     * @param null $server
-     */
+	protected $server;
+	/**
+	 * @var RouterParser
+	 */
+	private $parser;
+
+	/**
+	 * Create router in one call from config.
+	 *
+	 * @param RouterParser $parser
+	 * @param array $routes
+	 * @param string $basePath
+	 * @param null $server
+	 */
 	public function __construct(RouterParser $parser, $routes = [], $basePath = '', $server = null)
 	{
 		$this->setRoutes($routes);
 		$this->setBasePath($basePath);
-        $this->parser = $parser;
+		$this->parser = $parser;
 		if(!$server) {
 			$this->server = $_SERVER;
 		}
-    }
+	}
 
 	/**
 	 * Map a route to a target
@@ -45,7 +45,7 @@ 
 	public function map($method, $route, $target, $routeName = null)
 	{
 		if (is_string($routeName)) {
-		    $this->handleException($routeName, "Can not redeclare route '%s'");
+			$this->handleException($routeName, "Can not redeclare route '%s'");
 			$this->namedRoutes[$routeName] = $route;
 		}
 
@@ -63,11 +63,11 @@ 
 	 */
 	public function generate($routeName, array $params = [])
 	{
-        $this->handleException($routeName, "Route '%s' does not exist.", false);
+		$this->handleException($routeName, "Route '%s' does not exist.", false);
 
 		$route = $this->namedRoutes[$routeName];
 
-        return $this->parser->generate($this->basePath, $route, $params);
+		return $this->parser->generate($this->basePath, $route, $params);
 	}
 
 	/**
@@ -90,21 +90,21 @@ 
 			if(!$this->parser->methodMatch($handler[0], $requestMethod, $handler[1], $requestUrl)) continue;
 
 			return array(
-                'target' => $handler[2],
-                'params' => array_filter($this->parser->getParams(), function ($k) { return !is_numeric($k); }, ARRAY_FILTER_USE_KEY),
-                'name'   => $handler[3]
-            );
+				'target' => $handler[2],
+				'params' => array_filter($this->parser->getParams(), function ($k) { return !is_numeric($k); }, ARRAY_FILTER_USE_KEY),
+				'name'   => $handler[3]
+			);
 		}
 
 		return false;
 	}
 
-    /**
-     * @param $method
-     * @param $arguments
-     * @throws RouterException
-     */
-    public function __call($method, $arguments)
+	/**
+	 * @param $method
+	 * @param $arguments
+	 * @throws RouterException
+	 */
+	public function __call($method, $arguments)
 	{
 		if(!in_array($method, array('get', 'post', 'delete', 'put', 'patch', 'update', 'all'))) {
 			throw new RouterException($method . ' not exist in the '. __CLASS__);
@@ -117,78 +117,78 @@ 
 		call_user_func_array([$this, 'map'], $route);
 	}
 
-    /**
-     * Retrieves all routes.
-     * Useful if you want to process or display routes.
-     * @return array All routes.
-     */
-    public function getRoutes()
-    {
-        return $this->routes;
-    }
-
-    /**
-     * Add multiple routes at once from array in the following format:
-     *
-     *   $routes = array(
-     *      array($method, $route, $target, $name)
-     *   );
-     *
-     * @param array|Traversable $routes
-     * @return void
-     * @author Koen Punt
-     */
-    public function setRoutes($routes)
-    {
-        if (!is_array($routes) && !$routes instanceof Traversable) {
-            throw new RouterException('Routes should be an array or an instance of Traversable');
-        }
-        if(!empty($routes)) {
-            foreach ($routes as $route) {
-                call_user_func_array(array($this, 'map'), $route);
-            }
-        }
-    }
-
-    /**
-     * Set the base path.
-     * Useful if you are running your application from a subdirectory.
-     */
-    public function setBasePath($basePath)
-    {
-        $this->basePath = $basePath;
-    }
-
-    /**
-     * @param $routeName
-     * @param $message
-     * @param bool $cmpTo
-     * @throws RouterException
-     */
-    private function handleException($routeName, $message, $cmpTo = true)
-    {
-        if (array_key_exists($routeName, $this->namedRoutes) === $cmpTo) {
-            throw new RouterException(sprintf($message, $routeName));
-        }
-    }
-
-    /**
-     * @param $requestUrl
-     *
-     * @return mixed
-     */
-    private function getRequestUrl($requestUrl = null)
-    {
-        // set Request Url if it isn't passed as parameter
-        if (is_null($requestUrl)) {
-            $requestUrl = parse_url($this->server['REQUEST_URI'], PHP_URL_PATH);
-        }
-
-        return str_replace($this->basePath, '', strtok($requestUrl, '?'));
-    }
-
-    public function getParser()
-    {
-        return $this->parser;
-    }
+	/**
+	 * Retrieves all routes.
+	 * Useful if you want to process or display routes.
+	 * @return array All routes.
+	 */
+	public function getRoutes()
+	{
+		return $this->routes;
+	}
+
+	/**
+	 * Add multiple routes at once from array in the following format:
+	 *
+	 *   $routes = array(
+	 *      array($method, $route, $target, $name)
+	 *   );
+	 *
+	 * @param array|Traversable $routes
+	 * @return void
+	 * @author Koen Punt
+	 */
+	public function setRoutes($routes)
+	{
+		if (!is_array($routes) && !$routes instanceof Traversable) {
+			throw new RouterException('Routes should be an array or an instance of Traversable');
+		}
+		if(!empty($routes)) {
+			foreach ($routes as $route) {
+				call_user_func_array(array($this, 'map'), $route);
+			}
+		}
+	}
+
+	/**
+	 * Set the base path.
+	 * Useful if you are running your application from a subdirectory.
+	 */
+	public function setBasePath($basePath)
+	{
+		$this->basePath = $basePath;
+	}
+
+	/**
+	 * @param $routeName
+	 * @param $message
+	 * @param bool $cmpTo
+	 * @throws RouterException
+	 */
+	private function handleException($routeName, $message, $cmpTo = true)
+	{
+		if (array_key_exists($routeName, $this->namedRoutes) === $cmpTo) {
+			throw new RouterException(sprintf($message, $routeName));
+		}
+	}
+
+	/**
+	 * @param $requestUrl
+	 *
+	 * @return mixed
+	 */
+	private function getRequestUrl($requestUrl = null)
+	{
+		// set Request Url if it isn't passed as parameter
+		if (is_null($requestUrl)) {
+			$requestUrl = parse_url($this->server['REQUEST_URI'], PHP_URL_PATH);
+		}
+
+		return str_replace($this->basePath, '', strtok($requestUrl, '?'));
+	}
+
+	public function getParser()
+	{
+		return $this->parser;
+	}
 }

RouterParser.php

Indentation +194 added lines, -194 removed lines

@@ -3,198 +3,198 @@
 
 class RouterParser implements RouterParserInterface
 {
-    protected $params = [];
-    protected $matchTypes = [
-        'i'  => '[0-9]++',
-        'a'  => '[0-9A-Za-z]++',
-        'h'  => '[0-9A-Fa-f]++',
-        '*'  => '.+?',
-        '**' => '.++',
-        ''   => '[^/\.]++'
-    ];
-
-    /**
-     * Create router in one call from config.
-     *
-     * @param array $matchTypes
-     */
-    public function __construct($matchTypes = [])
-    {
-        $this->setMatchTypes($matchTypes);
-    }
-
-    /**
-     * Add named match types. It uses array_merge so keys can be overwritten.
-     *
-     * @param array $matchTypes The key is the name and the value is the regex.
-     */
-    public function setMatchTypes($matchTypes)
-    {
-        $this->matchTypes = array_merge($this->matchTypes, $matchTypes);
-    }
-
-    /**
-     * Get the url from a route name
-     *
-     * @param string $basePath
-     * @param string $route
-     * @param array $params
-     *
-     * @return string
-     */
-    public function generate($basePath, $route, array $params)
-    {
-        $url = $basePath . $route;
-
-        if (preg_match_all('`(/|\.|)\[([^:\]]*+)(?::([^:\]]*+))?\](\?|)`', $route, $matches, PREG_SET_ORDER)) {
-            foreach ($matches as $match) {
-                $block  = $match[0];
-                $pre    = $match[1];
-                $param  = $match[3];
-
-                if ($pre) {
-                    $block = substr($block, 1);
-                }
-
-                if (isset($params[$param])) {
-                    $url = str_replace($block, $params[$param], $url);
-                } elseif ($match[4]) {
-                    $url = str_replace($pre . $block, '', $url);
-                }
-            }
-        }
-
-        return $url;
-    }
-
-    /**
-     * @param $method
-     * @param $requestMethod
-     * @param string|array $routeString
-     * @param $requestUrl
-     *
-     * @return mixed
-     */
-    public function methodMatch($method, $requestMethod, $routeString, $requestUrl)
-    {
-        $method = strtolower($method);
-        $requestMethod = strtolower($requestMethod);
-        $methods = explode('|', $method);
-
-        if(in_array($requestMethod, $methods)) {
-            if($routeString == '*') {
-                return true;
-            }
-            elseif(isset($routeString[0]) && $routeString[0] == '@') {
-                $match = preg_match('`' . substr($routeString, 1) . '`u', $requestUrl, $this->params);
-                return $match;
-            }
-            elseif (($position = strpos($routeString, '[')) === false) {
-                return strcmp($requestUrl, $routeString) === 0;
-            }
-            else {
-                if (strncmp($requestUrl, $routeString, $position) !== 0) {
-                    return false;
-                }
-                $regex = $this->compileRoute($routeString, $requestUrl);
-                return preg_match($regex, $requestUrl, $this->params);
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Compile the regex for a given route (EXPENSIVE)
-     */
-    private function compileRoute($routeString, $requestUrl)
-    {
-        $route = $this->getRoute($routeString, $requestUrl);
-
-        if (preg_match_all('`(/|\.|)\[([^:\]]*+)(?::([^:\]]*+))?\](\?|)`', $route, $matches, PREG_SET_ORDER)) {
-            $matchTypes = $this->matchTypes;
-            foreach ($matches as $match) {
-                list($block, $pre, $type, $param, $optional) = $match;
-                $pattern = $this->getRoutePattern($matchTypes, $pre, $type, $param, $optional);
-                $route = str_replace($block, $pattern, $route);
-            }
-        }
-
-        return "`^$route$`u";
-    }
-
-    private function getRoutePattern($matchTypes, $pre, $type, $param, $optional)
-    {
-        if (isset($matchTypes[$type])) {
-            $type = $matchTypes[$type];
-        }
-        if ($pre === '.') {
-            $pre = '\.';
-        }
-
-        //Older versions of PCRE require the 'P' in (?P<named>)
-        return '(?:'
-            . ($pre !== '' ? $pre : null)
-            . '('
-            . ($param !== '' ? "?P<$param>" : null)
-            . $type
-            . '))'
-            . ($optional !== '' ? '?' : null);
-    }
-
-    /**
-     * @param $routeString
-     * @param $requestUrl
-     *
-     * @return bool|string
-     */
-    private function getRoute($routeString, $requestUrl)
-    {
-        $iPointer = $jPointer = 0;
-        $nPointer = isset($routeString[0]) ? $routeString[0] : null;
-        $regex = $route = false;
-
-        // Find the longest non-regex substring and match it against the URI
-        while (true) {
-            if (!isset($routeString[$iPointer])) {
-                break;
-            }
-            if ($regex === false) {
-                if(!$this->getRouteRegexCheck($nPointer, $jPointer, $iPointer, $routeString, $requestUrl)) {
-                    continue;
-                }
-                $jPointer++;
-            }
-            $route .= $routeString[$iPointer++];
-        }
-
-        return $route;
-    }
-
-    private function getRouteRegexCheck($nPointer, $jPointer, $iPointer, $routeString, $requestUrl)
-    {
-        $cPointer = $nPointer;
-        $regex = in_array($cPointer, array('[', '(', '.'));
-        if (!$regex && isset($routeString[$iPointer+1])) {
-            $nPointer = $routeString[$iPointer + 1];
-            $regex = in_array($nPointer, array('?', '+', '*', '{'));
-        }
-        if (!$regex && $cPointer !== '/' && (!isset($requestUrl[$jPointer]) || $cPointer !== $requestUrl[$jPointer])) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * @return array
-     */
-    public function getParams()
-    {
-        return $this->params;
-    }
-
-    public function getMatchTypes()
-    {
-        return $this->matchTypes;
-    }
+	protected $params = [];
+	protected $matchTypes = [
+		'i'  => '[0-9]++',
+		'a'  => '[0-9A-Za-z]++',
+		'h'  => '[0-9A-Fa-f]++',
+		'*'  => '.+?',
+		'**' => '.++',
+		''   => '[^/\.]++'
+	];
+
+	/**
+	 * Create router in one call from config.
+	 *
+	 * @param array $matchTypes
+	 */
+	public function __construct($matchTypes = [])
+	{
+		$this->setMatchTypes($matchTypes);
+	}
+
+	/**
+	 * Add named match types. It uses array_merge so keys can be overwritten.
+	 *
+	 * @param array $matchTypes The key is the name and the value is the regex.
+	 */
+	public function setMatchTypes($matchTypes)
+	{
+		$this->matchTypes = array_merge($this->matchTypes, $matchTypes);
+	}
+
+	/**
+	 * Get the url from a route name
+	 *
+	 * @param string $basePath
+	 * @param string $route
+	 * @param array $params
+	 *
+	 * @return string
+	 */
+	public function generate($basePath, $route, array $params)
+	{
+		$url = $basePath . $route;
+
+		if (preg_match_all('`(/|\.|)\[([^:\]]*+)(?::([^:\]]*+))?\](\?|)`', $route, $matches, PREG_SET_ORDER)) {
+			foreach ($matches as $match) {
+				$block  = $match[0];
+				$pre    = $match[1];
+				$param  = $match[3];
+
+				if ($pre) {
+					$block = substr($block, 1);
+				}
+
+				if (isset($params[$param])) {
+					$url = str_replace($block, $params[$param], $url);
+				} elseif ($match[4]) {
+					$url = str_replace($pre . $block, '', $url);
+				}
+			}
+		}
+
+		return $url;
+	}
+
+	/**
+	 * @param $method
+	 * @param $requestMethod
+	 * @param string|array $routeString
+	 * @param $requestUrl
+	 *
+	 * @return mixed
+	 */
+	public function methodMatch($method, $requestMethod, $routeString, $requestUrl)
+	{
+		$method = strtolower($method);
+		$requestMethod = strtolower($requestMethod);
+		$methods = explode('|', $method);
+
+		if(in_array($requestMethod, $methods)) {
+			if($routeString == '*') {
+				return true;
+			}
+			elseif(isset($routeString[0]) && $routeString[0] == '@') {
+				$match = preg_match('`' . substr($routeString, 1) . '`u', $requestUrl, $this->params);
+				return $match;
+			}
+			elseif (($position = strpos($routeString, '[')) === false) {
+				return strcmp($requestUrl, $routeString) === 0;
+			}
+			else {
+				if (strncmp($requestUrl, $routeString, $position) !== 0) {
+					return false;
+				}
+				$regex = $this->compileRoute($routeString, $requestUrl);
+				return preg_match($regex, $requestUrl, $this->params);
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Compile the regex for a given route (EXPENSIVE)
+	 */
+	private function compileRoute($routeString, $requestUrl)
+	{
+		$route = $this->getRoute($routeString, $requestUrl);
+
+		if (preg_match_all('`(/|\.|)\[([^:\]]*+)(?::([^:\]]*+))?\](\?|)`', $route, $matches, PREG_SET_ORDER)) {
+			$matchTypes = $this->matchTypes;
+			foreach ($matches as $match) {
+				list($block, $pre, $type, $param, $optional) = $match;
+				$pattern = $this->getRoutePattern($matchTypes, $pre, $type, $param, $optional);
+				$route = str_replace($block, $pattern, $route);
+			}
+		}
+
+		return "`^$route$`u";
+	}
+
+	private function getRoutePattern($matchTypes, $pre, $type, $param, $optional)
+	{
+		if (isset($matchTypes[$type])) {
+			$type = $matchTypes[$type];
+		}
+		if ($pre === '.') {
+			$pre = '\.';
+		}
+
+		//Older versions of PCRE require the 'P' in (?P<named>)
+		return '(?:'
+			. ($pre !== '' ? $pre : null)
+			. '('
+			. ($param !== '' ? "?P<$param>" : null)
+			. $type
+			. '))'
+			. ($optional !== '' ? '?' : null);
+	}
+
+	/**
+	 * @param $routeString
+	 * @param $requestUrl
+	 *
+	 * @return bool|string
+	 */
+	private function getRoute($routeString, $requestUrl)
+	{
+		$iPointer = $jPointer = 0;
+		$nPointer = isset($routeString[0]) ? $routeString[0] : null;
+		$regex = $route = false;
+
+		// Find the longest non-regex substring and match it against the URI
+		while (true) {
+			if (!isset($routeString[$iPointer])) {
+				break;
+			}
+			if ($regex === false) {
+				if(!$this->getRouteRegexCheck($nPointer, $jPointer, $iPointer, $routeString, $requestUrl)) {
+					continue;
+				}
+				$jPointer++;
+			}
+			$route .= $routeString[$iPointer++];
+		}
+
+		return $route;
+	}
+
+	private function getRouteRegexCheck($nPointer, $jPointer, $iPointer, $routeString, $requestUrl)
+	{
+		$cPointer = $nPointer;
+		$regex = in_array($cPointer, array('[', '(', '.'));
+		if (!$regex && isset($routeString[$iPointer+1])) {
+			$nPointer = $routeString[$iPointer + 1];
+			$regex = in_array($nPointer, array('?', '+', '*', '{'));
+		}
+		if (!$regex && $cPointer !== '/' && (!isset($requestUrl[$jPointer]) || $cPointer !== $requestUrl[$jPointer])) {
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getParams()
+	{
+		return $this->params;
+	}
+
+	public function getMatchTypes()
+	{
+		return $this->matchTypes;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -81,11 +81,11 @@ 
         $requestMethod = strtolower($requestMethod);
         $methods = explode('|', $method);
 
-        if(in_array($requestMethod, $methods)) {
-            if($routeString == '*') {
+        if (in_array($requestMethod, $methods)) {
+            if ($routeString == '*') {
                 return true;
             }
-            elseif(isset($routeString[0]) && $routeString[0] == '@') {
+            elseif (isset($routeString[0]) && $routeString[0] == '@') {
                 $match = preg_match('`' . substr($routeString, 1) . '`u', $requestUrl, $this->params);
                 return $match;
             }
@@ -160,7 +160,7 @@ 
                 break;
             }
             if ($regex === false) {
-                if(!$this->getRouteRegexCheck($nPointer, $jPointer, $iPointer, $routeString, $requestUrl)) {
+                if (!$this->getRouteRegexCheck($nPointer, $jPointer, $iPointer, $routeString, $requestUrl)) {
                     continue;
                 }
                 $jPointer++;
@@ -175,7 +175,7 @@ 
     {
         $cPointer = $nPointer;
         $regex = in_array($cPointer, array('[', '(', '.'));
-        if (!$regex && isset($routeString[$iPointer+1])) {
+        if (!$regex && isset($routeString[$iPointer + 1])) {
             $nPointer = $routeString[$iPointer + 1];
             $regex = in_array($nPointer, array('?', '+', '*', '{'));
         }

Braces +3 added lines, -6 removed lines

@@ -84,15 +84,12 @@
         if(in_array($requestMethod, $methods)) {
             if($routeString == '*') {
                 return true;
-            }
-            elseif(isset($routeString[0]) && $routeString[0] == '@') {
+            } elseif(isset($routeString[0]) && $routeString[0] == '@') {
                 $match = preg_match('`' . substr($routeString, 1) . '`u', $requestUrl, $this->params);
                 return $match;
-            }
-            elseif (($position = strpos($routeString, '[')) === false) {
+            } elseif (($position = strpos($routeString, '[')) === false) {
                 return strcmp($requestUrl, $routeString) === 0;
-            }
-            else {
+            } else {
                 if (strncmp($requestUrl, $routeString, $position) !== 0) {
                     return false;
                 }

RouterParserInterface.php

Indentation +28 added lines, -28 removed lines

@@ -3,34 +3,34 @@
 
 interface RouterParserInterface
 {
-    /**
-     * Get the route parameters
-     *
-     * @return array
-     */
-    public function getParams();
+	/**
+	 * Get the route parameters
+	 *
+	 * @return array
+	 */
+	public function getParams();
 
-    /**
-     * Get the url from a route name
-     *
-     * @param string $basePath
-     * @param string $route
-     * @param array $params
-     *
-     * @return string
-     */
-    public function generate($basePath, $route, array $params);
+	/**
+	 * Get the url from a route name
+	 *
+	 * @param string $basePath
+	 * @param string $route
+	 * @param array $params
+	 *
+	 * @return string
+	 */
+	public function generate($basePath, $route, array $params);
 
-    /**
-     * Check if the request method match the route methods
-     * Update the $params
-     *
-     * @param string $method
-     * @param string $requestMethod
-     * @param string $routeString
-     * @param string $requestUrl
-     *
-     * @return mixed
-     */
-    public function methodMatch($method, $requestMethod, $routeString, $requestUrl);
+	/**
+	 * Check if the request method match the route methods
+	 * Update the $params
+	 *
+	 * @param string $method
+	 * @param string $requestMethod
+	 * @param string $routeString
+	 * @param string $requestUrl
+	 *
+	 * @return mixed
+	 */
+	public function methodMatch($method, $requestMethod, $routeString, $requestUrl);
 }

examples/basic/index.php

Indentation +17 added lines, -17 removed lines

@@ -27,23 +27,23 @@
 <h3>Current request: </h3>
 <pre>
      <?php
-     if($match) {
-         foreach($match as $key => $value) {
-             echo '<p>' . $key . ': ';
-             if(is_array($value)) {
-                 echo '<ul>';
-                 foreach($value as $k => $v) {
-                     echo '<li>'.$k.': '.$v.'</li>';
-                 }
-                 echo '</ul>';
-             }
-             else {
-                 echo $value;
-             }
-             echo '</p>';
-         }
-     }
-     ?>
+	 if($match) {
+		 foreach($match as $key => $value) {
+			 echo '<p>' . $key . ': ';
+			 if(is_array($value)) {
+				 echo '<ul>';
+				 foreach($value as $k => $v) {
+					 echo '<li>'.$k.': '.$v.'</li>';
+				 }
+				 echo '</ul>';
+			 }
+			 else {
+				 echo $value;
+			 }
+			 echo '</p>';
+		 }
+	 }
+	 ?>
  </pre>
 
 <h3>Try these requests: </h3>

Spacing +9 added lines, -9 removed lines

@@ -11,10 +11,10 @@ 
 $parser = new \HakimCh\Http\RouterParser();
 $router = new \HakimCh\Http\Router($parser);
 $router->setBasePath('/examples/basic');
-$router->map('GET|POST','/', 'home#index', 'home');
-$router->map('GET','/users/', array('c' => 'UserController', 'a' => 'ListAction'));
-$router->map('GET','/users/[i:id]', 'users#show', 'users_show');
-$router->map('POST','/users/[i:id]/[delete|update:action]', 'usersController#doAction', 'users_do');
+$router->map('GET|POST', '/', 'home#index', 'home');
+$router->map('GET', '/users/', array('c' => 'UserController', 'a' => 'ListAction'));
+$router->map('GET', '/users/[i:id]', 'users#show', 'users_show');
+$router->map('POST', '/users/[i:id]/[delete|update:action]', 'usersController#doAction', 'users_do');
 $router->map('GET', '/foo/[:controller]/[:action]', 'foo_action', 'foo_route');
 
 // match current request
@@ -27,13 +27,13 @@ 
 <h3>Current request: </h3>
 <pre>
      <?php
-     if($match) {
-         foreach($match as $key => $value) {
+     if ($match) {
+         foreach ($match as $key => $value) {
              echo '<p>' . $key . ': ';
-             if(is_array($value)) {
+             if (is_array($value)) {
                  echo '<ul>';
-                 foreach($value as $k => $v) {
-                     echo '<li>'.$k.': '.$v.'</li>';
+                 foreach ($value as $k => $v) {
+                     echo '<li>' . $k . ': ' . $v . '</li>';
                  }
                  echo '</ul>';
              }

Braces +1 added lines, -2 removed lines

@@ -36,8 +36,7 @@
                      echo '<li>'.$k.': '.$v.'</li>';
                  }
                  echo '</ul>';
-             }
-             else {
+             } else {
                  echo $value;
              }
              echo '</p>';