Merge pull request #631 from Rattler3/master

Fix deprecated twig filter syntax
liip · Aug 27, 2015 · 91ed657 · 91ed657
2 parents d7325b2 + 1ab5454
commit 91ed657
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Templating/ImagineExtension.php b/Templating/ImagineExtension.php
@@ -27,7 +27,7 @@ public function __construct(CacheManager $cacheManager)
     public function getFilters()
     {
         return array(
-            'imagine_filter' => new \Twig_Filter_Method($this, 'filter'),
+            new \Twig_SimpleFilter('imagine_filter', array($this, 'filter'))
         );
     }
 

diff --git a/composer.json b/composer.json
@@ -34,15 +34,15 @@
         "doctrine/orm":             "~2.3",
         "doctrine/mongodb-odm":     "1.0.*",
         "doctrine/cache":           "~1.1",
-        "twig/twig":                "~1.0",
+        "twig/twig":                "~1.12",
         "aws/aws-sdk-php":          "~2.4",
         "amazonwebservices/aws-sdk-for-php": "~1.0",
         "psr/log":                  "~1.0",
         "ext-gd":                   "*"
     },
 
     "suggest": {
-        "twig/twig":                "If you'd want to use some handy twig filters",
+        "twig/twig":                "If you'd want to use some handy twig filters, version 1.12 or greater required",
         "aws/aws-sdk-php":          "Add it if you'd like to use aws v2 or v3 resolver",
         "amazonwebservices/aws-sdk-for-php": "Add it if you'd like to use aws v1 resolver",
         "monolog/monolog":          "If you'd want to write logs"