dev 2020-10

src/App/Request.php

@@ -2,12 +2,15 @@
 
 namespace KarmaFW\App;
 
+use \KarmaFW\Routing\Route;
+
 
 class Request
 {
 	protected $url = null;
 	protected $method = null;
 	protected $client_ip = null;
+	protected $route = null;
 	public $GET = null;
 	public $POST = null;
 	public $COOKIE = null;
@@ -17,7 +20,7 @@ class Request
 	public $SERVER = null;
 
 
-	public function __construct($url, $method)
+	public function __construct($url=null, $method=null)
 	{
 		$this->url = $url;
 		$this->method = $method;
@@ -113,6 +116,16 @@ class Request
 		$this->client_ip = $client_ip;
 	}
 
+	public function getRoute()
+	{
+		return $this->route;
+	}
+
+	public function setRoute(Route $route)
+	{
+		$this->route = $route;
+	}
+
 	public function isSecure()
 	{
 		return (! empty($this->SERVER['HTTPS']) && $this->SERVER['HTTPS'] == 'On')

src/App/Response.php

@@ -74,7 +74,7 @@ class Response
 	{
 		$this->status = $status;
 
-		$status_name = isset(self::http_status_codes[$status]) ? self::http_status_codes[$status] : "Unknown status";
+		$status_name = ! empty(self::http_status_codes[$status]) ? self::http_status_codes[$status] : "Unknown status";
 		$this->status_name = $status_name;
 	}
 

src/Routing/Controllers/WebAppController.php

@@ -21,7 +21,7 @@ class WebAppController extends AppController
 	protected $flash;
 
 	
-	public function __construct(Request $request, Response $response, $route=null)
+	public function __construct(Request $request, Response $response)
 	{
 		parent::__construct($request, $response);
 
@@ -30,7 +30,8 @@ class WebAppController extends AppController
 
 		$this->request_uri = $request->SERVER['REQUEST_URI'];
 		$this->request_method = $request->SERVER['REQUEST_METHOD'];
-		$this->route = $route;
+		$this->route = $request->getRoute();
+		
 
 		if (defined('USE_HOOKS') && USE_HOOKS) {
 			HooksManager::applyHook('webcontroller.before', [$this]);

src/Routing/Router.php

@@ -217,6 +217,8 @@ class Router
 			$match = $route->match($request_method, $request_uri);
 
 			if ($match) {
+				$request->setRoute($route);
+
 				$before_callback = $route->getBeforeCallback();
 				if (! empty($before_callback)) {
 					$before_callback($route);