From 3648796dfcccacdff75af1ae5a310df853c12bca Mon Sep 17 00:00:00 2001
From: andig <cpuidle@gmx.de>
Date: Fri, 29 Apr 2016 15:56:36 +0200
Subject: [PATCH] Fix https://github.com/php-pm/php-pm-httpkernel/issues/34

---
 Bootstraps/AbstractBootstrap.php             | 15 ---------------
 Bootstraps/Drupal.php                        |  2 +-
 Bootstraps/Laravel.php                       |  2 +-
 Bootstraps/RequestClassProviderInterface.php | 11 +++++++++++
 Bootstraps/Symfony.php                       |  2 +-
 Bridges/HttpKernel.php                       | 11 ++++++++---
 6 files changed, 22 insertions(+), 21 deletions(-)
 delete mode 100644 Bootstraps/AbstractBootstrap.php
 create mode 100644 Bootstraps/RequestClassProviderInterface.php

diff --git a/Bootstraps/AbstractBootstrap.php b/Bootstraps/AbstractBootstrap.php
deleted file mode 100644
index 729ca44..0000000
--- a/Bootstraps/AbstractBootstrap.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace PHPPM\Bootstraps;
-
-abstract class AbstractBootstrap implements BootstrapInterface
-{
-    /**
-     * @return string
-     */
-    abstract public function getStaticDirectory();
-
-    public function requestClass() {
-        return '\Symfony\Component\HttpFoundation\Request';
-    }
-}
\ No newline at end of file
diff --git a/Bootstraps/Drupal.php b/Bootstraps/Drupal.php
index 5c84fdc..e15adac 100644
--- a/Bootstraps/Drupal.php
+++ b/Bootstraps/Drupal.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').
diff --git a/Bootstraps/Laravel.php b/Bootstraps/Laravel.php
index 4d6d13d..de19395 100644
--- a/Bootstraps/Laravel.php
+++ b/Bootstraps/Laravel.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
diff --git a/Bootstraps/RequestClassProviderInterface.php b/Bootstraps/RequestClassProviderInterface.php
new file mode 100644
index 0000000..df3e3c6
--- /dev/null
+++ b/Bootstraps/RequestClassProviderInterface.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();
+}
\ No newline at end of file
diff --git a/Bootstraps/Symfony.php b/Bootstraps/Symfony.php
index 9d56288..3e6daff 100644
--- a/Bootstraps/Symfony.php
+++ b/Bootstraps/Symfony.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
diff --git a/Bridges/HttpKernel.php b/Bridges/HttpKernel.php
index a65460b..51793ff 100644
--- a/Bridges/HttpKernel.php
+++ b/Bridges/HttpKernel.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;
@@ -23,7 +23,7 @@ class HttpKernel implements BridgeInterface
     protected $application;
 
     /**
-     * @var AbstractBootstrap
+     * @var BootstrapInterface
      */
     protected $bootstrap;
 
@@ -146,7 +146,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());