Added better Laravel support.

Author: marcj

Bootstraps/AbstractBootstrap.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace PHPPM\Bootstraps;
+
+abstract class AbstractBootstrap implements BootstrapInterface
+{
+    /**
+     * @return string
+     */
+    abstract public function getStaticDirectory();
+
+    public function requestClass() {
+        return '\Symfony\Component\HttpFoundation\Request';
+    }
+}

Bootstraps/Drupal.php

@@ -12,7 +12,7 @@
  * @see \PHPPM\Bootstraps\Symfony
  * @see \PHPPM\Bridges\HttpKernel
  */
-class Drupal implements BootstrapInterface
+class Drupal extends AbstractBootstrap
 {
     /**
      * The PHP environment in which to bootstrap (such as 'dev' or 'production').

Bootstraps/Laravel.php

@@ -37,21 +37,25 @@ public function __construct($appenv, $debug)
     }
 
     /**
-     * @return string
+     * {@inheritdoc}
      */
     public function getStaticDirectory() {
         return 'public/';
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function requestClass() {
+        return '\Illuminate\Http\Request';
+    }
+
     /**
      * Create a Laravel application
      */
     public function getApplication()
     {
-
-        if (file_exists('bootstrap/autoload.php')) {
-            require_once 'bootstrap/autoload.php';
-        }
+        require_once 'bootstrap/autoload.php';
 
         // Laravel 5 / Lumen
         if (file_exists('bootstrap/app.php')) {
@@ -67,9 +71,9 @@ public function getApplication()
             throw new \RuntimeException('Laravel bootstrap file not found');
         }
 
-        $this->app->boot();
+        $kernel = $this->app->make('Illuminate\Contracts\Http\Kernel');
 
-        return $this->app;
+        return $kernel;
     }
 
     /**

Bootstraps/Symfony.php

@@ -8,7 +8,7 @@
 /**
  * A default bootstrap for the Symfony framework
  */
-class Symfony implements BootstrapInterface, HooksInterface
+class Symfony extends AbstractBootstrap implements HooksInterface
 {
     /**
      * @var string|null The application environment

Bridges/HttpKernel.php

@@ -2,6 +2,7 @@
 
 namespace PHPPM\Bridges;
 
+use PHPPM\Bootstraps\AbstractBootstrap;
 use PHPPM\Bootstraps\BootstrapInterface;
 use PHPPM\Bootstraps\HooksInterface;
 use PHPPM\React\HttpResponse;
@@ -21,7 +22,7 @@ class HttpKernel implements BridgeInterface
     protected $application;
 
     /**
-     * @var BootstrapInterface
+     * @var AbstractBootstrap
      */
     protected $bootstrap;
 
@@ -71,7 +72,7 @@ public function onRequest(ReactRequest $request, HttpResponse $response)
             return;
         }
 
-        $syRequest = self::mapRequest($request);
+        $syRequest = $this->mapRequest($request);
 
         //start buffering the output, so cgi is not sending any http headers
         //this is necessary because it would break session handling since
@@ -90,7 +91,7 @@ public function onRequest(ReactRequest $request, HttpResponse $response)
             throw $exception;
         }
 
-        self::mapResponse($response, $syResponse);
+        $this->mapResponse($response, $syResponse);
 
         if ($this->application instanceof TerminableInterface) {
             $this->application->terminate($syRequest, $syResponse);
@@ -107,7 +108,7 @@ public function onRequest(ReactRequest $request, HttpResponse $response)
      * @param ReactRequest $reactRequest
      * @return SymfonyRequest $syRequest
      */
-    protected static function mapRequest(ReactRequest $reactRequest)
+    protected function mapRequest(ReactRequest $reactRequest)
     {
         $method = $reactRequest->getMethod();
         $headers = array_change_key_case($reactRequest->getHeaders());
@@ -125,7 +126,9 @@ protected static function mapRequest(ReactRequest $reactRequest)
         $files = $reactRequest->getFiles();
         $post = $reactRequest->getPost();
 
-        $syRequest = new SymfonyRequest($query, $post, $attributes = [], $cookies, $files, $_SERVER, $reactRequest->getBody());
+        $class = $this->bootstrap->requestClass();
+
+        $syRequest = new $class($query, $post, $attributes = [], $cookies, $files, $_SERVER, $reactRequest->getBody());
 
         $syRequest->setMethod($method);
         $syRequest->headers->replace($headers);
@@ -139,7 +142,7 @@ protected static function mapRequest(ReactRequest $reactRequest)
      * @param HttpResponse $reactResponse
      * @param SymfonyResponse $syResponse
      */
-    protected static function mapResponse(HttpResponse $reactResponse, SymfonyResponse $syResponse)
+    protected function mapResponse(HttpResponse $reactResponse, SymfonyResponse $syResponse)
     {
         $content = $syResponse->getContent();