Fix Whoops displaying error page if there is PHP core warning or error (

#980)

CHANGELOG.md

@@ -4,6 +4,7 @@
 1. [](#bugfix)
     * Fix for double extensions getting added during some redirects [#1307](https://github.com/getgrav/grav/issues/1307)
     * Fix syntax error in PHP 5.3. Move the version check before requiring the autoloaded deps
+    * Fix Whoops displaying error page if there is PHP core warning or error (#980)
 
 # v1.1.16
 ## 02/10/2017

system/src/Grav/Common/Errors/Errors.php

@@ -20,7 +20,8 @@ public function resetHandlers()
         $jsonRequest = $_SERVER && isset($_SERVER['HTTP_ACCEPT']) && $_SERVER['HTTP_ACCEPT'] == 'application/json';
 
         // Setup Whoops-based error handler
-        $whoops = new \Whoops\Run;
+        $system = new SystemFacade;
+        $whoops = new \Whoops\Run($system);
 
         $verbosity = 1;
 

system/src/Grav/Common/Errors/SystemFacade.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * @package    Grav.Common.Errors
+ *
+ * @copyright  Copyright (C) 2014 - 2016 RocketTheme, LLC. All rights reserved.
+ * @license    MIT License; see LICENSE file for details.
+ */
+
+namespace Grav\Common\Errors;
+
+class SystemFacade extends \Whoops\Util\SystemFacade
+{
+    protected $whoopsShutdownHandler;
+
+    /**
+     * @param callable $function
+     *
+     * @return void
+     */
+    public function registerShutdownFunction(callable $function)
+    {
+        $this->whoopsShutdownHandler = $function;
+        register_shutdown_function([$this, 'handleShutdown']);
+    }
+
+    /**
+     * Special case to deal with Fatal errors and the like.
+     */
+    public function handleShutdown()
+    {
+        $error = $this->getLastError();
+
+        // Ignore core warnings and errors.
+        if ($error && !($error['type'] & (E_CORE_WARNING | E_CORE_ERROR))) {
+            $handler = $this->whoopsShutdownHandler;
+            $handler();
+        }
+    }
+}