Router changes

Added possibility for Router to work without rewrite engine on

README.md

@@ -10,7 +10,7 @@ Features:
 
    * Model View Controller
    * Session Managment and Login
-   * Router
+   * Routing
    * Dependency Injections
    * Storage Manager for data base and cache
    * PSR4 Autoloader

src/Linna/DI/DIResolver.php

@@ -13,8 +13,6 @@
 
 class DIResolver
 {
-    //private $class;
-
     private $cache = array();
 
     private $dependencyTree = array();
@@ -25,13 +23,10 @@ public function __construct()
 
     public function resolve($resolveClass)
     {
-        //$this->class = $class;
-
         $this->buildDependencyTree(0, $resolveClass);
 
         $this->buildObjects();
 
-        //return $this->getCache($this->class);
         return $this->getCache($resolveClass);
     }
 
@@ -63,7 +58,7 @@ private function buildObjects()
     {
         //reverse array for build first required classes
         $array = array_reverse($this->dependencyTree);
-
+        
         //deep dependency level
         foreach ($array as $key => $value) {
 

src/Linna/Http/Route.php

@@ -17,13 +17,6 @@
  */
 class Route implements RouteInterface
 {
-    /**
-     * @var int $typeOfRoute Indicates that route point at controller, method etc...
-     *
-     * @deprecated since 0.3.1 After front controller refactor this method become unnecessary
-     */
-    protected $typeOfRoute = null;
-
     /**
      * @var string $name Route name
      */
@@ -59,8 +52,6 @@ class Route implements RouteInterface
      */
     protected $param = array();
 
-
-
     /**
      * Contructor
      *
@@ -81,45 +72,6 @@ public function __construct($name, $method, $model, $view, $controller, $action,
         $this->controller = $controller;
         $this->action = $action;
         $this->param = $param;
-        //$this->typeOfRoute = $this->type();
-    }
-
-    /**
-     * Type of route identifiend by a number
-     * 1 for controller default method
-     * 2 for controller with custom method
-     * 3 for controller with custom method passing parameter
-     *
-     * @deprecated since 0.3.1 After front controller refactor this method become unnecessary
-     * @return int Type of route
-     */
-    protected function type()
-    {
-        $type = null;
-
-        if ($this->controller !== null) {
-            $type = 1;
-        }
-
-        if ($this->action !== null) {
-            $type = 2;
-        }
-
-        if (sizeof($this->param) > 0) {
-            $type = 3;
-        }
-
-        return $type;
-    }
-
-    /**
-     * Return type of route
-     *
-     * @return int Type of route
-     */
-    public function getType()
-    {
-        return $this->typeOfRoute;
     }
 
     /**

src/Linna/Http/RouteInterface.php

@@ -28,12 +28,6 @@ interface RouteInterface
      */
     public function __construct($name, $method, $model, $view, $controller, $action, $param);
 
-    /**
-     * Return type of route
-     *
-     */
-    public function getType();
-
     /**
      * Return controller
      *

src/Linna/Http/Router.php

@@ -27,7 +27,8 @@ class Router
      */
     protected $options = array(
         'basePath' => '/',
-        'badRoute' => ''
+        'badRoute' => '',
+        'rewriteMode' => false
     );
 
     /**
@@ -198,6 +199,10 @@ protected function buildParam($validRoute)
      */
     protected function getCurrentUri($passedUri)
     {
+        if ($this->options['rewriteMode'] === false) {
+            $passedUri = str_replace('/index.php?/', '', $passedUri);
+        }
+
         $url = isset($passedUri) ? $passedUri : '/';
         $url = filter_var($url, FILTER_SANITIZE_URL);