Commit 147d7cc0 authored by Fabien Potencier's avatar Fabien Potencier

fixed Twig deprecation notices

parent d2dab720
...@@ -97,8 +97,8 @@ class TwigServiceProvider implements ServiceProviderInterface ...@@ -97,8 +97,8 @@ class TwigServiceProvider implements ServiceProviderInterface
} }
if (isset($app['form.factory'])) { if (isset($app['form.factory'])) {
$app['twig.form.engine'] = function ($app) { $app['twig.form.engine'] = function ($app) use ($twig) {
return new TwigRendererEngine($app['twig.form.templates']); return new TwigRendererEngine($app['twig.form.templates'], $twig);
}; };
$app['twig.form.renderer'] = function ($app) { $app['twig.form.renderer'] = function ($app) {
......
...@@ -49,11 +49,11 @@ class TwigServiceProviderTest extends \PHPUnit_Framework_TestCase ...@@ -49,11 +49,11 @@ class TwigServiceProviderTest extends \PHPUnit_Framework_TestCase
'twig.templates' => array('foo' => 'foo'), 'twig.templates' => array('foo' => 'foo'),
)); ));
$loader = $this->getMockBuilder('\Twig_LoaderInterface')->getMock(); $loader = $this->getMockBuilder('\Twig_LoaderInterface')->getMock();
$loader->expects($this->never())->method('getSource'); $loader->expects($this->never())->method('getSourceContext');
$app['twig.loader.filesystem'] = function ($app) use ($loader) { $app['twig.loader.filesystem'] = function ($app) use ($loader) {
return $loader; return $loader;
}; };
$this->assertEquals('foo', $app['twig.loader']->getSource('foo')); $this->assertEquals('foo', $app['twig.loader']->getSourceContext('foo')->getCode());
} }
public function testHttpFoundationIntegration() public function testHttpFoundationIntegration()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment