Merge pull request #67 from KnpLabs/fix/double-escaping

[RFR] Fix double escaping

Parser/MarkdownParser.php

@@ -37,7 +37,7 @@ class MarkdownParser extends MarkdownExtra implements MarkdownParserInterface
         'html_block' => true,
         'auto_link' => true,
         'auto_mailto' => true,
-        'entities' => false,
+        'entities' => true,
         'no_html' => false,
     );
 
@@ -101,10 +101,10 @@ class MarkdownParser extends MarkdownExtra implements MarkdownParserInterface
         if (!$this->features['auto_link']) {
             unset($this->span_gamut['doAutoLinks']);
         }
-        if (!$this->features['entities'] && !$this->features['no_html']) {
+        if (false === $this->features['entities']) {
             $this->no_entities = true;
         }
-        if ($this->features['no_html']) {
+        if (true === $this->features['no_html']) {
             $this->no_html = true;
         }
     }

Tests/FeatureTest.php

@@ -792,4 +792,26 @@ EOF;
 
         $this->assertEquals($html, $parser->transform($text));
     }
+
+    /**
+     * @depends testParser
+     */
+    public function testParagraphContainingBoldContainingAmpersandEscapesProperly($parser) {
+        $text = "Look ma! I can use **beautiful & bold** text with ampersands.";
+
+        $expectedResult = "<p>Look ma! I can use <strong>beautiful &amp; bold</strong> text with ampersands.</p>\n";
+
+        $this->assertEquals($expectedResult, $parser->transform($text));
+    }
+
+    /**
+     * @depends testParser
+     */
+    public function testEscapedLink($parser) {
+        $link = "http://images.google.com/images?num=30&q=larry+bird";
+
+        $expectedResult = "<p>http://images.google.com/images?num=30&amp;q=larry+bird</p>\n";
+
+        $this->assertEquals($expectedResult, $parser->transform($link));
+    }
 }

composer.json

@@ -22,7 +22,9 @@
         "symfony/framework-bundle": "~2.1",
         "michelf/php-markdown":     "1.4.*"
     },
-
+    "require-dev": {
+        "phpunit/phpunit":          "~4.5"
+    },
     "suggest": {
         "symfony/twig-bundle": "to use the Twig markdown filter",
         "ext-sundown": "to use optional support for php-sundown extension instead of php implementation"