Merge pull request #34 from RyanNerd/revert-pr31

Revert PR #31 - Output buffering in error handlers

Author: mnapoli

composer.json

@@ -17,7 +17,7 @@
         "php": "~5.5|~7.0",
         "php-di/php-di": "^5.2.0",
         "php-di/invoker": "^1.2.0",
-        "slim/slim": "^3.4.0"
+        "slim/slim": "^3.9.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.8.36"

src/config.php

@@ -39,9 +39,9 @@
         ->method('setCacheFile', DI\get('settings.routerCacheFile')),
     Slim\Router::class => DI\get('router'),
     'errorHandler' => DI\object(Slim\Handlers\Error::class)
-        ->constructor(DI\get('settings.displayErrorDetails'), DI\get('settings.outputBuffering')),
+        ->constructor(DI\get('settings.displayErrorDetails')),
     'phpErrorHandler' => DI\object(Slim\Handlers\PhpError::class)
-        ->constructor(DI\get('settings.displayErrorDetails'), DI\get('settings.outputBuffering')),
+        ->constructor(DI\get('settings.displayErrorDetails')),
     'notFoundHandler' => DI\object(Slim\Handlers\NotFound::class),
     'notAllowedHandler' => DI\object(Slim\Handlers\NotAllowed::class),
     'environment' => function () {

tests/ErrorTest.php

@@ -8,7 +8,6 @@
 use PHPUnit\Framework\TestCase;
 use DI\Bridge\Slim\Test\Mock\RequestFactory;
 use Slim\Http\Response;
-use Throwable;
 
 class ErrorTest extends TestCase
 {
@@ -32,7 +31,7 @@ public function default_exception_handling()
 
         /** @var Error $error */
         $error = $c->get('errorHandler');
-        $response = $error(RequestFactory::create('/'), new Response(), new TestException());
+        $response = $error(RequestFactory::create('/'), new Response(), new \Exception());
         $reasonPhrase = $response->getReasonPhrase();
         $this->assertEquals('Internal Server Error', $reasonPhrase);
 
@@ -52,10 +51,10 @@ public function custom_exception_handling()
         ini_set('error_log', $logFile);
 
         $app = new BridgeApp(
-                [
-                    'settings.displayErrorDetails' => true,
-                    'settings.outputBuffering' => 'append'
-                ]);
+            [
+                'settings.displayErrorDetails' => true,
+                'settings.outputBuffering' => 'append'
+            ]);
         $c = $app->getContainer();
 
         // Sanity checks
@@ -67,7 +66,7 @@ public function custom_exception_handling()
         /** @var Error $error */
         $error = $c->get('errorHandler');
 
-        $response = $error(RequestFactory::create('/'), new Response(), new TestException());
+        $response = $error(RequestFactory::create('/'), new Response(), new \Exception());
         $reasonPhrase = $response->getReasonPhrase();
         $this->assertEquals('Internal Server Error', $reasonPhrase);
 
@@ -76,27 +75,6 @@ public function custom_exception_handling()
     }
 }
 
-/**
- * Class TestException
- *
- * Test Exception that starts its own output buffer
- */
-class TestException extends \Exception
-{
-    public function __construct($message = "", $code = 0, Throwable $previous = null)
-    {
-        parent::__construct($message, $code, $previous);
-
-        // the Slim Error handler calls `ob_get_clean()` regardless of any outputBuffering setting:
-        //  'preappend' => $body->write(ob_get_clean() . $output);
-        //  'append' => $body->write($output . ob_get_clean());
-        //  false || anything else => ob_get_clean(); $body->write($output);
-        //
-        // We start our own OB for testing to keep the OB stack clean
-        ob_start();
-    }
-}
-
 /**
  * Class BridgeApp
  *