Merge pull request barryvdh#456 from plapinski/fixes

barryvdh · barryvdh · commit fa9ed251cf35 · 2016-01-30T17:27:03.000+01:00
[5.2] Add support for multi auth
diff --git a/src/DataCollector/MultiAuthCollector.php b/src/DataCollector/MultiAuthCollector.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace Barryvdh\Debugbar\DataCollector;
+
+/**
+ * Collector for Laravel's Auth provider
+ */
+class MultiAuthCollector extends AuthCollector
+{
+    /** @var array $guards */
+    protected $guards;
+
+    /**
+     * @param \Illuminate\Auth\AuthManager $auth
+     * @param array $guards
+     */
+    public function __construct($auth, $guards)
+    {
+        parent::__construct($auth);
+        $this->guards = $guards;
+    }
+
+
+    /**
+     * @{inheritDoc}
+     */
+    public function collect()
+    {
+        $data = [];
+        $names = '';
+
+        foreach($this->guards as $guardName) {
+            $user = $this->auth->guard($guardName)->user();
+            $data['guards'][$guardName] = $this->getUserInformation($user);
+            if(!is_null($user)) {
+                $names .= $guardName . ": " . $data['guards'][$guardName]['name'] . ', ';
+            }
+        }
+
+        foreach ($data['guards'] as $key => $var) {
+            if (!is_string($data['guards'][$key])) {
+                $data['guards'][$key] = $this->formatVar($var);
+            }
+        }
+
+        $data['names'] = rtrim($names, ', ');
+
+        return $data;
+    }
+    
+    /**
+     * @{inheritDoc}
+     */
+    public function getWidgets()
+    {
+        $widgets = array(
+            "auth" => array(
+                "icon" => "lock",
+                "widget" => "PhpDebugBar.Widgets.VariableListWidget",
+                "map" => "auth.guards",
+                "default" => "{}"
+            )
+        );
+
+        if ($this->showName) {
+            $widgets['auth.name'] = array(
+                'icon' => 'user',
+                'tooltip' => 'Auth status',
+                'map' => 'auth.names',
+                'default' => '',
+            );
+        }
+
+        return $widgets;
+    }
+}
diff --git a/src/LaravelDebugbar.php b/src/LaravelDebugbar.php
@@ -6,6 +6,7 @@
 use Barryvdh\Debugbar\DataCollector\GateCollector;
 use Barryvdh\Debugbar\DataCollector\LaravelCollector;
 use Barryvdh\Debugbar\DataCollector\LogsCollector;
+use Barryvdh\Debugbar\DataCollector\MultiAuthCollector;
 use Barryvdh\Debugbar\DataCollector\QueryCollector;
 use Barryvdh\Debugbar\DataCollector\SessionCollector;
 use Barryvdh\Debugbar\DataCollector\SymfonyRequestCollector;
@@ -355,7 +356,14 @@ function ($query, $bindings = null, $time = null, $connectionName = null) use ($
 
         if ($this->shouldCollect('auth', false)) {
             try {
-                $authCollector = new AuthCollector($app['auth']);
+                if($this->checkVersion('5.2')) {
+                    // fix for compatibility with Laravel 5.2.*
+                    $guards = array_keys($this->app['config']->get('auth.guards'));
+                    $authCollector = new MultiAuthCollector($app['auth'], $guards);
+                } else {
+                    $authCollector = new AuthCollector($app['auth']);
+                }
+
                 $authCollector->setShowName(
                     $this->app['config']->get('debugbar.options.auth.show_name')
                 );
