[TwigBridge] fixed Twig_Source required argument

fabpot · fabpot · commit b9a4586b24d6 · 2016-10-21T18:08:29.000-07:00
diff --git a/src/Symfony/Bridge/Twig/Tests/Extension/RoutingExtensionTest.php b/src/Symfony/Bridge/Twig/Tests/Extension/RoutingExtensionTest.php
@@ -23,7 +23,7 @@ public function testEscaping($template, $mustBeEscaped)
         $twig = new \Twig_Environment($this->getMock('Twig_LoaderInterface'), array('debug' => true, 'cache' => false, 'autoescape' => 'html', 'optimizations' => 0));
         $twig->addExtension(new RoutingExtension($this->getMock('Symfony\Component\Routing\Generator\UrlGeneratorInterface')));
 
-        $nodes = $twig->parse($twig->tokenize(new \Twig_Source($template)));
+        $nodes = $twig->parse($twig->tokenize(new \Twig_Source($template, '')));
 
         $this->assertSame($mustBeEscaped, $nodes->getNode('body')->getNode(0)->getNode('expr') instanceof \Twig_Node_Expression_Filter);
     }
diff --git a/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TwigNodeProvider.php b/src/Symfony/Bridge/Twig/Tests/NodeVisitor/TwigNodeProvider.php
@@ -25,7 +25,7 @@ public static function getModule($content)
             new \Twig_Node_Expression_Array(array(), 0),
             new \Twig_Node_Expression_Array(array(), 0),
             null,
-            new \Twig_Source('')
+            new \Twig_Source('', '')
         );
     }
 
diff --git a/src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php b/src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php
@@ -23,7 +23,7 @@ public function testCompile($source, $expected)
     {
         $env = new \Twig_Environment($this->getMock('Twig_LoaderInterface'), array('cache' => false, 'autoescape' => false, 'optimizations' => 0));
         $env->addTokenParser(new FormThemeTokenParser());
-        $stream = $env->tokenize(new \Twig_Source($source));
+        $stream = $env->tokenize(new \Twig_Source($source, ''));
         $parser = new \Twig_Parser($env);
 
         $this->assertEquals($expected, $parser->parse($stream)->getNode('body')->getNode(0));
diff --git a/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php b/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php
@@ -85,7 +85,7 @@ protected function extractTemplate($template, MessageCatalogue $catalogue)
         $visitor = $this->twig->getExtension('Symfony\Bridge\Twig\Extension\TranslationExtension')->getTranslationNodeVisitor();
         $visitor->enable();
 
-        $this->twig->parse($this->twig->tokenize(new \Twig_Source($template)));
+        $this->twig->parse($this->twig->tokenize(new \Twig_Source($template, '')));
 
         foreach ($visitor->getMessages() as $message) {
             $catalogue->set(trim($message[0]), $this->prefix.trim($message[0]), $message[1] ?: $this->defaultDomain);

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public function testEscaping($template, $mustBeEscaped)`
`23`	`23`	`$twig = new \Twig_Environment($this->getMock('Twig_LoaderInterface'), array('debug' => true, 'cache' => false, 'autoescape' => 'html', 'optimizations' => 0));`
`24`	`24`	`$twig->addExtension(new RoutingExtension($this->getMock('Symfony\Component\Routing\Generator\UrlGeneratorInterface')));`
`25`	`25`
`26`		`- $nodes = $twig->parse($twig->tokenize(new \Twig_Source($template)));`
	`26`	`+ $nodes = $twig->parse($twig->tokenize(new \Twig_Source($template, '')));`
`27`	`27`
`28`	`28`	`$this->assertSame($mustBeEscaped, $nodes->getNode('body')->getNode(0)->getNode('expr') instanceof \Twig_Node_Expression_Filter);`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public static function getModule($content)`
`25`	`25`	`new \Twig_Node_Expression_Array(array(), 0),`
`26`	`26`	`new \Twig_Node_Expression_Array(array(), 0),`
`27`	`27`	`null,`
`28`		`- new \Twig_Source('')`
	`28`	`+ new \Twig_Source('', '')`
`29`	`29`	`);`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public function testCompile($source, $expected)`
`23`	`23`	`{`
`24`	`24`	`$env = new \Twig_Environment($this->getMock('Twig_LoaderInterface'), array('cache' => false, 'autoescape' => false, 'optimizations' => 0));`
`25`	`25`	`$env->addTokenParser(new FormThemeTokenParser());`
`26`		`- $stream = $env->tokenize(new \Twig_Source($source));`
	`26`	`+ $stream = $env->tokenize(new \Twig_Source($source, ''));`
`27`	`27`	`$parser = new \Twig_Parser($env);`
`28`	`28`
`29`	`29`	`$this->assertEquals($expected, $parser->parse($stream)->getNode('body')->getNode(0));`