Merge pull request #9 from cspray/0.5.0-dev

0.5.0 dev

Author: cspray

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## v0.5.0 - 2016-02-14
+
+- **BC BREAK** Renames `Services::createInjector` to `Services::wireObjectGraph` and allows an Injector to be passed to 
+  add services instead of simply creating a new Injector.
+- Adds a new event `Engine::RESPONSE_SENT_EVENT` that will be triggered *everytime* a Response is sent to the user. Before
+  this change there was no guaranteed mechanism for capturing the Response sent to the user. While the
+  `Engine::AFTER_CONTROLLER_EVENT` does provide the Response it is not guaranteed to be emitted on every Request (e.g. 
+  an Exception is thrown or a Response is set in a `Engine::BEFORE_CONTROLLER_EVENT` listener).
+
 ## v0.4.0 - 2016-02-13
 
 - Updates FastRoute to 0.7.0

src/Engine.php

@@ -14,8 +14,8 @@
 use Cspray\Labrador\CoreEngine;
 use Cspray\Labrador\Http\Event\AfterControllerEvent;
 use Cspray\Labrador\Http\Event\BeforeControllerEvent;
+use Cspray\Labrador\Http\Event\ResponseSentEvent;
 use Cspray\Labrador\PluginManager;
-use Cspray\Labrador\Event\AppExecuteEvent;
 use Cspray\Labrador\Http\Router\Router;
 use Cspray\Labrador\Http\Exception\InvalidTypeException;
 use Symfony\Component\HttpFoundation\Request;
@@ -26,10 +26,10 @@ class Engine extends CoreEngine {
 
     const BEFORE_CONTROLLER_EVENT = 'labrador.http.before_controller';
     const AFTER_CONTROLLER_EVENT = 'labrador.http.after_controller';
+    const RESPONSE_SENT_EVENT = 'labrador.http.response_sent';
 
     private $emitter;
     private $router;
-    private $eventFactory;
 
     /**
      * @param Router $router
@@ -48,7 +48,12 @@ public function __construct(
 
     public function run(Request $req = null) {
         $cb = function() use($req) {
-            $this->handleRequest($req ?? Request::createFromGlobals())->send();
+            $request = $req ?? Request::createFromGlobals();
+            $response = $this->handleRequest($request);
+            $response->send();
+
+            $event = new ResponseSentEvent($request, $response);
+            $this->emitter->emit($event);
         };
         $cb = $cb->bindTo($this);
         $this->emitter->addListener(self::APP_EXECUTE_EVENT, $cb);

src/Event/ResponseSentEvent.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types = 1);
+
+/**
+ * @license See LICENSE file in project root
+ */
+
+namespace Cspray\Labrador\Http\Event;
+
+use Cspray\Labrador\Http\Engine;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class ResponseSentEvent extends HttpEvent {
+
+    public function __construct(Request $request, Response $response) {
+        parent::__construct($request, Engine::RESPONSE_SENT_EVENT);
+        $this->setResponse($response);
+    }
+
+}

src/Services.php

@@ -31,14 +31,8 @@
 
 class Services {
 
-    public function createInjector() {
-        $injector = new Injector();
-        $this->wireObjectGraph($injector);
-
-        return $injector;
-    }
-
-    private function wireObjectGraph(Injector $injector) {
+    public function wireObjectGraph(Injector $injector = null) : Injector {
+        $injector = $injector ?? new Injector();
         $injector->share($injector);
         $this->registerCoreLabradorServices($injector);
         $this->registerCoreHttpServices($injector);

src/_functions.php

@@ -11,12 +11,11 @@
 use Cspray\Labrador\Engine;
 use Cspray\Labrador\Event\ExceptionThrownEvent;
 use Cspray\Labrador\Http\Services as HttpServices;
-use Cspray\Labrador\EnvironmentIntegrationConfig;
 use Auryn\Injector;
 use Whoops\Run;
 
 function bootstrap() : Injector {
-    $injector = (new HttpServices())->createInjector();
+    $injector = (new HttpServices())->wireObjectGraph();
 
     $run = $injector->make(Run::class);
 

test/EngineTest.php

@@ -10,6 +10,7 @@
 namespace Cspray\Labrador\Http\Test;
 
 use Cspray\Labrador\Event\ExceptionThrownEvent;
+use Cspray\Labrador\Http\Event\ResponseSentEvent;
 use Cspray\Labrador\PluginManager;
 use Cspray\Labrador\Http\Event\BeforeControllerEvent;
 use Cspray\Labrador\Http\Event\AfterControllerEvent;
@@ -65,6 +66,7 @@ public function eventEmittingOrderProvider() {
         return [
             [0, Engine::BEFORE_CONTROLLER_EVENT, BeforeControllerEvent::class],
             [1, Engine::AFTER_CONTROLLER_EVENT, AfterControllerEvent::class],
+            [2, Engine::RESPONSE_SENT_EVENT, ResponseSentEvent::class]
         ];
     }