Merge pull request #1 from DevToolsCZ/main

Success Fix ready for new Version

Author: EncryptSL

src/Extra/Parsedown.php

@@ -17,12 +17,8 @@
 
 class Parsedown
 {
-    # ~
-
     const version = '1.8.0-beta-7';
 
-    # ~
-
     function text($text)
     {
         $Elements = $this->textElements($text);

src/LatteMarkdown.php

@@ -6,20 +6,20 @@
 
 use Devtoolcz\Markdown\Extra\Parsedown;
 use Latte\Runtime\FilterInfo;
-use ParseAdapter;
+use Nette\Utils\Html;
 
 class LatteMarkdown
 {
-	/** @var ParseAdapter */
-	private $parseAdapter;
+	/** @var Parsedown */
+	private $parsedown;
 
-	public function __construct(ParseAdapter $parseAdapter) {
-		$this->parseAdapter = $parseAdapter;
+	public function __construct(Parsedown $parsedown) {
+		$this->parsedown = $parsedown;
 	}
 
-	public function apply(FilterInfo $filterInfo, $text)
+	public function apply(FilterInfo $info, $text)
 	{
-		$this->parseAdapter->process($text);
+		$html = new Html();
+		return $html::el()->setHtml($this->parsedown->parse($text));
 	}
-
 }

src/Nette/DI/MarkdownExtension.php

@@ -4,6 +4,7 @@
 
 namespace Devtoolcz\Markdown\Nette\DI;
 
+use Devtoolcz\Markdown\Extra\Parsedown;
 use Devtoolcz\Markdown\LatteMarkdown;
 use Devtoolcz\Markdown\ParseAdapter;
 use Nette\Bridges\ApplicationLatte\ILatteFactory;
@@ -27,8 +28,8 @@ public function loadConfiguration(): void
 	{
 		$builder = $this->getContainerBuilder();
 
-		$builder->addDefinition($this->prefix('parsedown'))
-			->setFactory(ParseAdapter::class);
+		$builder->addDefinition($this->prefix('parseDown'))
+			->setFactory(Parsedown::class);
 	}
 
 	public function beforeCompile()
@@ -39,9 +40,11 @@ public function beforeCompile()
 			throw new InvalidStateException(sprintf('Service which implements %s not found.', ILatteFactory::class));
 
 		$config = (array) $this->config;
+
 		$latte = $builder->getDefinitionByType(ILatteFactory::class);
 		assert($latte instanceof FactoryDefinition);
-		$latte->getResultDefinition()->addSetup('addFilter', $config['syntax_helper'], [new Statement(LatteMarkdown::class)], '');
+
+		$latte->getResultDefinition()->addSetup('addFilter', [$config['syntax_helper'], [new Statement(LatteMarkdown::class), 'apply']]);
 	}
 
 }