RetailCRM-Mirror/NelmioApiDocBundle
1
0
Fork 0
mirror of https://github.com/retailcrm/NelmioApiDocBundle.git synced 2025-02-02 15:51:48 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #339 from mvrhov/michelfMarkdown

Browse Source 
Replace deprecated fork of dflydev's mardown library with the original o...
This commit is contained in:
William Durand 2014-02-19 22:34:43 +01:00
commit eca9d25ca7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Twig/Extension/MarkdownExtension.php
View File

@ -2,7 +2,7 @@
namespace Nelmio\ApiDocBundle\Twig\Extension;
use dflydev\markdown\MarkdownExtraParser;
use Michelf\MarkdownExtra;
class MarkdownExtension extends \Twig_Extension
{
@ -10,7 +10,7 @@ class MarkdownExtension extends \Twig_Extension
public function __construct()
{
$this->markdownParser = new MarkdownExtraParser();
$this->markdownParser = new MarkdownExtra();
}
/**
@ -33,6 +33,6 @@ class MarkdownExtension extends \Twig_Extension
public function markdown($text)
{
return $this->markdownParser->transformMarkdown($text);
return $this->markdownParser->transform($text);
}
}

2
composer.json
View File

@ -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",