minor #31091 [TwigBridge] fix tests (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit d134dfcbe26c · 2019-04-12T15:50:12.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [TwigBridge] fix tests | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Follows twigphp/Twig#2935 Commits ------- 33c6681 [TwigBridge] fix tests
diff --git a/.travis.yml b/.travis.yml
@@ -48,6 +48,8 @@ before_install:
       # Enable Sury ppa
       sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6B05F25D762E3157
       sudo add-apt-repository -y ppa:ondrej/php
+      sudo rm /etc/apt/sources.list.d/google-chrome.list
+      sudo rm /etc/apt/sources.list.d/mongodb-3.4.list
       sudo apt update
 
     - |
diff --git a/src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php b/src/Symfony/Bridge/Twig/Tests/TokenParser/FormThemeTokenParserTest.php
@@ -30,9 +30,14 @@ public function testCompile($source, $expected)
     {
         $env = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock(), ['cache' => false, 'autoescape' => false, 'optimizations' => 0]);
         $env->addTokenParser(new FormThemeTokenParser());
-        $stream = $env->tokenize(new Source($source, ''));
+        $source = new Source($source, '');
+        $stream = $env->tokenize($source);
         $parser = new Parser($env);
 
+        if (method_exists($expected, 'setSourceContext')) {
+            $expected->setSourceContext($source);
+        }
+
         $this->assertEquals($expected, $parser->parse($stream)->getNode('body')->getNode(0));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,14 @@ public function testCompile($source, $expected)`
`30`	`30`	`{`
`31`	`31`	`$env = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock(), ['cache' => false, 'autoescape' => false, 'optimizations' => 0]);`
`32`	`32`	`$env->addTokenParser(new FormThemeTokenParser());`
`33`		`- $stream = $env->tokenize(new Source($source, ''));`
	`33`	`+ $source = new Source($source, '');`
	`34`	`+ $stream = $env->tokenize($source);`
`34`	`35`	`$parser = new Parser($env);`
`35`	`36`
	`37`	`+ if (method_exists($expected, 'setSourceContext')) {`
	`38`	`+ $expected->setSourceContext($source);`
	`39`	`+ }`
	`40`	`+`
`36`	`41`	`$this->assertEquals($expected, $parser->parse($stream)->getNode('body')->getNode(0));`
`37`	`42`	`}`
`38`	`43`