Merge branch '2.8' into 3.1

fabpot · fabpot · commit d86fc12365a7 · 2016-09-20T14:44:00.000-07:00
* 2.8:
  fixed fixtures
diff --git a/src/Symfony/Component/VarDumper/Tests/Fixtures/Twig.php b/src/Symfony/Component/VarDumper/Tests/Fixtures/Twig.php
@@ -28,6 +28,11 @@ public function getDebugInfo()
     {
         return array (19 => 2);
     }
+
+    public function getSource()
+    {
+        return '';
+    }
 }
 /*   foo bar*/
 /*     twig source*/

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,11 @@ public function getDebugInfo()`
`28`	`28`	`{`
`29`	`29`	`return array (19 => 2);`
`30`	`30`	`}`
	`31`	`+`
	`32`	`+ public function getSource()`
	`33`	`+ {`
	`34`	`+ return '';`
	`35`	`+ }`
`31`	`36`	`}`
`32`	`37`	`/* foo bar*/`
`33`	`38`	`/* twig source*/`