Update Whoops error handler to v2.4.0

N3Cr0N · Jun 23, 2019 · 446f3fc · 446f3fc
1 parent 1fe42b1
commit 446f3fc
Show file tree

Hide file tree

Showing 15 changed files with 160 additions and 58 deletions.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
 	},
 	"require": {
 		"php": ">=5.3.7",
-		"filp/whoops": "^2.3"
+		"filp/whoops": "^2.4"
 	},
 	"suggest": {
 		"paragonie/random_compat": "Provides better randomness in PHP 5.x"

diff --git a/composer.lock b/composer.lock
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -57,17 +57,17 @@
     },
     {
         "name": "filp/whoops",
-        "version": "2.3.1",
-        "version_normalized": "2.3.1.0",
+        "version": "2.4.0",
+        "version_normalized": "2.4.0.0",
         "source": {
             "type": "git",
             "url": "https://github.com/filp/whoops.git",
-            "reference": "bc0fd11bc455cc20ee4b5edabc63ebbf859324c7"
+            "reference": "1a1a1044ad00e285bd2825fac4c3a0443d90ad33"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/filp/whoops/zipball/bc0fd11bc455cc20ee4b5edabc63ebbf859324c7",
-            "reference": "bc0fd11bc455cc20ee4b5edabc63ebbf859324c7",
+            "url": "https://api.github.com/repos/filp/whoops/zipball/1a1a1044ad00e285bd2825fac4c3a0443d90ad33",
+            "reference": "1a1a1044ad00e285bd2825fac4c3a0443d90ad33",
             "shasum": ""
         },
         "require": {
@@ -83,7 +83,7 @@
             "symfony/var-dumper": "Pretty print complex values better with var-dumper available",
             "whoops/soap": "Formats errors as SOAP responses"
         },
-        "time": "2018-10-23T09:00:00+00:00",
+        "time": "2019-06-23T09:00:00+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -124,12 +124,12 @@
         "version_normalized": "1.1.0.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/mikey179/vfsStream.git",
+            "url": "https://github.com/bovigo/vfsStream.git",
             "reference": "fc0fe8f4d0b527254a2dc45f0c265567c881d07e"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/mikey179/vfsStream/zipball/fc0fe8f4d0b527254a2dc45f0c265567c881d07e",
+            "url": "https://api.github.com/repos/bovigo/vfsStream/zipball/fc0fe8f4d0b527254a2dc45f0c265567c881d07e",
             "reference": "fc0fe8f4d0b527254a2dc45f0c265567c881d07e",
             "shasum": ""
         },
@@ -825,7 +825,8 @@
         "keywords": [
             "mock",
             "xunit"
-        ]
+        ],
+        "abandoned": true
     },
     {
         "name": "psr/log",

diff --git a/vendor/filp/whoops/CHANGELOG.md b/vendor/filp/whoops/CHANGELOG.md
@@ -1,3 +1,11 @@
+# 2.4.0
+
+* Allow to prepend and append handlers.
+
+# 2.3.2
+
+* Various fixes from the community.
+
 # 2.3.1
 
 * Prevent exception in Whoops when caught exception frame is not related to real file

diff --git a/vendor/filp/whoops/src/Whoops/Exception/Frame.php b/vendor/filp/whoops/src/Whoops/Exception/Frame.php
@@ -119,7 +119,11 @@ public function getFileContents()
                 return null;
             }
 
-            $this->fileContentsCache = file_get_contents($filePath);
+            try {
+                $this->fileContentsCache = file_get_contents($filePath);
+            } catch (ErrorException $exception) {
+                // Internal file paths of PHP extensions cannot be opened
+            }
         }
 
         return $this->fileContentsCache;

diff --git a/vendor/filp/whoops/src/Whoops/Exception/Inspector.php b/vendor/filp/whoops/src/Whoops/Exception/Inspector.php
@@ -252,7 +252,7 @@ protected function getTrace($e)
         }
 
         if (!extension_loaded('xdebug') || !xdebug_is_enabled()) {
-            return [];
+            return $traces;
         }
 
         // Use xdebug to get the full stack trace and remove the shutdown handler stack trace

diff --git a/vendor/filp/whoops/src/Whoops/Handler/PlainTextHandler.php b/vendor/filp/whoops/src/Whoops/Handler/PlainTextHandler.php
@@ -46,6 +46,11 @@ class PlainTextHandler extends Handler
      */
     private $traceFunctionArgsOutputLimit = 1024;
 
+    /**
+     * @var bool
+     */
+    private $addPreviousToOutput = true;
+
     /**
      * @var bool
      */
@@ -114,6 +119,21 @@ public function addTraceToOutput($addTraceToOutput = null)
         return $this;
     }
 
+    /**
+     * Add previous exceptions to output.
+     * @param  bool|null $addPreviousToOutput
+     * @return bool|$this
+     */
+    public function addPreviousToOutput($addPreviousToOutput = null)
+    {
+        if (func_num_args() == 0) {
+            return $this->addPreviousToOutput;
+        }
+
+        $this->addPreviousToOutput = (bool) $addPreviousToOutput;
+        return $this;
+    }
+
     /**
      * Add error trace function arguments to output.
      * Set to True for all frame args, or integer for the n first frame args.
@@ -151,14 +171,18 @@ public function setTraceFunctionArgsOutputLimit($traceFunctionArgsOutputLimit)
     public function generateResponse()
     {
         $exception = $this->getException();
-        return sprintf(
-            "%s: %s in file %s on line %d%s\n",
-            get_class($exception),
-            $exception->getMessage(),
-            $exception->getFile(),
-            $exception->getLine(),
-            $this->getTraceOutput()
-        );
+        $message = $this->getExceptionOutput($exception);
+
+        if ($this->addPreviousToOutput) {
+            $previous = $exception->getPrevious();
+            while ($previous) {
+                $message .= "\n\nCaused by\n" . $this->getExceptionOutput($previous);
+                $previous = $previous->getPrevious();
+            }
+        }
+
+
+        return $message . $this->getTraceOutput() . "\n";
     }
 
     /**
@@ -284,6 +308,22 @@ private function getTraceOutput()
         return $response;
     }
 
+    /**
+     * Get the exception as plain text.
+     * @param \Throwable $exception
+     * @return string
+     */
+    private function getExceptionOutput($exception)
+    {
+        return sprintf(
+            "%s: %s in file %s on line %d",
+            get_class($exception),
+            $exception->getMessage(),
+            $exception->getFile(),
+            $exception->getLine()
+        );
+    }
+
     /**
      * @return int
      */

diff --git a/vendor/filp/whoops/src/Whoops/Handler/PrettyPageHandler.php b/vendor/filp/whoops/src/Whoops/Handler/PrettyPageHandler.php
@@ -97,6 +97,7 @@ class PrettyPageHandler extends Handler
         "idea"     => "idea://open?file=%file&line=%line",
         "vscode"   => "vscode://file/%file:%line",
         "atom"     => "atom://core/open/file?filename=%file&line=%line",
+        "espresso" => "x-espresso://open?filepath=%file&lines=%line",
     ];
 
     /**
@@ -391,7 +392,7 @@ public function handleUnconditionally($value = null)
      *       return "http://stackoverflow.com";
      *   });
      * @param string $identifier
-     * @param string $resolver
+     * @param string|callable $resolver
      */
     public function addEditor($identifier, $resolver)
     {
@@ -704,7 +705,7 @@ private function masked(array $superGlobal, $superGlobalName)
 
         $values = $superGlobal;
         foreach ($blacklisted as $key) {
-            if (isset($superGlobal[$key])) {
+            if (isset($superGlobal[$key]) && is_string($superGlobal[$key])) {
                 $values[$key] = str_repeat('*', strlen($superGlobal[$key]));
             }
         }

diff --git a/vendor/filp/whoops/src/Whoops/Handler/XmlResponseHandler.php b/vendor/filp/whoops/src/Whoops/Handler/XmlResponseHandler.php
@@ -47,7 +47,7 @@ public function handle()
             ),
         ];
 
-        echo $this->toXml($response);
+        echo self::toXml($response);
 
         return Handler::QUIT;
     }

diff --git a/vendor/filp/whoops/src/Whoops/Resources/css/whoops.base.css b/vendor/filp/whoops/src/Whoops/Resources/css/whoops.base.css
@@ -12,6 +12,11 @@ body {
     text-decoration: none;
   }
 
+.Whoops.container {
+    position: relative;
+    z-index: 9999999999;
+}
+
 .panel {
     overflow-y: scroll;
     height: 100%;
@@ -414,12 +419,9 @@ pre:not(.prettyprinted) {
   display: none;
 }
 
-#copy-button {
+.rightButton {
   cursor: pointer;
   border: 0;
-}
-
-.clipboard {
   opacity: .8;
   background: none;
 
@@ -431,7 +433,7 @@ pre:not(.prettyprinted) {
   outline: none !important;
 }
 
-  .clipboard:hover {
+  .rightButton:hover {
     box-shadow: inset 0 0 0 2px rgba(255, 255, 255, 0.3);
     color: rgba(255, 255, 255, 0.3);
   }

diff --git a/vendor/filp/whoops/src/Whoops/Resources/views/frames_description.html.php b/vendor/filp/whoops/src/Whoops/Resources/views/frames_description.html.php
@@ -1,14 +1,8 @@
 <div class="frames-description <?php echo $has_frames_tabs ? 'frames-description-application' : '' ?>">
   <?php if ($has_frames_tabs): ?>
-    <?php if ($active_frames_tab == 'application'): ?>
-      <span href="#" id="application-frames-tab" class="frames-tab frames-tab-active">
+    <a href="#" id="application-frames-tab" class="frames-tab <?php echo $active_frames_tab == 'application' ? 'frames-tab-active' : '' ?>">
         Application frames (<?php echo $frames->countIsApplication() ?>)
-      </span>
-    <?php else: ?>
-      <a href="#" id="application-frames-tab" class="frames-tab">
-        Application frames (<?php echo $frames->countIsApplication() ?>)
-      </a>
-    <?php endif; ?>
+    </a>
     <a href="#" id="all-frames-tab" class="frames-tab <?php echo $active_frames_tab == 'all' ? 'frames-tab-active' : '' ?>">
       All frames (<?php echo count($frames) ?>)
     </a>

diff --git a/vendor/filp/whoops/src/Whoops/Resources/views/header.html.php b/vendor/filp/whoops/src/Whoops/Resources/views/header.html.php
@@ -86,8 +86,11 @@
     </ul>
 
     <span id="plain-exception"><?php echo $tpl->escape($plain_exception) ?></span>
-    <button id="copy-button" class="clipboard" data-clipboard-text="<?php echo $tpl->escape($plain_exception) ?>" title="Copy exception details to clipboard">
+    <button id="copy-button" class="rightButton clipboard" data-clipboard-text="<?php echo $tpl->escape($plain_exception) ?>" title="Copy exception details to clipboard">
       COPY
     </button>
+    <button id="hide-error" class="rightButton" title="Hide error message" onclick="document.getElementsByClassName('Whoops')[0].style.display = 'none';">
+      HIDE
+    </button>
   </div>
 </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,7 +47,7 @@ public function handle() @@
                 ),
             ];
-            echo $this->toXml($response);
+            echo self::toXml($response);
             return Handler::QUIT;
         }
@@ Expand Down @@