support michelf\markdown 1.4+ API

diff --git a/src/phorkie/Renderer/Markdown.php b/src/phorkie/Renderer/Markdown.php
index 628d87f1faa474f850e8269ecf5d2bdd4eebd598..65cb29c0469c062a9a253cc7b955538c0ffc87eb 100644 (file)
--- a/src/phorkie/Renderer/Markdown.php
+++ b/src/phorkie/Renderer/Markdown.php
@@ -13,10 +13,16 @@ class Renderer_Markdown
      */
     public function toHtml(File $file, Tool_Result $res = null)
     {
-        /**
-         */
-        require_once 'markdown.php';
-        $markdown = \markdown($file->getContent());
+        if (class_exists('\\Michelf\\Markdown', true)) {
+            //composer-installed version 1.4+
+            $markdown = \Michelf\Markdown::defaultTransform(
+                $file->getContent()
+            );
+        } else {
+            //PEAR-installed version 1.0.2 has a different API
+            require_once 'markdown.php';
+            $markdown = \markdown($file->getContent());
+        }
 
         return '<div class="markdown">'
             . $markdown

diff --git a/src/phorkie/SetupCheck.php b/src/phorkie/SetupCheck.php
index 62bbf19c54f3392650815849125f5b0d8d8f0d4f..53e4fd036d739552c84c4ce8e3fe5e317ed1268f 100644 (file)
--- a/src/phorkie/SetupCheck.php
+++ b/src/phorkie/SetupCheck.php
@@ -55,9 +55,12 @@ class SetupCheck
             }
         }
 
-        $markdown = stream_resolve_include_path('markdown.php');
-        if ($markdown === false) {
-            $this->fail('Markdown renderer not available');
+        if (!class_exists('\\Michelf\\Markdown', true)) {
+            //PEAR-installed version 1.0.2 has a different API
+            $markdown = stream_resolve_include_path('markdown.php');
+            if ($markdown === false) {
+                $this->fail('Markdown renderer not available');
+            }
         }
     }