Merge branch 'master' into wip/merge-upstream

* master:
  Minor syntax
  Disable Twig for now
  Prevent double load
  Fixes model pollution when bar is disabled

# Conflicts:
#	Plugin.php
#	classes/ServiceProvider.php
#	updates/version.yaml

Plugin.php

@@ -35,7 +35,6 @@ class Plugin extends PluginBase
 
     /**
      * Returns information about this plugin.
-     *
      * @return array
      */
     public function pluginDetails()
@@ -46,7 +45,7 @@ public function pluginDetails()
             'author'      => 'Winter CMS',
             'icon'        => 'icon-bug',
             'homepage'    => 'https://github.com/wintercms/wn-debugbar-plugin',
-            'replaces'    => ['RainLab.Debugbar' => '<= 3.2.0'],
+            'replaces'    => ['RainLab.Debugbar' => '<= 3.3.2'],
         ];
     }
 
@@ -89,11 +88,17 @@ public function register()
      */
     public function boot()
     {
+        // Disabled by config, halt
+        if (Config::get('debugbar.enabled') === false) {
+            return;
+        }
+
         // Register middleware
         if (Config::get('app.debugAjax', false)) {
             $this->app[HttpKernelContract::class]->pushMiddleware(\Winter\Debugbar\Middleware\InterpretsAjaxExceptions::class);
         }
 
+        // Register custom collectors
         if ($this->app->runningInBackend()) {
             $this->addBackendCollectors();
         } else {

classes/ServiceProvider.php

@@ -17,7 +17,6 @@ class ServiceProvider extends BaseServiceProvider
     protected function registerMiddleware($middleware)
     {
         $kernel = $this->app[Kernel::class];
-
         $kernel->pushMiddleware(InjectDebugbar::class);
     }
 }