From 53ba26ce645e97ff6eed7022cce16d65e96ef390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Je=CC=81ro=CC=82me=20Tamarelle?= <jerome@tamarelle.net>
Date: Mon, 4 Apr 2011 23:58:10 +0200
Subject: [PATCH 1/2] Fix README. DI Container does not support ArrayAccess
 anymore

---
 README.markdown | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.markdown b/README.markdown
index 70c8b33..e545932 100644
--- a/README.markdown
+++ b/README.markdown
@@ -24,7 +24,7 @@ You can also define your own Parser class :
 ## USAGE
 
     // Use the service
-    $html = $this->container['markdownParser']->transform($text);
+    $html = $this->container->get('markdownParser')->transform($text);
 
     // Use the helper
     echo $view['markdown']->transform($text);

From 9be7f15be014c5cbf4ea92e347a119aeb08bf172 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Je=CC=81ro=CC=82me=20Tamarelle?= <jerome@tamarelle.net>
Date: Tue, 5 Apr 2011 00:01:16 +0200
Subject: [PATCH 2/2] Don't load MarkdownExtraParser.php if the class
 MarkdownExtraParser already exists (if included previously to replace the one
 provided with the bundle)

---
 Parser/MarkdownParser.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Parser/MarkdownParser.php b/Parser/MarkdownParser.php
index 5f87217..a0e930f 100644
--- a/Parser/MarkdownParser.php
+++ b/Parser/MarkdownParser.php
@@ -2,7 +2,9 @@
 
 namespace Knplabs\Bundle\MarkdownBundle\Parser;
 
-require_once(realpath(__DIR__.'/..').'/vendor/parser/MarkdownExtraParser.php');
+if(!class_exists('\MarkdownExtraParser')) {
+    require_once(realpath(__DIR__.'/..').'/vendor/parser/MarkdownExtraParser.php');
+}
 
 /**
  * MarkdownParser