Merge pull request #773 from DvdGiessen/unregister_shutdown_function

Disable shutdown function when not registered

Author: denis-sokolov

src/Whoops/Run.php

@@ -507,6 +507,11 @@ public function handleShutdown()
         // to the exception handler. Pass that information along.
         $this->canThrowExceptions = false;
 
+        // If we are not currently registered, we should not do anything
+        if (!$this->isRegistered) {
+            return;
+        }
+
         $error = $this->system->getLastError();
         if ($error && Misc::isLevelFatal($error['type'])) {
             // If there was a fatal error,

tests/Whoops/RunTest.php

@@ -12,7 +12,10 @@
 use Mockery as m;
 use RuntimeException;
 use Whoops\Handler\Handler;
+use Whoops\Handler\HandlerInterface;
+use Whoops\Handler\PrettyPageHandler;
 use Whoops\Exception\Frame;
+use Whoops\Util\SystemFacade;
 
 class RunTest extends TestCase
 {
@@ -571,4 +574,36 @@ public function testClearFrameFilters()
         $this->assertEmpty($run->getFrameFilters());
         $this->assertInstanceOf("Whoops\\RunInterface", $run);
     }
+
+    public function testShutdownHandlerDoesNotRunIfUnregistered()
+    {
+        $system = m::mock('Whoops\Util\SystemFacade');
+
+        $run = new Run($system);
+        $run->writeToOutput(false);
+        $run->allowQuit(false);
+
+        $fatalError = [
+            'type'    => E_ERROR,
+            'message' => 'Simulated fatal error for shutdown',
+            'file'    => 'somefile.php',
+            'line'    => 10,
+        ];
+        $system->shouldReceive('getLastError')->andReturn($fatalError)->byDefault();
+
+        $mockHandler = m::mock('Whoops\Handler\HandlerInterface');
+        $mockHandler->shouldNotReceive('handle');
+        $mockHandler->shouldNotReceive('setRun');
+        $mockHandler->shouldNotReceive('setInspector');
+        $mockHandler->shouldNotReceive('setException');
+        $run->pushHandler($mockHandler);
+
+        $run->unregister();
+
+        ob_start();
+        $run->handleShutdown();
+        $output = ob_get_clean();
+
+        $this->assertEquals('', $output, "Output buffer should be empty.");
+    }
 }