Merge pull request #17289 from ozturkmtn/Extract-html-to-twig

MauricioFauth · web-flow · commit d4d146ff4fcd · 2022-01-28T17:54:48.000-03:00
Add libraries/classes/error::getDisplay() function twig file.
diff --git a/libraries/classes/Error.php b/libraries/classes/Error.php
@@ -477,25 +477,17 @@ public function getDisplay(): string
             $context = 'danger';
         }
 
-        $retval = '<div class="alert alert-' . $context . '" role="alert">';
-        if (! $this->isUserError()) {
-            $retval .= '<strong>' . $this->getType() . '</strong>';
-            $retval .= ' in ' . $this->getFile() . '#' . $this->getLine();
-            $retval .= "<br>\n";
-        }
-
-        $retval .= $this->getMessage();
-        if (! $this->isUserError()) {
-            $retval .= "<br>\n";
-            $retval .= "<br>\n";
-            $retval .= "<strong>Backtrace</strong><br>\n";
-            $retval .= "<br>\n";
-            $retval .= $this->getBacktraceDisplay();
-        }
-
-        $retval .= '</div>';
-
-        return $retval;
+        $template = new Template();
+
+        return $template->render('error/get_display',[
+            'context' => $context,
+            'isUserError' => $this->isUserError(),
+            'type' => $this->getType(),
+            'file' => $this->getFile(),
+            'line' => $this->getLine(),
+            'message' => $this->getMessage(),
+            'backtraceDisplay' => $this->getBacktraceDisplay(),
+        ]);
     }
 
     /**
diff --git a/templates/error/get_display.twig b/templates/error/get_display.twig
@@ -0,0 +1,17 @@
+<div class="alert alert-{{ context }}" role="alert">
+
+  {% if isUserError == false %}
+    <strong>{{ type }}</strong> in {{ file ~'#'~ line }} <br>
+  {% endif %}
+
+  {{ message }}
+
+  {% if isUserError == false %}
+    <br><br>
+    <strong>Backtrace</strong><br>
+    <br>
+    {{ backtraceDisplay }}
+  {% endif %}
+
+
+</div>
