Simplify middleware

App.php

@@ -3,15 +3,6 @@
 namespace Fw;
 
 abstract class App extends Middleware {
-    public function dispatch($env) {
-        $req = Request::createInstance($env['params'], $env['server']);
-        $res = Response::createInstance();
-
-        $this->route($req, $res);
-
-    }
-
-    abstract protected function route(Request $req, Response $res);
 
     protected function subPath($path) {
         return $this->basePath() .$path;

Middleware.php

@@ -4,7 +4,7 @@
 
 abstract class Middleware {
 
-    abstract public function __invoke($env, $next = null);
+    abstract public function __invoke($req, $res, $next = null);
 
     static private $stack;
 
@@ -13,16 +13,17 @@ static public function apply(Middleware $middleware) {
     }
 
     static public function run() {
-        $env = array('params' => $_REQUEST, 'server' => $_SERVER);
-
+        $req = Request::createInstance($_REQUEST, $_SERVER);
+        $res = Response::createInstance();
+
         $stack =& self::$stack;
 
-        $next = function($env) use (&$stack, &$next) {
+        $next = function($req, $res) use (&$stack, &$next) {
             $current = array_shift($stack);
-            return $current($env, $next);
+            return $current($req, $res, $next);
         };
 
-        return $next($env);
+        return $next($req, $res);
 
     }