Merge pull request #20 from mary-shelley/feature/modules

Removed app factory support in favor of DiC

src/App.php

@@ -23,9 +23,6 @@ public function __construct(UrlMatcher $router, AnnotExecutor $executor)
 
     public function run(Request $request, Response $response)
     {
-        $this->request = $request;
-        $this->response = $response;
-
         try {
             $matched = $this->getRouter()->matchRequest($request);
             $response = $this->getExecutor()->execute($request, $response, $matched);

src/Executor/AnnotExecutor.php

@@ -33,14 +33,12 @@ public function execute(Request $request, Response $response, array $matched)
         $controller = $matched["controller"];
 
         try {
-            $this->limiter = [];
             $this->executeActionsFor($controller, $action, Before::class, $matched, false);
 
             $controller = $this->getContainer()->get($controller);
             $data = array_diff_key($matched, array_flip(["annotation", "_route", "controller", "action"]));
             $actionReturn = $this->call([$controller, $action], array_merge([$request, $response], $data));
 
-            $this->limiter = [];
             $this->executeActionsFor($controller, $action, After::class, $actionReturn, true);
         } catch (ShortcutException $e) {
             $response = $e->getResponse();
@@ -51,6 +49,7 @@ public function execute(Request $request, Response $response, array $matched)
 
     private function executeActionsFor($controller, $action, $filterClass, $data = null, $after = false)
     {
+        $this->limiter = [];
         $methodAnnotations = $this->getReader()->getMethodAnnotationsFor($controller, $action, $filterClass);
         $this->executeSteps($methodAnnotations, [$this, __FUNCTION__], $filterClass, $data, $after);