bug #24851 [TwigBridge] Fix BC break due required twig environment (ro0NL)

nicolas-grekas · nicolas-grekas · commit 69b48d012219 · 2017-11-07T14:35:34.000+01:00
This PR was squashed before being merged into the 3.4 branch (closes #24851). Discussion ---------- [TwigBridge] Fix BC break due required twig environment | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes/no | Fixed tickets | #24236 (comment) | License | MIT | Doc PR | symfony/symfony-docs#...  See ezsystems/ezplatform-design-engine#12 + silexphp/Silex-WebProfiler#126 + bolt/bolt#7154 Sorry for that :) cc @fabpot Commits ------- 243e4b2 [TwigBridge] Fix BC break due required twig environment
diff --git a/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php b/src/Symfony/Bridge/Twig/DataCollector/TwigDataCollector.php
@@ -31,7 +31,7 @@ class TwigDataCollector extends DataCollector implements LateDataCollectorInterf
     private $twig;
     private $computed;
 
-    public function __construct(Profile $profile, Environment $twig)
+    public function __construct(Profile $profile, Environment $twig = null)
     {
         $this->profile = $profile;
         $this->twig = $twig;
@@ -62,6 +62,10 @@ public function lateCollect()
         $this->data['profile'] = serialize($this->profile);
         $this->data['template_paths'] = array();
 
+        if (null === $this->twig) {
+            return;
+        }
+
         $templateFinder = function (Profile $profile) use (&$templateFinder) {
             if ($profile->isTemplate()) {
                 try {
