aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Weiske <cweiske@cweiske.de>2014-05-16 07:33:33 +0200
committerChristian Weiske <cweiske@cweiske.de>2014-05-16 07:33:33 +0200
commit1bf118847b1fd0540cd259b04488a7fdbc3b4bd0 (patch)
treedac4c902b5c5d3f27e293fc53526789eb0a1af9f
parent50e1018ba0749becdc3e05e9438176a475b70fed (diff)
downloadphorkie-1bf118847b1fd0540cd259b04488a7fdbc3b4bd0.tar.gz
phorkie-1bf118847b1fd0540cd259b04488a7fdbc3b4bd0.zip
support michelf\markdown 1.4+ API
-rw-r--r--src/phorkie/Renderer/Markdown.php14
-rw-r--r--src/phorkie/SetupCheck.php9
2 files changed, 16 insertions, 7 deletions
diff --git a/src/phorkie/Renderer/Markdown.php b/src/phorkie/Renderer/Markdown.php
index 628d87f..65cb29c 100644
--- 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 62bbf19..53e4fd0 100644
--- 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');
+ }
}
}