From 620c9a02bba75363c60d71165b76635785eef187 Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Wed, 21 Oct 2020 01:08:03 +0200
Subject: [PATCH] News: Render as markdown

---
 resources/views/pages/news/edit.twig          |  2 +-
 resources/views/pages/news/overview.twig      |  2 +-
 src/Renderer/Twig/Extensions/Markdown.php     | 10 ++++++++--
 .../Renderer/Twig/Extensions/MarkdownTest.php | 19 +++++++++++++++++++
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/resources/views/pages/news/edit.twig b/resources/views/pages/news/edit.twig
index 5a51d57c..1c74ec33 100644
--- a/resources/views/pages/news/edit.twig
+++ b/resources/views/pages/news/edit.twig
@@ -73,7 +73,7 @@
                             </div>
 
                             <div class="panel-body">
-                                {{ news.text|raw|nl2br }}
+                                {{ news.text|raw|markdown(false) }}
                             </div>
                         </div>
                     </div>
diff --git a/resources/views/pages/news/overview.twig b/resources/views/pages/news/overview.twig
index e30cc192..733f8b92 100644
--- a/resources/views/pages/news/overview.twig
+++ b/resources/views/pages/news/overview.twig
@@ -61,7 +61,7 @@
         {% endif %}
 
         <div class="panel-body">
-            {{ news.text|raw|nl2br }}
+            {{ news.text|raw|markdown(false) }}
         </div>
 
         <div class="panel-footer text-muted">
diff --git a/src/Renderer/Twig/Extensions/Markdown.php b/src/Renderer/Twig/Extensions/Markdown.php
index c23a0031..3e390796 100644
--- a/src/Renderer/Twig/Extensions/Markdown.php
+++ b/src/Renderer/Twig/Extensions/Markdown.php
@@ -34,10 +34,16 @@ class Markdown extends TwigExtension
 
     /**
      * @param string $text
+     * @param bool   $escapeHtml
+     *
      * @return string
      */
-    public function render(string $text): string
+    public function render(string $text, bool $escapeHtml = true): string
     {
-        return $this->renderer->text(htmlspecialchars($text));
+        if ($escapeHtml) {
+            $text = htmlspecialchars($text);
+        }
+
+        return $this->renderer->text($text);
     }
 }
diff --git a/tests/Unit/Renderer/Twig/Extensions/MarkdownTest.php b/tests/Unit/Renderer/Twig/Extensions/MarkdownTest.php
index fd98c7cd..70eea97c 100644
--- a/tests/Unit/Renderer/Twig/Extensions/MarkdownTest.php
+++ b/tests/Unit/Renderer/Twig/Extensions/MarkdownTest.php
@@ -41,4 +41,23 @@ class MarkdownTest extends ExtensionTest
         $extension = new Markdown($renderer);
         $this->assertEquals($return, $extension->render('Lorem *"Ipsum"*'));
     }
+
+    /**
+     * @covers \Engelsystem\Renderer\Twig\Extensions\Markdown::render
+     */
+    public function testRenderHtml()
+    {
+        /** @var Parsedown|MockObject $renderer */
+        $renderer = $this->createMock(Parsedown::class);
+
+        $input = '<i>**test**</i>';
+        $return = '<p><strong><i>**test**</i></strong></p>';
+        $renderer->expects($this->once())
+            ->method('text')
+            ->with($input)
+            ->willReturn($return);
+
+        $extension = new Markdown($renderer);
+        $this->assertEquals($return, $extension->render($input, false));
+    }
 }