Merge pull request #35 from andig/deps

Fix #34

Author: marcj

Bootstraps/AbstractBootstrap.php

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

Bootstraps/Drupal.php

@@ -5,7 +5,7 @@
 /**
  * A default bootstrap for the Laravel framework
  */
-class Laravel implements BootstrapInterface, HooksInterface
+class Laravel implements BootstrapInterface, HooksInterface, RequestClassProviderInterface
 {
     /**
      * @var string|null The application environment

Bootstraps/Laravel.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace PHPPM\Bootstraps;
+
+/**
+ * Implement this interface if HttpKernel bridge needs to return a specialized request class
+ */
+interface RequestClassProviderInterface
+{
+    public function requestClass();
+}

Bootstraps/RequestClassProviderInterface.php

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

Bootstraps/Symfony.php

@@ -2,9 +2,9 @@
 
 namespace PHPPM\Bridges;
 
-use PHPPM\Bootstraps\AbstractBootstrap;
 use PHPPM\Bootstraps\BootstrapInterface;
 use PHPPM\Bootstraps\HooksInterface;
+use PHPPM\Bootstraps\RequestClassProviderInterface;
 use PHPPM\React\HttpResponse;
 use PHPPM\Utils;
 use React\Http\Request as ReactRequest;
@@ -24,7 +24,7 @@ class HttpKernel implements BridgeInterface
     protected $application;
 
     /**
-     * @var AbstractBootstrap
+     * @var BootstrapInterface
      */
     protected $bootstrap;
 
@@ -147,7 +147,12 @@ protected function mapRequest(ReactRequest $reactRequest)
         $files = $reactRequest->getFiles();
         $post = $reactRequest->getPost();
 
-        $class = $this->bootstrap->requestClass();
+        if ($this->bootstrap instanceof RequestClassProviderInterface) {
+            $class = $this->bootstrap->requestClass();
+        }
+        else {
+            $class = '\Symfony\Component\HttpFoundation\Request';
+        }
 
         $syRequest = new $class($query, $post, $attributes = [], $cookies, $files, $_SERVER, $reactRequest->getBody());