Merge branch '2.3'

fabpot · fabpot · commit 25819075a23c · 2013-10-30T16:05:04.000+01:00
* 2.3:
  updated VENDORS for 2.2.8
  updated VENDORS for 2.2.6
  updated VENDORS for 2.2.5
  updated demo code to use the non-deprecated features of Twig
  updated VENDORS for 2.2.4
  updated VENDORS for 2.2.3
  updated VENDORS for 2.2.2
diff --git a/src/Acme/DemoBundle/Twig/Extension/DemoExtension.php b/src/Acme/DemoBundle/Twig/Extension/DemoExtension.php
@@ -25,7 +25,7 @@ public function setController($controller)
     public function getFunctions()
     {
         return array(
-            'code' => new \Twig_Function_Method($this, 'getCode', array('is_safe' => array('html'))),
+            new \Twig_SimpleFunction('code', array($this, 'getCode'), array('is_safe' => array('html'))),
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public function setController($controller)`
`25`	`25`	`public function getFunctions()`
`26`	`26`	`{`
`27`	`27`	`return array(`
`28`		`- 'code' => new \Twig_Function_Method($this, 'getCode', array('is_safe' => array('html'))),`
	`28`	`+ new \Twig_SimpleFunction('code', array($this, 'getCode'), array('is_safe' => array('html'))),`
`29`	`29`	`);`
`30`	`30`	`}`
`31`	`31`