From 7c05b45fae889c3541726e67bc5dd52dc6d52876 Mon Sep 17 00:00:00 2001 From: Michiel Missotten Date: Thu, 13 Feb 2014 16:52:14 +0100 Subject: [PATCH] Migration to MichelFortin's implementation. Since flydev has marked his version as deprecated (it was a simple composer port of Michel Fortin's initial project), it seems good to revert the dependency to the stable/continued project. --- MarkdownParserInterface.php | 2 +- Parser/MarkdownParser.php | 6 +++--- composer.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MarkdownParserInterface.php b/MarkdownParserInterface.php index 1cfe2d1..ece239e 100644 --- a/MarkdownParserInterface.php +++ b/MarkdownParserInterface.php @@ -11,5 +11,5 @@ interface MarkdownParserInterface * * @return string rendered html */ - function transformMarkdown($text); + function transform($text); } diff --git a/Parser/MarkdownParser.php b/Parser/MarkdownParser.php index a09e2fa..4491aa7 100644 --- a/Parser/MarkdownParser.php +++ b/Parser/MarkdownParser.php @@ -4,7 +4,7 @@ namespace Knp\Bundle\MarkdownBundle\Parser; use Knp\Bundle\MarkdownBundle\MarkdownParserInterface; -use dflydev\markdown\MarkdownExtraParser; +use Michelf\MarkdownExtra; /** * MarkdownParser @@ -12,7 +12,7 @@ use dflydev\markdown\MarkdownExtraParser; * This class extends the original Markdown parser. * It allows to disable unwanted features to increase performances. */ -class MarkdownParser extends MarkdownExtraParser implements MarkdownParserInterface +class MarkdownParser extends MarkdownExtra implements MarkdownParserInterface { /** * Use the constructor to disable some of them @@ -111,7 +111,7 @@ class MarkdownParser extends MarkdownExtraParser implements MarkdownParserInterf $text = htmlspecialchars($text, ENT_NOQUOTES); } - return parent::transformMarkdown($text); + return parent::transform($text); } /** diff --git a/composer.json b/composer.json index bcea714..49865e4 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "require": { "php": ">=5.3.3", "symfony/framework-bundle": "~2.0", - "dflydev/markdown": "1.0.*@dev" + "michelf/php-markdown": "1.4.0" }, "suggest": {