Merge branch '3.4' into 4.0

* 3.4: Bump ext-mongodb to 1.5 on Travis Redesign the Debug error page in prod [DI] fix dumping deprecated service in yaml bumped Symfony version to 3.4.13 updated VERSION for 3.4.12 updated CHANGELOG for 3.4.12 bumped Symfony version to 2.8.43 updated VERSION for 2.8.42 update CONTRIBUTORS for 2.8.42 updated CHANGELOG for 2.8.42
Redesign the Debug error page in prod
2026-03-25 17:52:07 +01:00 · 2018-06-27 23:04:32 +02:00 · 2018-06-26 10:45:54 +02:00 · 2018-06-25 13:10:40 +02:00 · 2018-06-22 17:01:26 +02:00
1 changed files with 54 additions and 40 deletions
--- a/ExceptionHandler.php
+++ b/ExceptionHandler.php
@@ -208,48 +208,54 @@ class ExceptionHandler
                $title = 'Whoops, looks like something went wrong.';
        }

-        $content = '';
-        if ($this->debug) {
-            try {
-                $count = count($exception->getAllPrevious());
-                $total = $count + 1;
-                foreach ($exception->toArray() as $position => $e) {
-                    $ind = $count - $position + 1;
-                    $class = $this->formatClass($e['class']);
-                    $message = nl2br($this->escapeHtml($e['message']));
-                    $content .= sprintf(<<<'EOF'
-                        <div class="trace trace-as-html">
-                            <table class="trace-details">
-                                <thead class="trace-head"><tr><th>
-                                    <h3 class="trace-class">
-                                        <span class="text-muted">(%d/%d)</span>
-                                        <span class="exception_title">%s</span>
-                                    </h3>
-                                    <p class="break-long-words trace-message">%s</p>
-                                </th></tr></thead>
-                                <tbody>
-EOF
-                        , $ind, $total, $class, $message);
-                    foreach ($e['trace'] as $trace) {
-                        $content .= '<tr><td>';
-                        if ($trace['function']) {
-                            $content .= sprintf('at <span class="trace-class">%s</span><span class="trace-type">%s</span><span class="trace-method">%s</span>(<span class="trace-arguments">%s</span>)', $this->formatClass($trace['class']), $trace['type'], $trace['function'], $this->formatArgs($trace['args']));
-                        }
-                        if (isset($trace['file']) && isset($trace['line'])) {
-                            $content .= $this->formatPath($trace['file'], $trace['line']);
-                        }
-                        $content .= "</td></tr>\n";
-                    }
+        if (!$this->debug) {
+            return <<<EOF
+                <div class="container">
+                    <h1>$title</h1>
+                </div>
+EOF;
+        }

-                    $content .= "</tbody>\n</table>\n</div>\n";
-                }
-            } catch (\Exception $e) {
-                // something nasty happened and we cannot throw an exception anymore
-                if ($this->debug) {
-                    $title = sprintf('Exception thrown when handling an exception (%s: %s)', get_class($e), $this->escapeHtml($e->getMessage()));
-                } else {
-                    $title = 'Whoops, looks like something went wrong.';
+        $content = '';
+        try {
+            $count = count($exception->getAllPrevious());
+            $total = $count + 1;
+            foreach ($exception->toArray() as $position => $e) {
+                $ind = $count - $position + 1;
+                $class = $this->formatClass($e['class']);
+                $message = nl2br($this->escapeHtml($e['message']));
+                $content .= sprintf(<<<'EOF'
+                    <div class="trace trace-as-html">
+                        <table class="trace-details">
+                            <thead class="trace-head"><tr><th>
+                                <h3 class="trace-class">
+                                    <span class="text-muted">(%d/%d)</span>
+                                    <span class="exception_title">%s</span>
+                                </h3>
+                                <p class="break-long-words trace-message">%s</p>
+                            </th></tr></thead>
+                            <tbody>
+EOF
+                    , $ind, $total, $class, $message);
+                foreach ($e['trace'] as $trace) {
+                    $content .= '<tr><td>';
+                    if ($trace['function']) {
+                        $content .= sprintf('at <span class="trace-class">%s</span><span class="trace-type">%s</span><span class="trace-method">%s</span>(<span class="trace-arguments">%s</span>)', $this->formatClass($trace['class']), $trace['type'], $trace['function'], $this->formatArgs($trace['args']));
+                    }
+                    if (isset($trace['file']) && isset($trace['line'])) {
+                        $content .= $this->formatPath($trace['file'], $trace['line']);
+                    }
+                    $content .= "</td></tr>\n";
                }
+
+                $content .= "</tbody>\n</table>\n</div>\n";
+            }
+        } catch (\Exception $e) {
+            // something nasty happened and we cannot throw an exception anymore
+            if ($this->debug) {
+                $title = sprintf('Exception thrown when handling an exception (%s: %s)', get_class($e), $this->escapeHtml($e->getMessage()));
+            } else {
+                $title = 'Whoops, looks like something went wrong.';
            }
        }

@@ -278,6 +284,14 @@ EOF;
     */
    public function getStylesheet(FlattenException $exception)
    {
+        if (!$this->debug) {
+            return <<<'EOF'
+                body { background-color: #fff; color: #222; font: 16px/1.5 -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; margin: 0; }
+                .container { margin: 30px; max-width: 600px; }
+                h1 { color: #dc3545; font-size: 24px; }
+EOF;
+        }
+
        return <<<'EOF'
            body { background-color: #F9F9F9; color: #222; font: 14px/1.4 Helvetica, Arial, sans-serif; margin: 0; padding-bottom: 45px; }
Author	SHA1	Message	Date
Nicolas Grekas	8c2d96aff8	Merge branch '3.4' into 4.0 * 3.4: Bump ext-mongodb to 1.5 on Travis Redesign the Debug error page in prod [DI] fix dumping deprecated service in yaml bumped Symfony version to 3.4.13 updated VERSION for 3.4.12 updated CHANGELOG for 3.4.12 bumped Symfony version to 2.8.43 updated VERSION for 2.8.42 update CONTRIBUTORS for 2.8.42 updated CHANGELOG for 2.8.42	2018-06-27 23:04:32 +02:00
Javier Eguiluz	0e3ca9cbde	Redesign the Debug error page in prod	2018-06-26 10:45:54 +02:00
Fabien Potencier	47e6788c5b	Merge branch '2.8' into 3.4 * 2.8: Add note about changed form processing when using PUT requests The debug class loader is always loaded by Debug::enable(). [Intl] Update ICU data to 62.1	2018-06-25 13:10:40 +02:00
Alexander M. Turek	a26ddce7fe	The debug class loader is always loaded by Debug::enable().	2018-06-22 17:01:26 +02:00