diff options
| -rw-r--r-- | include/markdown.php | 3 | ||||
| -rw-r--r-- | tests/unit/includes/MarkdownTest.php | 18 |
2 files changed, 8 insertions, 13 deletions
diff --git a/include/markdown.php b/include/markdown.php index e7b57c3ee..64f0a0854 100644 --- a/include/markdown.php +++ b/include/markdown.php @@ -283,9 +283,10 @@ function bb_to_markdown($Text, $options = []) { * If the HTML text can not get parsed it will return an empty string. * * @param string $html The HTML code to convert + * @param array $options an array of options to pass to the environment * @return string Markdown representation of the given HTML text, empty on error */ -function html2markdown($html,$options = []) { +function html2markdown($html, $options = []) { $markdown = ''; if(! $options) { diff --git a/tests/unit/includes/MarkdownTest.php b/tests/unit/includes/MarkdownTest.php index c1408b303..654fbd4c7 100644 --- a/tests/unit/includes/MarkdownTest.php +++ b/tests/unit/includes/MarkdownTest.php @@ -55,7 +55,7 @@ class MarkdownTest extends UnitTestCase { 'strong, b, em, i, bib' => [ '<strong>strong</strong> <b>bold</b> <em>em</em> <i>italic</i> <b>bo<i>italic</i>ld</b>', - '**strong** **bold** _em_ _italic_ **bo_italic_ld**' + '**strong** **bold** *em* *italic* **bo*italic*ld**' ], 'empty tags' => [ @@ -70,10 +70,6 @@ class MarkdownTest extends UnitTestCase { '& lt < gt >', '& lt < gt >' ], - 'our escaped HTML entities' => [ - '&_lt_; &_gt_; &_amp_;', - '&\_lt\_; &\_gt\_; &\_amp\_;' - ], 'linebreak' => [ "line1<br>line2\nline3", "line1 \nline2 line3" @@ -84,15 +80,15 @@ class MarkdownTest extends UnitTestCase { ], 'unordered list' => [ '<ul><li>Item 1</li><li>Item 2</li><li>Item <b>3</b></li></ul>', - "- Item 1\n- Item 2\n- Item 3" + "- Item 1\n- Item 2\n- Item **3**" ], 'ordered list' => [ '<ol><li>Item 1</li><li>Item 2</li><li>Item <b>3</b></li></ol>', - "1. Item 1\n2. Item 2\n3. Item 3" + "1. Item 1\n2. Item 2\n3. Item **3**" ], 'nested lists' => [ '<ul><li>Item 1<ol><li>Item 1a</li><li>Item <b>1b</b></ol></li><li>Item 2</li></ul>', - "- Item 1\n 1. Item 1a\n 2. Item 1b\n- Item 2" + "- Item 1\n 1. Item 1a\n 2. Item **1b**\n- Item 2" ], 'img' => [ '<img src="/path/to/img.png" alt="alt text" title="title text">', @@ -118,12 +114,10 @@ class MarkdownTest extends UnitTestCase { '<code><p>HTML text</p></code>', '`<p>HTML text</p>`' ], - 'pre' => [ - '<pre> line with spaces </pre>', - '` line with spaces `' + '<pre> one line with spaces </pre>', + '```\n one line with spaces \n```' ], - 'div p' => [ '<div>div</div><div><p>p</p></div>', "<div>div</div><div>p\n\n</div>" |