Minor

Author: daftspunk

Plugin.php

@@ -3,17 +3,13 @@
 use App;
 use Event;
 use Config;
-use BackendAuth;
 use Backend\Models\UserRole;
 use System\Classes\PluginBase;
 use System\Classes\CombineAssets;
 use Illuminate\Foundation\AliasLoader;
 
 /**
- * Debugbar Plugin Information File
- *
- * TODO:
- * - Fix styling by scoping a html reset to phpdebugbar-openhandler and phpdebugbar
+ * Plugin Information File
  */
 class Plugin extends PluginBase
 {
@@ -51,21 +47,23 @@ public function boot()
 
         // Register alias
         $alias = AliasLoader::getInstance();
-        $alias->alias('Debugbar', '\Barryvdh\Debugbar\Facade');
+        $alias->alias('Debugbar', \Barryvdh\Debugbar\Facade::class);
 
         // Register middleware
         if (Config::get('app.debugAjax', false)) {
-            $this->app['Illuminate\Contracts\Http\Kernel']->pushMiddleware('\RainLab\Debugbar\Middleware\InterpretsAjaxExceptions');
+            $this->app['Illuminate\Contracts\Http\Kernel']->pushMiddleware(\RainLab\Debugbar\Middleware\InterpretsAjaxExceptions::class);
         }
 
         // Add styling
-        $addResources = function ($controller) {
-            $debugBar = $this->app->make('Barryvdh\Debugbar\LaravelDebugbar');
+        $addResources = function($controller) {
+            $debugBar = $this->app->make(\Barryvdh\Debugbar\LaravelDebugbar::class);
             if ($debugBar->isEnabled()) {
                 $controller->addCss(url(Config::get('cms.pluginsPath', '/plugins') . '/rainlab/debugbar/assets/css/debugbar.css'));
             }
         };
+
         Event::listen('backend.page.beforeDisplay', $addResources, PHP_INT_MAX);
+
         Event::listen('cms.page.beforeDisplay', $addResources, PHP_INT_MAX);
 
         Event::listen('cms.page.beforeDisplay', function ($controller, $url, $page) {

README.md

@@ -4,6 +4,10 @@ Easily see what's going on under the hood of your October application.
 
 # Installation
 
+To install from the [Marketplace](https://octobercms.com/plugin/rainlab-debugbar), click on the "Add to Project" button and then select the project you wish to add it to and pay for the plugin. Once the plugin has been added to the project, go to the backend and check for updates to pull in the plugin.
+
+To install from the backend, go to **Settings -> Updates & Plugins -> Install Plugins** and then search for `RainLab.DebugBar`.
+
 To install from [the repository](https://github.com/rainlab/debugbar-plugin), clone it into **plugins/rainlab/debugbar** and then run `composer update` from your project root in order to pull in the dependencies.
 
 To install it with Composer, run `composer require rainlab/debugbar-plugin` from your project root.
@@ -14,4 +18,4 @@ Set `debug` to `true` in `config/app.php`, and the debugbar should appear on you
 
 See [barryvdh/laravel-debugbar](https://github.com/barryvdh/laravel-debugbar) for more usage instructions and documentation.
 
-To include exceptions in the response header of ajax calls set `debugAjax` to `true` in `config/app.php`.
+To include exceptions in the response header of ajax calls set `debugAjax` to `true` in `config/app.php`.

classes/ServiceProvider.php

@@ -2,9 +2,11 @@
 
 use Illuminate\Contracts\Http\Kernel;
 use Barryvdh\Debugbar\ServiceProvider as BaseServiceProvider;
-
 use RainLab\Debugbar\Middleware\InjectDebugbar;
 
+/**
+ * ServiceProvider
+ */
 class ServiceProvider extends BaseServiceProvider
 {
     /**
@@ -15,6 +17,7 @@ class ServiceProvider extends BaseServiceProvider
     protected function registerMiddleware($middleware)
     {
         $kernel = $this->app[Kernel::class];
+
         $kernel->pushMiddleware(InjectDebugbar::class);
     }
-}
+}

middleware/InjectDebugbar.php

@@ -1,5 +1,6 @@
 <?php namespace RainLab\Debugbar\Middleware;
 
+use Error;
 use Config;
 use Request;
 use Closure;
@@ -28,9 +29,11 @@ public function handle($request, Closure $next)
         try {
             /** @var \Illuminate\Http\Response $response */
             $response = $next($request);
-        } catch (Exception $e) {
+        }
+        catch (Exception $e) {
             $response = $this->handleException($request, $e);
-        } catch (Error $error) {
+        }
+        catch (Error $error) {
             $e = new FatalThrowableError($error);
             $response = $this->handleException($request, $e);
         }