From 66d5eab041a33143f49ced4781b6096e000bc2be Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sun, 13 Sep 2015 21:19:02 -0600
Subject: [PATCH] Removed Traceable Twig Environment that has been deprecated
 by the Twig project

---
 system/blueprints/config/system.yaml             | 11 -----------
 system/config/system.yaml                        |  1 -
 .../Common/Twig/TraceableTwigEnvironment.php     | 16 ----------------
 system/src/Grav/Common/Twig/Twig.php             |  5 -----
 4 files changed, 33 deletions(-)
 delete mode 100644 system/src/Grav/Common/Twig/TraceableTwigEnvironment.php

diff --git a/system/blueprints/config/system.yaml b/system/blueprints/config/system.yaml
index f357f9a02..34ed526da 100644
--- 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
index efaddf136..1ea68b99f 100644
--- 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
deleted file mode 100644
index 5de2aad71..000000000
--- a/system/src/Grav/Common/Twig/TraceableTwigEnvironment.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-namespace Grav\Common\Twig;
-
-use Grav\Common\GravTrait;
-
-/**
- * The Twig Environment class is a wrapper that handles configurable permissions
- * for the Twig cache files
- *
- * @author RocketTheme
- * @license MIT
- */
-class TraceableTwigEnvironment extends \DebugBar\Bridge\Twig\TraceableTwigEnvironment
-{
-    use WriteCacheFileTrait;
-}
diff --git a/system/src/Grav/Common/Twig/Twig.php b/system/src/Grav/Common/Twig/Twig.php
index 6ecdb077f..b8750f910 100644
--- a/system/src/Grav/Common/Twig/Twig.php
+++ b/system/src/Grav/Common/Twig/Twig.php
@@ -105,11 +105,6 @@ class Twig
             }
 
             $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) {