Merge pull request #482 from stof/patch-1

Switch the Twig integration to use non-deprecated APIs

composer.json

@@ -19,12 +19,15 @@
         "doctrine/annotations": "1.*",
         "doctrine/instantiator": "~1.0.3"
     },
+    "conflict": {
+        "twig/twig": "<1.12"
+    },
     "suggest": {
         "symfony/yaml": "Required if you'd like to serialize data to YAML format."
     },
     "minimum-stability": "dev",
     "require-dev": {
-        "twig/twig": ">=1.8,<2.0-dev",
+        "twig/twig": "~1.12|~2.0",
         "doctrine/orm": "~2.1",
         "doctrine/phpcr-odm": "~1.0.1",
         "jackalope/jackalope-doctrine-dbal": "1.0.*",

src/JMS/Serializer/Twig/SerializerExtension.php

@@ -43,27 +43,17 @@ class SerializerExtension extends \Twig_Extension
     public function getFilters()
     {
         return array(
-            'serialize'      => new \Twig_Filter_Method($this, 'serialize'),
+            new \Twig_SimpleFilter('serialize', array($this, 'serialize')),
         );
     }
 
     public function getFunctions()
     {
         return array(
-            'serialization_context' => new \Twig_Function_Method($this, 'createContext'),
+            new \Twig_SimpleFunction('serialization_context', '\JMS\Serializer\SerializationContext::createContext'),
         );
     }
 
-    /**
-     * Creates the serialization context
-     *
-     * @return SerializationContext
-     */
-    public function createContext()
-    {
-        return SerializationContext::create();
-    }
-
     /**
      * @param object $object
      * @param string $type