Merge pull request #339 from mvrhov/michelfMarkdown

Replace deprecated fork of dflydev's mardown library with the original o...
nelmio · Feb 19, 2014 · eca9d25 · eca9d25
2 parents ee68eab + 457df81
commit eca9d25
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Twig/Extension/MarkdownExtension.php b/Twig/Extension/MarkdownExtension.php
@@ -2,15 +2,15 @@
 
 namespace Nelmio\ApiDocBundle\Twig\Extension;
 
-use dflydev\markdown\MarkdownExtraParser;
+use Michelf\MarkdownExtra;
 
 class MarkdownExtension extends \Twig_Extension
 {
     private $markdownParser;
 
     public function __construct()
     {
-        $this->markdownParser = new MarkdownExtraParser();
+        $this->markdownParser = new MarkdownExtra();
     }
 
     /**
@@ -33,6 +33,6 @@ public function getName()
 
     public function markdown($text)
     {
-        return $this->markdownParser->transformMarkdown($text);
+        return $this->markdownParser->transform($text);
     }
 }
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
         "symfony/twig-bundle": "~2.1",
         "symfony/framework-bundle": "~2.1",
         "symfony/console": "~2.1",
-        "dflydev/markdown": "~1.0"
+        "michelf/php-markdown": "~1.4"
     },
     "conflict": {
         "jms/serializer": "<0.12",