From 9c0c533b4b43b9ba6094516dc3329b8f4046c1a1 Mon Sep 17 00:00:00 2001
From: Sullivan SENECHAL <sullivan@nexylan.com>
Date: Fri, 28 Aug 2015 10:50:28 +0200
Subject: [PATCH] Fix deprecated twig stuff usage
---
Twig/Extension/MarkdownExtension.php | 2 +-
composer.json | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Twig/Extension/MarkdownExtension.php b/Twig/Extension/MarkdownExtension.php
index 75121ac..83c7127 100644
--- a/Twig/Extension/MarkdownExtension.php
+++ b/Twig/Extension/MarkdownExtension.php
@@ -19,7 +19,7 @@ class MarkdownExtension extends \Twig_Extension
public function getFilters()
{
return array(
- 'extra_markdown' => new \Twig_Filter_Method($this, 'markdown', array('is_safe' => array('html'))),
+ new \Twig_SimpleFilter('extra_markdown', array($this, 'markdown'), array('is_safe' => array('html'))),
);
}
diff --git a/composer.json b/composer.json
index 0683999..ea19223 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,8 @@
},
"conflict": {
"jms/serializer": "<0.12",
- "jms/serializer-bundle": "<0.11"
+ "jms/serializer-bundle": "<0.11",
+ "twig/twig": "<1.12"
},
"require-dev": {
"symfony/css-selector": "~2.3",