methods should not have more than one optional parameters

identifyEscapeSequence() needs Array check

.travis.yml

@@ -7,3 +7,4 @@ php:
   - 5.3
   - 5.2
   - hhvm
+  

phpunit.xml.dist

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit colors="true">
+<phpunit bootstrap="test/bootstrap.php" colors="true">
 	<testsuites>
 		<testsuite>
-			<file>tests/Test.php</file>
+			<file>test/Test.php</file>
 		</testsuite>
 	</testsuites>
 </phpunit>

test/Test.php

@@ -1,7 +1,5 @@
 <?php
 
-include 'Parsedown.php';
-
 class Test extends PHPUnit_Framework_TestCase
 {
     public function __construct($name = null, array $data = array(), $dataName = '')

test/bootstrap.php

@@ -0,0 +1,3 @@
+<?php
+
+include 'Parsedown.php';

test/data/atx_heading.html

@@ -1,8 +1,8 @@
-<h1>h1</h1>
+<h1>h1</h1>
-<h2>h2</h2>
+<h2>h2</h2>
-<h3>h3</h3>
+<h3>h3</h3>
-<h4>h4</h4>
+<h4>h4</h4>
-<h5>h5</h5>
+<h5>h5</h5>
-<h6>h6</h6>
+<h6>h6</h6>
-<h1>closed h1</h1>
+<h1>closed h1</h1>
 <p>#</p>

test/data/atx_heading.md

@@ -1,15 +1,15 @@
-# h1
+# h1
-
+
-## h2
+## h2
-
+
-### h3
+### h3
-
+
-#### h4
+#### h4
-
+
-##### h5
+##### h5
-
+
-###### h6
+###### h6
-
+
-# closed h1 #
+# closed h1 #
-
+
 #

test/data/code_block.html

@@ -1,8 +1,8 @@
-<pre><code>&lt;?php
+<pre><code>&lt;?php
-
+
-$message = 'Hello World!';
+$message = 'Hello World!';
-echo $message;</code></pre>
+echo $message;</code></pre>
-<hr />
+<hr />
-<pre><code>&gt; not a quote
+<pre><code>&gt; not a quote
-- not a list item
+- not a list item
 [not a reference]: http://foo.com</code></pre>

test/data/code_block.md

@@ -1,10 +1,10 @@
-    <?php
+    <?php
-
+
-    $message = 'Hello World!';
+    $message = 'Hello World!';
-    echo $message;
+    echo $message;
-
+
----
+---
-
+
-    > not a quote
+    > not a quote
-    - not a list item
+    - not a list item
     [not a reference]: http://foo.com

test/data/deeply_nested_list.md

@@ -1,6 +1,6 @@
 - li
-  - li
     - li
+        - li
+        - li
     - li
-  - li
 - li

test/data/emphasis.html

@@ -1,8 +1,8 @@
-<p><em>underscore</em>, <em>asterisk</em>, <em>one two</em>, <em>three four</em>, <em>a</em>, <em>b</em></p>
+<p><em>underscore</em>, <em>asterisk</em>, <em>one two</em>, <em>three four</em>, <em>a</em>, <em>b</em></p>
-<p><strong>strong</strong> and <em>em</em> and <strong>strong</strong> and <em>em</em></p>
+<p><strong>strong</strong> and <em>em</em> and <strong>strong</strong> and <em>em</em></p>
-<p><em>line
+<p><em>line
-line
+line
-line</em></p>
+line</em></p>
-<p>this_is_not_an_emphasis</p>
+<p>this_is_not_an_emphasis</p>
-<p>an empty emphasis __ ** is not an emphasis</p>
+<p>an empty emphasis __ ** is not an emphasis</p>
 <p>*mixed *<em>double and</em> single asterisk** spans</p>

test/data/emphasis.md

@@ -1,13 +1,13 @@
-_underscore_, *asterisk*, _one two_, *three four*, _a_, *b*
+_underscore_, *asterisk*, _one two_, *three four*, _a_, *b*
-
+
-**strong** and *em* and **strong** and *em*
+**strong** and *em* and **strong** and *em*
-
+
-_line
+_line
-line
+line
-line_
+line_
-
+
-this_is_not_an_emphasis
+this_is_not_an_emphasis
-
+
-an empty emphasis __ ** is not an emphasis
+an empty emphasis __ ** is not an emphasis
-
+
 *mixed **double and* single asterisk** spans

test/data/horizontal_rule.html

@@ -1,5 +1,5 @@
-<hr />
+<hr />
-<hr />
+<hr />
-<hr />
+<hr />
-<hr />
+<hr />
 <hr />

test/data/horizontal_rule.md

@@ -1,9 +1,9 @@
----
+---
-
+
-- - -
+- - -
-
+
-   - - -
+   - - -
-
+
-***
+***
-
+
 ___

test/data/implicit_reference.html

@@ -1,3 +1,4 @@
 <p>an <a href="http://example.com">implicit</a> reference link</p>
 <p>an <a href="http://example.com">implicit</a> reference link with an empty link definition</p>
+<p>an <a href="http://example.com">implicit</a> reference link followed by <a href="http://cnn.com">another</a></p>
 <p>an <a href="http://example.com" title="Example">explicit</a> reference link with a title</p>

test/data/implicit_reference.md

@@ -4,6 +4,10 @@ an [implicit] reference link
 
 an [implicit][] reference link with an empty link definition
 
+an [implicit][] reference link followed by [another][]
+
+[another]: http://cnn.com
+
 an [explicit][example] reference link with a title
 
 [example]: http://example.com "Example"

test/data/lazy_blockquote.html

@@ -1,4 +1,6 @@
 <blockquote>
 <p>quote
 the rest of it</p>
+<p>another paragraph
+the rest of it</p>
 </blockquote>

test/data/lazy_blockquote.md

@@ -0,0 +1,5 @@
+> quote
+the rest of it
+
+> another paragraph
+the rest of it

test/data/line_break.html

@@ -1,2 +1,2 @@
-<p>line<br />
+<p>line<br />
 line</p>

test/data/line_break.md

@@ -1,2 +1,2 @@
-line  
+line  
 line

test/data/separated_nested_list.html

@@ -0,0 +1,9 @@
+<ul>
+<li>
+<p>li</p>
+<ul>
+<li>li</li>
+<li>li</li>
+</ul>
+</li>
+</ul>

test/data/separated_nested_list.md

@@ -0,0 +1,4 @@
+- li
+
+    - li
+    - li

test/data/setext_header.html

@@ -1,5 +1,5 @@
-<h1>h1</h1>
+<h1>h1</h1>
-<h2>h2</h2>
+<h2>h2</h2>
-<h2>single character</h2>
+<h2>single character</h2>
-<p>not a header</p>
+<p>not a header</p>
 <hr />

test/data/setext_header.md

@@ -1,12 +1,12 @@
-h1
+h1
-==
+==
-
+
-h2
+h2
---
+--
-
+
-single character
+single character
--
+-
-
+
-not a header
+not a header
-
+
 ------------

test/data/span-level_html.html

@@ -0,0 +1,5 @@
+<p>an <b>important</b> <a href=''>link</a></p>
+<p>broken<br/>
+line</p>
+<p><b>inline tag</b> at the beginning</p>
+<p><span><a href="http://example.com">http://example.com</a></span></p>

test/data/span-level_html.md

@@ -0,0 +1,8 @@
+an <b>important</b> <a href=''>link</a>
+
+broken<br/>
+line
+
+<b>inline tag</b> at the beginning
+
+<span>http://example.com</span>

test/data/special_characters.html

@@ -1,6 +1,6 @@
-<p>AT&amp;T has an ampersand in their name</p>
+<p>AT&amp;T has an ampersand in their name</p>
-<p>this &amp; that</p>
+<p>this &amp; that</p>
-<p>4 &lt; 5 and 6 > 5</p>
+<p>4 &lt; 5 and 6 > 5</p>
-<p><a href="http://example.com/autolink?a=1&amp;b=2">http://example.com/autolink?a=1&amp;b=2</a></p>
+<p><a href="http://example.com/autolink?a=1&amp;b=2">http://example.com/autolink?a=1&amp;b=2</a></p>
-<p><a href="/script?a=1&amp;b=2">inline link</a></p>
+<p><a href="/script?a=1&amp;b=2">inline link</a></p>
 <p><a href="http://example.com/?a=1&amp;b=2">reference link</a></p>

test/data/special_characters.md

@@ -1,13 +1,13 @@
-AT&T has an ampersand in their name
+AT&T has an ampersand in their name
-
+
-this & that
+this & that
-
+
-4 < 5 and 6 > 5
+4 < 5 and 6 > 5
-
+
-<http://example.com/autolink?a=1&b=2>
+<http://example.com/autolink?a=1&b=2>
-
+
-[inline link](/script?a=1&b=2)
+[inline link](/script?a=1&b=2)
-
+
-[reference link][1]
+[reference link][1]
-
+
 [1]: http://example.com/?a=1&b=2