@@ -3,6 +3,7 @@

 namespace elanpl\L3;

 class Application{

+    public $Config; // L3 Config object

     public $Request; // build from received HTTP request

     public $Response; // response to be send

     public $Router; // routing engine

@@ -16,13 +17,16 @@ class Application{

     //public $Module; //Active module

     //public $Action; //Active action

-    public function __construct(){

+    public function __construct($config){

+        //set L3 application config

+        $this->Config = $config;

         //create request object

-        $this->Request = new Request();

+        $this->Request = $this->Config->getRequest();

+        //create router object

+        $this->Router = new Router($this->Config->getRouting());

         //create response objcet

         $this->Response = new Response();

-        //create router object

-        $this->Router = new Router();

+

         //create serialization object

         $this->Serialization = new Serialization(); 

     }

new file mode 100644

@@ -0,0 +1,13 @@

+<?php

+

+namespace elanpl\L3;

+

+class Config{

+    public function getRequest(){

+        return new Request();

+    }

+

+    public function getRouting(){

+        return new app\config\routing();

+    }

+}

\ No newline at end of file

@@ -10,6 +10,7 @@ class Request{

     public $AcceptLanguage;

     public $UserAgent;

     public $Headers;

+    public $Body;

     public function __construct(){

         if(isset($_GET['path']))

             $this->Path = $_GET['path'];

@@ -31,6 +32,9 @@ class Request{

                 $this->Headers[$header] = $value;

             }

         }

+        if (php_sapi_name() != "cli") {

+            $this->Body = file_get_contents('php://input');

+        }

     }

     public function ParseAccept($accept){

@@ -4,71 +4,71 @@ namespace elanpl\L3;

 class Router{

-    //protected static $_instance; // object instance (for fluent api)

-    protected static $routes; // The defined routes collection

-    protected static $parsedParameters; // Parameters parsed from Request Path

-    protected static $depth; // Number of nested nodes in Request Path

-    protected static $routeNameIndex; // An array with elements that reference to the routes ordered by a route names

-    public static $RouteInfo; // The RouteInfo objcet if the route was matched

-

-    public function __construct()

+    protected $routes; // The defined routes collection

+    protected $parsedParameters; // Parameters parsed from Request Path

+    protected $depth; // Number of nested nodes in Request Path

+    protected $routeNameIndex; // An array with elements that reference to the routes ordered by a route names

+    public $RouteInfo; // The RouteInfo objcet if the route was matched

+

+    public function __construct($routing)

     {

-        //if(!isset(self::$_instance)) self::$_instance = new self;

-        if(!isset(self::$routes)) self::$routes = array(); 

-        if(!isset(self::$routeNameIndex)) self::$routeNameIndex= array();

+        $this->routes = array(); 

+        $this->routeNameIndex = array();

+        //Set the routing from configuration object

+        $routing->set($this);

     }

-    public static function add($Method, $Path, $Result, $Name = ''){

-        self::$routes[] = new RouteInfo($Method, $Path, $Result, $Name);

-        if(isset($Name)&&$Name!='') self::$routeNameIndex[$Name] = &self::$routes[count(self::$routes)-1];

-        return new self;

+    public function add($Method, $Path, $Result, $Name = ''){

+        $this->routes[] = new RouteInfo($Method, $Path, $Result, $Name);

+        if(isset($Name)&&$Name!='') $this->routeNameIndex[$Name] = &$this->routes[count($this->routes)-1];

+        return $this;

     }

-    public static function get($Path, $Result, $Name = ''){

-        return self::add('GET', $Path, $Result, $Name);

+    public function get($Path, $Result, $Name = ''){

+        return $this->add('GET', $Path, $Result, $Name);

     }

-    public static function post($Path, $Result, $Name = ''){

-        return self::add('POST', $Path, $Result, $Name);

+    public function post($Path, $Result, $Name = ''){

+        return $this->add('POST', $Path, $Result, $Name);

     }

-    public static function put($Path, $Result, $Name = ''){

-        return self::add('PUT', $Path, $Result, $Name);

+    public function put($Path, $Result, $Name = ''){

+        return $this->add('PUT', $Path, $Result, $Name);

     }

-    public static function patch($Path, $Result, $Name = ''){

-        return self::add('PATCH', $Path, $Result, $Name);

+    public function patch($Path, $Result, $Name = ''){

+        return $this->add('PATCH', $Path, $Result, $Name);

     }

-    public static function delete($Path, $Result, $Name = ''){

-        return self::add('DELETE', $Path, $Result, $Name);

+    public function delete($Path, $Result, $Name = ''){

+        return $this->add('DELETE', $Path, $Result, $Name);

     }

-    public static function any($Path, $Result, $Name = ''){

-        return self::add('ANY', $Path, $Result, $Name);

+    public function any($Path, $Result, $Name = ''){

+        return $this->add('ANY', $Path, $Result, $Name);

     }

-    public static function AddBeforeAction($event_handler){

-        self::$routes[count(self::$routes)-1]->AddBeforeAction($event_handler);

-        return new self;

+    public function AddBeforeAction($event_handler){

+        $this->routes[count($this->routes)-1]->AddBeforeAction($event_handler);

+        return $this;

     }

-    public static function AddAfterAction($event_handler){

-        self::$routes[count(self::$routes)-1]->AddAfterAction($event_handler);

-        return new self;

+    public function AddAfterAction($event_handler){

+        $this->routes[count($this->routes)-1]->AddAfterAction($event_handler);

+        return $this;

     }

-    public static function AddAfterResult($event_handler){

-        self::$routes[count(self::$routes)-1]->AddAfterAction($event_handler);

-        return new self;

+    public function AddAfterResult($event_handler){

+        $this->routes[count($this->routes)-1]->AddAfterAction($event_handler);

+        return $this;

     }

-    public static function match($Request){

+    public function match($Request){

         $auri = explode('/', trim($Request->Path, "/ \t\n\r\0\x0B"));

         $curi = count($auri);

-        foreach (self::$routes as $routeInfo) {

+        foreach ($this->routes as $routeInfo) {

             $route = $routeInfo->Path;

             $method = $routeInfo->Method;

@@ -95,12 +95,12 @@ class Router{

                                 $value = intval($value);

                             }

                             //value store...

-                            self::$parsedParameters[$valueKey[0]] = $value;

+                            $this->parsedParameters[$valueKey[0]] = $value;

                         }

                     }

                     if($matchResult){ // match found

-                        self::$depth = $curi;

-                        self::$RouteInfo = $routeInfo;

+                        $this->depth = $curi;

+                        $this->RouteInfo = $routeInfo;

                         return $routeInfo->Result;

                     }

                 }

@@ -109,8 +109,8 @@ class Router{

         return false;

     }

-    public static function link($name, $parameters){

-        $route = self::$routeNameIndex[$name];

+    public function link($name, $parameters){

+        $route = $this->routeNameIndex[$name];

         $fields = array_keys($parameters);

         $values = array_values($parameters);

         array_walk($fields, function (&$item, $key){

@@ -119,30 +119,8 @@ class Router{

         return preg_replace($fields, $values, $route->Path);

     }

-    public function __get($name)

-    {

-        if($name=="routes") return self::$routes;

-        if($name=="parsedParameters") return self::$parsedParameters;

-        if($name=="depth") return self::$depth;

-        if($name=="RouteInfo") return self::$RouteInfo;

-    }

-

-    public function __call($name, $arguments)

-    {

-        if($name == 'GetParameter'){

-            return self::$parsedParameters[$arguments[0]];

-        }

-        // Note: value of $name is case sensitive.

-        $allowed_methods = ['add', 'post', 'any', 'get', 'match', 'AddBeforeAction', 'AddAfterAction', 'AddAfterResult'];

-

-        if(in_array($name, $allowed_methods)){

-            $the_method = new \ReflectionMethod($this, $name);

-            $the_method->invokeArgs(NULL,$arguments);

-        }

-        else{

-            throw new \Exception("Call undefined or inaccesible method ".get_class($this)."::$name");

-        }

-        

+    public function GetParameter($name){

+        return $this->parsedParameters[$name];

     }

 }

\ No newline at end of file