add kbd to text-level elements

Add Symfony demo to "Who uses it?"

.travis.yml

@@ -1,10 +1,16 @@
 language: php
 
 php:
+  - 7.1
+  - 7.0
   - 5.6
   - 5.5
   - 5.4
   - 5.3
-  - 5.2
   - hhvm
-  
+  - hhvm-nightly
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - php: hhvm-nightly

README.md

@@ -1,16 +1,24 @@
+> You might also like [Caret](http://caret.io?ref=parsedown) - our Markdown editor for Mac / Windows / Linux.
+
 ## Parsedown
 
+[![Build Status](https://img.shields.io/travis/erusev/parsedown/master.svg?style=flat-square)](https://travis-ci.org/erusev/parsedown)
+<!--[![Total Downloads](http://img.shields.io/packagist/dt/erusev/parsedown.svg?style=flat-square)](https://packagist.org/packages/erusev/parsedown)-->
+
 Better Markdown Parser in PHP
 
-[[ demo ]](http://parsedown.org/demo)
+[Demo](http://parsedown.org/demo) |
+[Benchmarks](http://parsedown.org/speed) |
+[Tests](http://parsedown.org/tests/) |
+[Documentation](https://github.com/erusev/parsedown/wiki/)
 
 ### Features
 
-* [Fast](http://parsedown.org/speed)
-* [Consistent](http://parsedown.org/consistency)
+* One File
+* Super Fast
+* Extensible
 * [GitHub flavored](https://help.github.com/articles/github-flavored-markdown)
-* [Tested](http://parsedown.org/tests/) in PHP 5.2, 5.3, 5.4, 5.5, 5.6 and [hhvm](http://www.hhvm.com/)
-* [Extensible](https://github.com/erusev/parsedown/wiki/Writing-Extensions)
+* Tested in 5.3 to 7.1 and in HHVM
 * [Markdown Extra extension](https://github.com/erusev/parsedown-extra)
 
 ### Installation
@@ -25,24 +33,24 @@ $Parsedown = new Parsedown();
 echo $Parsedown->text('Hello _Parsedown_!'); # prints: <p>Hello <em>Parsedown</em>!</p>
 ```
 
-More examples in [the wiki](https://github.com/erusev/parsedown/wiki/Usage) and in [this video tutorial](http://youtu.be/wYZBY8DEikI).
+More examples in [the wiki](https://github.com/erusev/parsedown/wiki/) and in [this video tutorial](http://youtu.be/wYZBY8DEikI).
 
 ### Questions
 
 **How does Parsedown work?**
 
-It tries to read Markdown like a human. First, it looks at the lines. It’s interested in how the lines start. This helps it recognise blocks. It knows, for example, that if a line start with a `-` then it perhaps belong to a list. Once it recognises the blocks, it continues to the content. As it reads, it watches out for special characters. This helps it recognise inline elements (or inlines).
+It tries to read Markdown like a human. First, it looks at the lines. It’s interested in how the lines start. This helps it recognise blocks. It knows, for example, that if a line starts with a `-` then perhaps it belongs to a list. Once it recognises the blocks, it continues to the content. As it reads, it watches out for special characters. This helps it recognise inline elements (or inlines).
 
 We call this approach "line based". We believe that Parsedown is the first Markdown parser to use it. Since the release of Parsedown, other developers have used the same approach to develop other Markdown parsers in PHP and in other languages.
 
-**Is Parsedown compliant with CommonMark?**
+**Is it compliant with CommonMark?**
 
-The majority of the CommonMark tests pass. Most of the tests that don't pass deal with cases that are quite extreme. Yet, we are working on them. As CommonMark matures, compliance should improve.
+It passes most of the CommonMark tests. Most of the tests that don't pass deal with cases that are quite uncommon. Still, as CommonMark matures, compliance should improve.
 
-**Who uses Parsedown?**
+**Who uses it?**
 
-[phpDocumentor](http://www.phpdoc.org/), [October CMS](http://octobercms.com/), [Bolt CMS](http://bolt.cm/), [Kirby CMS](http://getkirby.com/), [Grav CMS](http://getgrav.org/), [Statamic CMS](http://www.statamic.com/),  [RaspberryPi.org](http://www.raspberrypi.org/) and [more](https://www.versioneye.com/php/erusev:parsedown/references).
+[phpDocumentor](http://www.phpdoc.org/), [October CMS](http://octobercms.com/), [Bolt CMS](http://bolt.cm/), [Kirby CMS](http://getkirby.com/), [Grav CMS](http://getgrav.org/), [Statamic CMS](http://www.statamic.com/), [Herbie CMS](http://www.getherbie.org/), [RaspberryPi.org](http://www.raspberrypi.org/), [Symfony demo](https://github.com/symfony/symfony-demo) and [more](https://packagist.org/packages/erusev/parsedown/dependents).
 
 **How can I help?**
 
-Use the project, tell friends about it and if you feel generous, [donate some money](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=528P3NZQMP8N2).
+Use it, star it, share it and if you feel generous, [donate](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=528P3NZQMP8N2).

composer.json

@@ -12,7 +12,10 @@
             "homepage": "http://erusev.com"
         }
     ],
+    "require": {
+        "php": ">=5.3.0"
+    },
     "autoload": {
         "psr-0": {"Parsedown": ""}
     }
-}
+}

test/CommonMarkTest.php

@@ -8,7 +8,7 @@
  * @link http://commonmark.org/ CommonMark
  * @link http://git.io/8WtRvQ JavaScript test runner
  */
-class CommonMarkTest extends PHPUnit_Framework_TestCase
+class CommonMarkTest extends \PHPUnit\Framework\TestCase
 {
     const SPEC_URL = 'https://raw.githubusercontent.com/jgm/stmd/master/spec.txt';
 

test/ParsedownTest.php

@@ -1,6 +1,6 @@
 <?php
 
-class ParsedownTest extends PHPUnit_Framework_TestCase
+class ParsedownTest extends \PHPUnit\Framework\TestCase
 {
     final function __construct($name = null, array $data = array(), $dataName = '')
     {
@@ -136,4 +136,24 @@ EXPECTED_HTML;
         $parsedownWithNoMarkup->setMarkupEscaped(true);
         $this->assertEquals($expectedHtml, $parsedownWithNoMarkup->text($markdownWithHtml));
     }
+
+    public function testLateStaticBinding()
+    {
+        include __DIR__ . '/TestParsedown.php';
+
+        $parsedown = Parsedown::instance();
+        $this->assertInstanceOf('Parsedown', $parsedown);
+
+        // After instance is already called on Parsedown
+        // subsequent calls with the same arguments return the same instance
+        $sameParsedown = TestParsedown::instance();
+        $this->assertInstanceOf('Parsedown', $sameParsedown);
+        $this->assertSame($parsedown, $sameParsedown);
+
+        $testParsedown = TestParsedown::instance('test late static binding');
+        $this->assertInstanceOf('TestParsedown', $testParsedown);
+
+        $sameInstanceAgain = TestParsedown::instance('test late static binding');
+        $this->assertSame($testParsedown, $sameInstanceAgain);
+    }
 }

test/TestParsedown.php

@@ -0,0 +1,5 @@
+<?php
+
+class TestParsedown extends Parsedown
+{
+}

test/bootstrap.php

@@ -1,3 +1,7 @@
 <?php
 
-include 'Parsedown.php';
+include 'Parsedown.php';
+
+if ( ! class_exists('\PHPUnit\Framework\TestCase') && class_exists('\PHPUnit_Framework_TestCase')) {
+    class_alias('\PHPUnit_Framework_TestCase', '\PHPUnit\Framework\TestCase');
+}

test/data/aligned_table.html

@@ -1,21 +1,21 @@
 <table>
 <thead>
 <tr>
-<th align="left">header 1</th>
-<th align="center">header 2</th>
-<th align="right">header 2</th>
+<th style="text-align: left;">header 1</th>
+<th style="text-align: center;">header 2</th>
+<th style="text-align: right;">header 2</th>
 </tr>
 </thead>
 <tbody>
 <tr>
-<td align="left">cell 1.1</td>
-<td align="center">cell 1.2</td>
-<td align="right">cell 1.3</td>
+<td style="text-align: left;">cell 1.1</td>
+<td style="text-align: center;">cell 1.2</td>
+<td style="text-align: right;">cell 1.3</td>
 </tr>
 <tr>
-<td align="left">cell 2.1</td>
-<td align="center">cell 2.2</td>
-<td align="right">cell 2.3</td>
+<td style="text-align: left;">cell 2.1</td>
+<td style="text-align: center;">cell 2.2</td>
+<td style="text-align: right;">cell 2.3</td>
 </tr>
 </tbody>
 </table>

test/data/block-level_html.html

@@ -1,13 +1,12 @@
 <div>_content_</div>
-<p>sparse:</p>
-<div>
-<div class="inner">
-_content_
-</div>
-</div>
 <p>paragraph</p>
+<div>
+  <div class="inner">
+    _content_
+  </div>
+</div>
 <style type="text/css">
-    p {
-        color: red;
-    }
-</style>
+  p {color: #789;}
+</style>
+<div>
+  <a href="/">home</a></div>

test/data/block-level_html.md

@@ -1,17 +1,16 @@
 <div>_content_</div>
 
-sparse:
-
-<div>
-<div class="inner">
-_content_
-</div>
-</div>
-
 paragraph
 
+<div>
+  <div class="inner">
+    _content_
+  </div>
+</div>
+
 <style type="text/css">
-    p {
-        color: red;
-    }
+  p {color: #789;}
 </style>
+
+<div>
+  <a href="/">home</a></div>

test/data/image_title.html

@@ -1 +1,2 @@
-<p><img src="/md.png" alt="alt" title="title" /></p>
+<p><img src="/md.png" alt="alt" title="title" /></p>
+<p><img src="/md.png" alt="blank title" title="" /></p>

test/data/image_title.md

@@ -1 +1,3 @@
-![alt](/md.png "title")
+![alt](/md.png "title")
+
+![blank title](/md.png "")

test/data/inline_link_title.html

@@ -1,4 +1,6 @@
 <p><a href="http://example.com" title="Title">single quotes</a></p>
 <p><a href="http://example.com" title="Title">double quotes</a></p>
+<p><a href="http://example.com" title="">single quotes blank</a></p>
+<p><a href="http://example.com" title="">double quotes blank</a></p>
 <p><a href="http://example.com" title="2 Words">space</a></p>
 <p><a href="http://example.com/url-(parentheses)" title="Title">parentheses</a></p>

test/data/inline_link_title.md

@@ -2,6 +2,10 @@
 
 [double quotes](http://example.com "Title")
 
+[single quotes blank](http://example.com '')
+
+[double quotes blank](http://example.com "")
+
 [space](http://example.com "2 Words")
 
 [parentheses](http://example.com/url-(parentheses) "Title")

test/data/ordered_list.html

@@ -8,6 +8,6 @@
 <li>two</li>
 </ol>
 <p>large numbers:</p>
-<ol>
+<ol start="123">
 <li>one</li>
 </ol>

test/data/simple_table.html

@@ -20,17 +20,17 @@
 <table>
 <thead>
 <tr>
-<th align="left">header 1</th>
+<th style="text-align: left;">header 1</th>
 <th>header 2</th>
 </tr>
 </thead>
 <tbody>
 <tr>
-<td align="left">cell 1.1</td>
+<td style="text-align: left;">cell 1.1</td>
 <td>cell 1.2</td>
 </tr>
 <tr>
-<td align="left">cell 2.1</td>
+<td style="text-align: left;">cell 2.1</td>
 <td>cell 2.2</td>
 </tr>
 </tbody>

test/data/table_inline_markdown.html

@@ -14,5 +14,9 @@
 <td><code>|</code> 2.1</td>
 <td>| 2.2</td>
 </tr>
+<tr>
+<td><code>\|</code> 2.1</td>
+<td><a href="/">link</a></td>
+</tr>
 </tbody>
 </table>

test/data/table_inline_markdown.md

@@ -1,4 +1,5 @@
 | _header_ 1   | header 2     |
 | ------------ | ------------ |
 | _cell_ 1.1   | ~~cell~~ 1.2 |
-| `|` 2.1      | \| 2.2       |
+| `|` 2.1      | \| 2.2       |
+| `\|` 2.1     | [link](/)    |