Merge pull request #30 from 8fold/8fold-sites

switching out Shoop

Author: joshbruce

composer.json

@@ -11,7 +11,7 @@
   ],
   "require": {
     "php": ">=7.0",
-    "8fold/php-shoop": "0.4.*",
+    "8fold/php-shoop-extras": "0.1.*",
     "nesbot/carbon": "2.35.*",
     "league/commonmark": "1.4.*"
   },

src/UIKit/Elements/Compound/Markdown.php

@@ -10,11 +10,11 @@
 use League\CommonMark\HtmlRenderer;
 use League\CommonMark\Extension\Table\TableExtension;
 
-use Eightfold\Shoop\Shoop;
+use Eightfold\ShoopExtras\Shoop;
 
 class Markdown extends HtmlElement
 {
-    private $markdown = '';
+    // private $markdown = '';
 
     private $config = [
         'html_input' => 'strip',
@@ -31,19 +31,17 @@ public function __construct(string $markdown, array $config = [])
 
     public function unfold(): string
     {
-        // Obtain a pre-configured Environment with all the standard CommonMark parsers/renderers ready-to-go
-        $environment = Environment::createCommonMarkEnvironment();
+        return Shoop::markdown($this->markdown)
+            ->html([], [], true, true, $this->config);
+        // // Obtain a pre-configured Environment with all the standard CommonMark parsers/renderers ready-to-go
+        // $environment = Environment::createCommonMarkEnvironment();
 
-        // Add this extension
-        $environment->addExtension(new TableExtension());
+        // // Add this extension
+        // $environment->addExtension(new TableExtension());
 
-        // Instantiate the converter engine and start converting some Markdown!
-        $converter = new Converter(new DocParser($environment), new HtmlRenderer($environment));
+        // // Instantiate the converter engine and start converting some Markdown!
+        // $converter = new Converter(new DocParser($environment), new HtmlRenderer($environment));
 
-        return $converter->convertToHtml($this->markdown);
-
-        $converter = new CommonMarkConverter($this->config);
-
-        return $converter->convertToHtml($this->markdown);
+        // return $converter->convertToHtml($this->markdown);
     }
 }