Fixed headers already sent issues with php-cgi.

Author: marcj

Bootstraps/HooksInterface.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace PHPPM\Bootstraps;
+
+interface HooksInterface {
+    public function preHandle($app);
+    public function postHandle($app);
+}

Bootstraps/Laravel.php

@@ -2,12 +2,10 @@
 
 namespace PHPPM\Bootstraps;
 
-use Stack\Builder;
-
 /**
  * A default bootstrap for the Laravel framework
  */
-class Laravel implements BootstrapInterface
+class Laravel implements BootstrapInterface, HooksInterface
 {
     /**
      * @var string|null The application environment
@@ -73,4 +71,20 @@ public function getApplication()
 
         return $this->app;
     }
+
+    /**
+     * @param \Illuminate\Contracts\Foundation\Application $app
+     */
+    public function preHandle($app)
+    {
+        //reset const LARAVEL_START, to get the correct timing
+    }
+
+    /**
+     * @param \Illuminate\Contracts\Foundation\Application $app
+     */
+    public function postHandle($app)
+    {
+        //reset debugbar if available
+    }
 }

Bootstraps/Symfony.php

@@ -1,12 +1,13 @@
 <?php
 
 namespace PHPPM\Bootstraps;
+
 use Symfony\Component\HttpFoundation\Request;
 
 /**
  * A default bootstrap for the Symfony framework
  */
-class Symfony implements BootstrapInterface
+class Symfony implements BootstrapInterface, HooksInterface
 {
     /**
      * @var string|null The application environment
@@ -30,13 +31,15 @@ public function __construct($appenv, $debug)
     /**
      * @return string
      */
-    public function getStaticDirectory() {
+    public function getStaticDirectory()
+    {
         return 'web/';
     }
 
     /**
      * Create a Symfony application
-     * @return SymfonyAppKernel
+     *
+     * @return \AppKernel
      */
     public function getApplication()
     {
@@ -48,7 +51,7 @@ public function getApplication()
             require './vendor/autoload.php';
         }
 
-        $app = new SymfonyAppKernel($this->appenv, $this->debug); //which extends \AppKernel
+        $app = new \AppKernel($this->appenv, $this->debug);
         $app->loadClassCache();
         $app->boot();
 
@@ -59,4 +62,40 @@ public function getApplication()
 
         return $app;
     }
+
+    /**
+     * Does some necessary preparation before each request.
+     *
+     * @param \AppKernel $app
+     */
+    public function preHandle($app)
+    {
+        //resets Kernels startTime, so Symfony can correctly calculate the execution time
+        \Closure::bind(
+            function () {
+                $this->startTime = microtime(true);
+            },
+            $app,
+            'AppKernel'
+        )->call($app);
+    }
+
+    /**
+     * Does some necessary clean up after each request.
+     *
+     * @param \AppKernel $app
+     */
+    public function postHandle($app)
+    {
+        //resets stopwatch, so it can correctly calculate the execution time
+        if ($app->getContainer()->has('debug.stopwatch')) {
+            $app->getContainer()->get('debug.stopwatch')->__construct();
+        }
+
+        if ($app->getContainer()->has('profiler')) {
+            // since Symfony does not reset Profiler::disable() calls after each request, we need to do it,
+            // so the profiler bar is visible after the second request as well.
+            $app->getContainer()->get('profiler')->enable();
+        }
+    }
 }

Bootstraps/SymfonyAppKernel.php

@@ -3,7 +3,7 @@
 namespace PHPPM\Bridges;
 
 use PHPPM\Bootstraps\BootstrapInterface;
-use PHPPM\Bootstraps\SymfonyAppKernel;
+use PHPPM\Bootstraps\HooksInterface;
 use PHPPM\React\HttpResponse;
 use React\Http\Request as ReactRequest;
 use Symfony\Component\HttpFoundation\Cookie;
@@ -73,9 +73,14 @@ public function onRequest(ReactRequest $request, HttpResponse $response)
 
         $syRequest = self::mapRequest($request);
 
+        //start buffering the output, so cgi is not sending any http headers
+        //this is necessary because it would break session handling since
+        //headers_sent() returns true if any unbuffered output reaches cgi stdout.
+        ob_start();
+
         try {
-            if ($this->application instanceof SymfonyAppKernel) {
-                $this->application->preHandle();
+            if ($this->bootstrap instanceof HooksInterface) {
+                $this->bootstrap->preHandle($this->application);
             }
 
             $syResponse = $this->application->handle($syRequest);
@@ -91,8 +96,8 @@ public function onRequest(ReactRequest $request, HttpResponse $response)
             $this->application->terminate($syRequest, $syResponse);
         }
 
-        if ($this->application instanceof SymfonyAppKernel) {
-            $this->application->postHandle();
+        if ($this->bootstrap instanceof HooksInterface) {
+            $this->bootstrap->postHandle($this->application);
         }
     }
 
@@ -169,7 +174,14 @@ protected static function mapResponse(HttpResponse $reactResponse, SymfonyRespon
         $headers['Set-Cookie'] = $cookies;
 
         $reactResponse->writeHead($syResponse->getStatusCode(), $headers);
-        $reactResponse->end($content);
+
+        $stdOut = '';
+        while ($buffer = @ob_get_clean()) {
+            $stdOut .= $buffer;
+        }
+
+        $reactResponse->end($stdOut . $content);
+
     }
 
     /**