Merge pull request #171 from skipperbent/v2-development

Enhancements

README.md

@@ -402,6 +402,11 @@ url('phones.edit');
 # /phones/edit/
 ```
 
+**Return the current url**
+```php
+url();
+```
+
 ## Custom CSRF verifier
 
 Create a new class and extend the ```BaseCsrfVerifier``` middleware class provided with simple-php-router.

demo-project/app/helpers.php

@@ -3,7 +3,7 @@ use Pecee\SimpleRouter\SimpleRouter;
 
 function url($controller, $parameters = null, $getParams = null)
 {
-	SimpleRouter::getRoute($controller, $parameters, $getParams);
+	SimpleRouter::getUrl($controller, $parameters, $getParams);
 }
 
 /**

src/Pecee/SimpleRouter/Route/ILoadableRoute.php

@@ -51,27 +51,4 @@ interface ILoadableRoute extends IRoute
 	 */
 	public function setName($name);
 
-	/**
-	 * Get middlewares array
-	 *
-	 * @return array
-	 */
-	public function getMiddlewares();
-
-	/**
-	 * Set middleware class-name
-	 *
-	 * @param string $middleware
-	 * @return static
-	 */
-	public function setMiddleware($middleware);
-
-	/**
-	 * Set middlewares array
-	 *
-	 * @param array $middlewares
-	 * @return $this
-	 */
-	public function setMiddlewares(array $middlewares);
-
 }

src/Pecee/SimpleRouter/Route/IRoute.php

@@ -173,4 +173,27 @@ interface IRoute
 	 */
 	public function toArray();
 
+	/**
+	 * Get middlewares array
+	 *
+	 * @return array
+	 */
+	public function getMiddlewares();
+
+	/**
+	 * Set middleware class-name
+	 *
+	 * @param string $middleware
+	 * @return static
+	 */
+	public function setMiddleware($middleware);
+
+	/**
+	 * Set middlewares array
+	 *
+	 * @param array $middlewares
+	 * @return $this
+	 */
+	public function setMiddlewares(array $middlewares);
+
 }

src/Pecee/SimpleRouter/Route/LoadableRoute.php

@@ -11,7 +11,6 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
 
 	protected $url;
 	protected $name;
-	protected $middlewares = [];
 
 	/**
 	 * Loads and renders middlewares-classes
@@ -155,22 +154,6 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
 		return $this;
 	}
 
-	/**
-	 * Export route settings to array so they can be merged with another route.
-	 *
-	 * @return array
-	 */
-	public function toArray()
-	{
-		$values = [];
-
-		if (count($this->middlewares) > 0) {
-			$values['middleware'] = $this->middlewares;
-		}
-
-		return array_merge(parent::toArray(), $values);
-	}
-
 	/**
 	 * Merge with information from another route.
 	 *
@@ -192,48 +175,9 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
 			$this->setUrl($values['prefix'] . $this->getUrl());
 		}
 
-		// Push middleware if multiple
-		if (isset($values['middleware'])) {
-			$this->setMiddlewares(array_merge((array)$values['middleware'], $this->middlewares));
-		}
-
 		parent::setSettings($values, $merge);
 
 		return $this;
 	}
 
-	/**
-	 * Set middleware class-name
-	 *
-	 * @param string $middleware
-	 * @return static
-	 */
-	public function setMiddleware($middleware)
-	{
-		$this->middlewares[] = $middleware;
-
-		return $this;
-	}
-
-	/**
-	 * Set middlewares array
-	 *
-	 * @param array $middlewares
-	 * @return $this
-	 */
-	public function setMiddlewares(array $middlewares)
-	{
-		$this->middlewares = $middlewares;
-
-		return $this;
-	}
-
-	/**
-	 * @return string|array
-	 */
-	public function getMiddlewares()
-	{
-		return $this->middlewares;
-	}
-
 }

src/Pecee/SimpleRouter/Route/Route.php

@@ -36,6 +36,7 @@ abstract class Route implements IRoute
 	protected $requestMethods = [];
 	protected $where = [];
 	protected $parameters = [];
+	protected $middlewares = [];
 
 	public function renderRoute(Request $request)
 	{
@@ -380,6 +381,10 @@ abstract class Route implements IRoute
 			$values['parameters'] = $this->parameters;
 		}
 
+		if (count($this->middlewares) > 0) {
+			$values['middleware'] = $this->middlewares;
+		}
+
 		return $values;
 	}
 
@@ -408,6 +413,11 @@ abstract class Route implements IRoute
 			$this->setParameters(array_merge($this->parameters, (array)$values['parameters']));
 		}
 
+		// Push middleware if multiple
+		if (isset($values['middleware'])) {
+			$this->setMiddlewares(array_merge((array)$values['middleware'], $this->middlewares));
+		}
+
 		return $this;
 	}
 
@@ -470,4 +480,38 @@ abstract class Route implements IRoute
 		return $this;
 	}
 
+	/**
+	 * Set middleware class-name
+	 *
+	 * @param string $middleware
+	 * @return static
+	 */
+	public function setMiddleware($middleware)
+	{
+		$this->middlewares[] = $middleware;
+
+		return $this;
+	}
+
+	/**
+	 * Set middlewares array
+	 *
+	 * @param array $middlewares
+	 * @return $this
+	 */
+	public function setMiddlewares(array $middlewares)
+	{
+		$this->middlewares = $middlewares;
+
+		return $this;
+	}
+
+	/**
+	 * @return string|array
+	 */
+	public function getMiddlewares()
+	{
+		return $this->middlewares;
+	}
+
 }

src/Pecee/SimpleRouter/Router.php

@@ -396,7 +396,8 @@ class Router
 
 		/* Return current route if no options has been specified */
 		if ($name === null && $parameters === null) {
-			return '/' . trim(parse_url($this->request->getUri(), PHP_URL_PATH), '/') . '/' . $this->arrayToParams($getParams);
+			$url = rtrim(parse_url($this->request->getUri(), PHP_URL_PATH), '/');
+			return (($url === '') ? '/' : $url . '/') . $this->arrayToParams($getParams);
 		}
 
 		/* If nothing is defined and a route is loaded we use that */
@@ -434,8 +435,7 @@ class Router
 		}
 
 		/* No result so we assume that someone is using a hardcoded url and join everything together. */
-
-		return '/' . trim(join('/', array_merge((array)$name, (array)$parameters)), '/') . '/' . $this->arrayToParams($getParams);
+		return '/' . trim(join('/', array_merge((array)$name, (array)$parameters)), '/') . $this->arrayToParams($getParams);
 	}
 
 	/**

test/GroupTest.php

@@ -87,8 +87,8 @@ class GroupTest extends PHPUnit_Framework_TestCase
 
 		SimpleRouter::start();
 
-		$this->assertEquals('/my/fancy/url/1/', SimpleRouter::getRoute('fancy1'));
-		$this->assertEquals('/my/fancy/url/2/', SimpleRouter::getRoute('fancy2'));
+		$this->assertEquals('/my/fancy/url/1/', SimpleRouter::getUrl('fancy1'));
+		$this->assertEquals('/my/fancy/url/2/', SimpleRouter::getUrl('fancy2'));
 
 	}
 

test/RouterUrlTest.php

@@ -11,7 +11,7 @@ class RouterUrlTest extends PHPUnit_Framework_TestCase
 	protected $result = false;
 
 	protected function getUrl($name = null, $parameters = null, array $getParams = []) {
-		return SimpleRouter::getRoute($name, $parameters, $getParams);
+		return SimpleRouter::getUrl($name, $parameters, $getParams);
 	}
 
 	public function testUrls()