Removed Traceable Twig Environment that has been deprecated by the Tw…

…ig project
getgrav · Sep 14, 2015 · 66d5eab · 66d5eab
1 parent 075c5f9
commit 66d5eab
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 33 deletions.
diff --git a/system/blueprints/config/system.yaml b/system/blueprints/config/system.yaml
@@ -620,17 +620,6 @@ form:
                     validate:
                         type: bool
 
-                debugger.twig:
-                    type: toggle
-                    label: PLUGIN_ADMIN.DEBUG_TWIG
-                    help: PLUGIN_ADMIN.DEBUG_TWIG_HELP
-                    highlight: 1
-                    options:
-                        1: PLUGIN_ADMIN.YES
-                        0: PLUGIN_ADMIN.NO
-                    validate:
-                        type: bool
-
                 debugger.shutdown.close_connection:
                     type: toggle
                     label: PLUGIN_ADMIN.SHUTDOWN_CLOSE_CONNECTION

diff --git a/system/config/system.yaml b/system/config/system.yaml
@@ -87,7 +87,6 @@ errors:
 
 debugger:
   enabled: false                       # Enable Grav debugger and following settings
-  twig: true                           # Enable debugging of Twig templates
   shutdown:
     close_connection: true             # Close the connection before calling onShutdown(). false for debugging
 

diff --git a/system/src/Grav/Common/Twig/TraceableTwigEnvironment.php b/system/src/Grav/Common/Twig/TraceableTwigEnvironment.php
diff --git a/system/src/Grav/Common/Twig/Twig.php b/system/src/Grav/Common/Twig/Twig.php
@@ -105,11 +105,6 @@ public function init()
             }
 
             $this->twig = new TwigEnvironment($loader_chain, $params);
-            if ($debugger->enabled() && $config->get('system.debugger.twig')) {
-                $this->twig = new TraceableTwigEnvironment($this->twig);
-                $collector = new \DebugBar\Bridge\Twig\TwigCollector($this->twig);
-                $debugger->addCollector($collector);
-            }
 
             if ($config->get('system.twig.undefined_functions')) {
                 $this->twig->registerUndefinedFunctionCallback(function ($name) {