From 7b643540582f0e96b840b770cdec6e08a3d9afef Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 23 Aug 2015 09:30:32 +0200 Subject: [PATCH] fixed Twig deprecations --- src/Symfony/Bridge/Twig/Node/DumpNode.php | 2 +- src/Symfony/Bridge/Twig/Node/StopwatchNode.php | 2 +- .../Bridge/Twig/Tests/Extension/DumpExtensionTest.php | 6 +++--- .../Twig/Tests/Extension/ExpressionExtensionTest.php | 4 ++-- .../Tests/Extension/Fixtures/StubFilesystemLoader.php | 2 +- .../Twig/Tests/Extension/StopwatchExtensionTest.php | 4 ++-- src/Symfony/Bridge/Twig/Tests/Node/DumpNodeTest.php | 8 ++++---- .../Bundle/TwigBundle/Controller/ExceptionController.php | 6 ++++-- src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php | 2 +- .../Bundle/TwigBundle/TokenParser/RenderTokenParser.php | 2 +- .../Tests/Controller/ProfilerControllerTest.php | 2 +- 11 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/Symfony/Bridge/Twig/Node/DumpNode.php b/src/Symfony/Bridge/Twig/Node/DumpNode.php index bdcb68caa6..522497ba65 100644 --- a/src/Symfony/Bridge/Twig/Node/DumpNode.php +++ b/src/Symfony/Bridge/Twig/Node/DumpNode.php @@ -18,7 +18,7 @@ class DumpNode extends \Twig_Node { private $varPrefix; - public function __construct($varPrefix, \Twig_NodeInterface $values = null, $lineno, $tag = null) + public function __construct($varPrefix, \Twig_Node $values = null, $lineno, $tag = null) { parent::__construct(array('values' => $values), array(), $lineno, $tag); $this->varPrefix = $varPrefix; diff --git a/src/Symfony/Bridge/Twig/Node/StopwatchNode.php b/src/Symfony/Bridge/Twig/Node/StopwatchNode.php index cc12abd05d..06eeb49272 100644 --- a/src/Symfony/Bridge/Twig/Node/StopwatchNode.php +++ b/src/Symfony/Bridge/Twig/Node/StopwatchNode.php @@ -18,7 +18,7 @@ namespace Symfony\Bridge\Twig\Node; */ class StopwatchNode extends \Twig_Node { - public function __construct(\Twig_NodeInterface $name, $body, \Twig_Node_Expression_AssignName $var, $lineno = 0, $tag = null) + public function __construct(\Twig_Node $name, $body, \Twig_Node_Expression_AssignName $var, $lineno = 0, $tag = null) { parent::__construct(array('body' => $body, 'name' => $name, 'var' => $var), array(), $lineno, $tag); } diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php index 36a50190d1..af93114e5a 100644 --- a/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php +++ b/src/Symfony/Bridge/Twig/Tests/Extension/DumpExtensionTest.php @@ -23,7 +23,7 @@ class DumpExtensionTest extends \PHPUnit_Framework_TestCase public function testDumpTag($template, $debug, $expectedOutput, $expectedDumped) { $extension = new DumpExtension(new VarCloner()); - $twig = new \Twig_Environment(new \Twig_Loader_String(), array( + $twig = new \Twig_Environment(new \Twig_Loader_Array(array('template' => $template)), array( 'debug' => $debug, 'cache' => false, 'optimizations' => 0, @@ -35,7 +35,7 @@ class DumpExtensionTest extends \PHPUnit_Framework_TestCase $prevDumper = VarDumper::setHandler(function ($var) use (&$dumped) {$dumped = $var;}); try { - $this->assertEquals($expectedOutput, $twig->render($template)); + $this->assertEquals($expectedOutput, $twig->render('template')); } catch (\Exception $exception) { } @@ -63,7 +63,7 @@ class DumpExtensionTest extends \PHPUnit_Framework_TestCase public function testDump($context, $args, $expectedOutput, $debug = true) { $extension = new DumpExtension(new VarCloner()); - $twig = new \Twig_Environment(new \Twig_Loader_String(), array( + $twig = new \Twig_Environment($this->getMock('Twig_LoaderInterface'), array( 'debug' => $debug, 'cache' => false, 'optimizations' => 0, diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/ExpressionExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/ExpressionExtensionTest.php index 749133c65c..0c7cc1bd41 100644 --- a/src/Symfony/Bridge/Twig/Tests/Extension/ExpressionExtensionTest.php +++ b/src/Symfony/Bridge/Twig/Tests/Extension/ExpressionExtensionTest.php @@ -21,10 +21,10 @@ class ExpressionExtensionTest extends \PHPUnit_Framework_TestCase public function testExpressionCreation() { $template = "{{ expression('1 == 1') }}"; - $twig = new \Twig_Environment(new \Twig_Loader_String(), array('debug' => true, 'cache' => false, 'autoescape' => true, 'optimizations' => 0)); + $twig = new \Twig_Environment(new \Twig_Loader_Array(array('template' => $template)), array('debug' => true, 'cache' => false, 'autoescape' => 'html', 'optimizations' => 0)); $twig->addExtension(new ExpressionExtension()); - $output = $twig->render($template); + $output = $twig->render('template'); $this->assertEquals('1 == 1', $output); } } diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/StubFilesystemLoader.php b/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/StubFilesystemLoader.php index 5a63537a2f..5f306013d9 100644 --- a/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/StubFilesystemLoader.php +++ b/src/Symfony/Bridge/Twig/Tests/Extension/Fixtures/StubFilesystemLoader.php @@ -13,7 +13,7 @@ namespace Symfony\Bridge\Twig\Tests\Extension\Fixtures; class StubFilesystemLoader extends \Twig_Loader_Filesystem { - protected function findTemplate($name) + protected function findTemplate($name, $throw = true) { // strip away bundle name $parts = explode(':', $name); diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/StopwatchExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/StopwatchExtensionTest.php index bac855390f..8c0cdfe69b 100644 --- a/src/Symfony/Bridge/Twig/Tests/Extension/StopwatchExtensionTest.php +++ b/src/Symfony/Bridge/Twig/Tests/Extension/StopwatchExtensionTest.php @@ -28,11 +28,11 @@ class StopwatchExtensionTest extends \PHPUnit_Framework_TestCase */ public function testTiming($template, $events) { - $twig = new \Twig_Environment(new \Twig_Loader_String(), array('debug' => true, 'cache' => false, 'autoescape' => true, 'optimizations' => 0)); + $twig = new \Twig_Environment(new \Twig_Loader_Array(array('template' => $template)), array('debug' => true, 'cache' => false, 'autoescape' => 'html', 'optimizations' => 0)); $twig->addExtension(new StopwatchExtension($this->getStopwatch($events))); try { - $nodes = $twig->render($template); + $nodes = $twig->render('template'); } catch (\Twig_Error_Runtime $e) { throw $e->getPrevious(); } diff --git a/src/Symfony/Bridge/Twig/Tests/Node/DumpNodeTest.php b/src/Symfony/Bridge/Twig/Tests/Node/DumpNodeTest.php index 5fdd54f49e..2553b9ea2a 100644 --- a/src/Symfony/Bridge/Twig/Tests/Node/DumpNodeTest.php +++ b/src/Symfony/Bridge/Twig/Tests/Node/DumpNodeTest.php @@ -19,7 +19,7 @@ class DumpNodeTest extends \PHPUnit_Framework_TestCase { $node = new DumpNode('bar', null, 7); - $env = new \Twig_Environment(); + $env = new \Twig_Environment($this->getMock('Twig_LoaderInterface')); $compiler = new \Twig_Compiler($env); $expected = <<<'EOTXT' @@ -43,7 +43,7 @@ EOTXT; { $node = new DumpNode('bar', null, 7); - $env = new \Twig_Environment(); + $env = new \Twig_Environment($this->getMock('Twig_LoaderInterface')); $compiler = new \Twig_Compiler($env); $expected = <<<'EOTXT' @@ -70,7 +70,7 @@ EOTXT; )); $node = new DumpNode('bar', $vars, 7); - $env = new \Twig_Environment(); + $env = new \Twig_Environment($this->getMock('Twig_LoaderInterface')); $compiler = new \Twig_Compiler($env); $expected = <<<'EOTXT' @@ -93,7 +93,7 @@ EOTXT; )); $node = new DumpNode('bar', $vars, 7); - $env = new \Twig_Environment(); + $env = new \Twig_Environment($this->getMock('Twig_LoaderInterface')); $compiler = new \Twig_Compiler($env); $expected = <<<'EOTXT' diff --git a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php index 3bab43b523..b0c172c1e9 100644 --- a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php +++ b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php @@ -63,7 +63,7 @@ class ExceptionController $code = $exception->getStatusCode(); return new Response($this->twig->render( - $this->findTemplate($request, $request->getRequestFormat(), $code, $showException), + (string) $this->findTemplate($request, $request->getRequestFormat(), $code, $showException), array( 'status_code' => $code, 'status_text' => isset(Response::$statusTexts[$code]) ? Response::$statusTexts[$code] : '', @@ -125,9 +125,11 @@ class ExceptionController return new TemplateReference('TwigBundle', 'Exception', $showException ? 'exception_full' : $name, 'html', 'twig'); } - // to be removed when the minimum required version of Twig is >= 2.0 + // to be removed when the minimum required version of Twig is >= 3.0 protected function templateExists($template) { + $template = (string) $template; + $loader = $this->twig->getLoader(); if ($loader instanceof \Twig_ExistsLoaderInterface) { return $loader->exists($template); diff --git a/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php b/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php index 3c7f925d03..769976b304 100644 --- a/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php +++ b/src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php @@ -63,7 +63,7 @@ class FilesystemLoader extends \Twig_Loader_Filesystem * * @throws \Twig_Error_Loader if the template could not be found */ - protected function findTemplate($template) + protected function findTemplate($template, $throw = true) { $logicalName = (string) $template; diff --git a/src/Symfony/Bundle/TwigBundle/TokenParser/RenderTokenParser.php b/src/Symfony/Bundle/TwigBundle/TokenParser/RenderTokenParser.php index 0d3ae2b86d..b386c9b57f 100644 --- a/src/Symfony/Bundle/TwigBundle/TokenParser/RenderTokenParser.php +++ b/src/Symfony/Bundle/TwigBundle/TokenParser/RenderTokenParser.php @@ -27,7 +27,7 @@ class RenderTokenParser extends \Twig_TokenParser * * @param \Twig_Token $token A \Twig_Token instance * - * @return \Twig_NodeInterface A \Twig_NodeInterface instance + * @return \Twig_Node A \Twig_Node instance */ public function parse(\Twig_Token $token) { diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php index 25b5c82f6c..4a290ad514 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Tests/Controller/ProfilerControllerTest.php @@ -77,7 +77,7 @@ class ProfilerControllerTest extends \PHPUnit_Framework_TestCase public function testSearchResult() { $urlGenerator = $this->getMock('Symfony\Component\Routing\Generator\UrlGeneratorInterface'); - $twig = $this->getMock('Twig_Environment'); + $twig = $this->getMockBuilder('Twig_Environment')->disableOriginalConstructor()->getMock(); $profiler = $this ->getMockBuilder('Symfony\Component\HttpKernel\Profiler\Profiler') ->disableOriginalConstructor()