From 9eb24fee300047eac57a31a71ea065b64bae8ec9 Mon Sep 17 00:00:00 2001 From: Belle Aerni Date: Sat, 28 Jan 2023 20:54:53 -0800 Subject: [PATCH] First try to render exceptions using twig --- src/AntCMS/AntCMS.php | 16 ++++++++++++---- src/AntCMS/AntKeywords.php | 4 +--- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/AntCMS/AntCMS.php b/src/AntCMS/AntCMS.php index 9db6ccf..b7c4363 100644 --- a/src/AntCMS/AntCMS.php +++ b/src/AntCMS/AntCMS.php @@ -25,13 +25,13 @@ class AntCMS $pageTemplate = $this->getPageLayout(null, $page); - $params = array( + $params = [ 'AntCMSTitle' => $content['title'], 'AntCMSDescription' => $content['description'], 'AntCMSAuthor' => $content['author'], 'AntCMSKeywords' => $content['keywords'], 'AntCMSBody' => AntMarkdown::renderMarkdown($content['content']), - ); + ]; $pageTemplate = AntTwig::renderWithTiwg($pageTemplate, $params); $end_time = microtime(true); @@ -76,8 +76,16 @@ class AntCMS $exceptionString .= " (Code {$exceptionCode})"; $pageTemplate = self::getPageLayout(); - $pageTemplate = str_replace('{{ AntCMSTitle }}', 'An error ocurred', $pageTemplate); - $pageTemplate = str_replace('{{ AntCMSBody | raw }} ', '

An error ocurred

' . $exceptionString . '

', $pageTemplate); + $params = [ + 'AntCMSTitle' => 'An Error Ocurred', + 'AntCMSBody' => '

An error ocurred

' . $exceptionString . '

', + ]; + try { + $pageTemplate = AntTwig::renderWithTiwg($pageTemplate, $params); + } catch (\Exception) { + $pageTemplate = str_replace('{{ AntCMSTitle }}', $params['AntCMSTitle'], $pageTemplate); + $pageTemplate = str_replace('{{ AntCMSBody | raw }} ', $params['AntCMSBody'], $pageTemplate); + } http_response_code($httpCode); echo $pageTemplate; diff --git a/src/AntCMS/AntKeywords.php b/src/AntCMS/AntKeywords.php index bbdd071..44e6770 100644 --- a/src/AntCMS/AntKeywords.php +++ b/src/AntCMS/AntKeywords.php @@ -8,9 +8,7 @@ use DonatelloZa\RakePlus\RakePlus; class AntKeywords { - /** - * @param string $content - * @param int $count + /** * @return string */ public function generateKeywords(string $content = '', int $count = 15)