Merge pull request #85 from hason/filters

arnaud-lb · arnaud-lb · commit 94b156009e3d · 2015-08-07T11:06:17.000+02:00
Update CommonMark filter
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
         "coffeescript/coffeescript": "~1",
         "michelf/php-markdown": "~1.3",
         "erusev/parsedown": "*",
-        "league/commonmark": ">=0.5",
+        "league/commonmark": ">=0.9",
         "cebe/markdown": "~1",
         "kzykhys/ciconia": "~1",
         "fluxbb/commonmark": "~1@dev",
diff --git a/lib/MtHaml/Filter/Markdown/CommonMark.php b/lib/MtHaml/Filter/Markdown/CommonMark.php
@@ -2,24 +2,21 @@
 
 namespace MtHaml\Filter\Markdown;
 
-use League\CommonMark\DocParser;
-use League\CommonMark\HtmlRenderer;
+use League\CommonMark\Converter;
 use MtHaml\Filter\Markdown;
 
 class CommonMark extends Markdown
 {
-    private $parser;
-    private $renderer;
+    private $converter;
 
-    public function __construct(DocParser $parser, HtmlRenderer $renderer, $forceOptimization = false)
+    public function __construct(Converter $converter, $forceOptimization = false)
     {
         parent::__construct($forceOptimization);
-        $this->parser = $parser;
-        $this->renderer = $renderer;
+        $this->converter = $converter;
     }
 
     public function filter($content, array $context, $options)
     {
-        return $this->renderer->renderBlock($this->parser->parse($content));
+        return $this->converter->convertToHtml($content);
     }
 }
diff --git a/test/MtHaml/Tests/fixtures/environment/less_filter_leafo.test b/test/MtHaml/Tests/fixtures/environment/less_filter_leafo.test
@@ -1,5 +1,7 @@
 --FILE--
 <?php
+// enforce class \lessc from "leafo/lessphp" package and fix conflict with the same class from "oyejorge/less.php" package
+new \lessc_formatter_classic;
 $filter = new MtHaml\Filter\Less\LeafoLess(new \lessc);
 $env = new MtHaml\Environment('twig', array('enable_escaper' => false), array('less' => $filter));
 echo $env->compileString($parts['HAML'], "$file.haml");
diff --git a/test/MtHaml/Tests/fixtures/environment/markdown_filter_commonmark.test b/test/MtHaml/Tests/fixtures/environment/markdown_filter_commonmark.test
@@ -1,7 +1,6 @@
 --FILE--
 <?php
-$cmEnv = League\CommonMark\Environment::createCommonMarkEnvironment();
-$filter = new MtHaml\Filter\Markdown\CommonMark(new League\CommonMark\DocParser($cmEnv), new League\CommonMark\HtmlRenderer($cmEnv));
+$filter = new MtHaml\Filter\Markdown\CommonMark(new League\CommonMark\CommonMarkConverter());
 $env = new MtHaml\Environment('twig', array('enable_escaper' => false), array('markdown' => $filter));
 echo $env->compileString($parts['HAML'], "$file.haml");
 

Original file line number	Diff line number	Diff line change
`@@ -2,24 +2,21 @@`
`2`	`2`
`3`	`3`	`namespace MtHaml\Filter\Markdown;`
`4`	`4`
`5`		`-use League\CommonMark\DocParser;`
`6`		`-use League\CommonMark\HtmlRenderer;`
	`5`	`+use League\CommonMark\Converter;`
`7`	`6`	`use MtHaml\Filter\Markdown;`
`8`	`7`
`9`	`8`	`class CommonMark extends Markdown`
`10`	`9`	`{`
`11`		`- private $parser;`
`12`		`- private $renderer;`
	`10`	`+ private $converter;`
`13`	`11`
`14`		`- public function __construct(DocParser $parser, HtmlRenderer $renderer, $forceOptimization = false)`
	`12`	`+ public function __construct(Converter $converter, $forceOptimization = false)`
`15`	`13`	`{`
`16`	`14`	`parent::__construct($forceOptimization);`
`17`		`- $this->parser = $parser;`
`18`		`- $this->renderer = $renderer;`
	`15`	`+ $this->converter = $converter;`
`19`	`16`	`}`
`20`	`17`
`21`	`18`	`public function filter($content, array $context, $options)`
`22`	`19`	`{`
`23`		`- return $this->renderer->renderBlock($this->parser->parse($content));`
	`20`	`+ return $this->converter->convertToHtml($content);`
`24`	`21`	`}`
`25`	`22`	`}`