Gate: Show target in description (#1653)

* Gate: Show target in description

* Tweak text

Author: barryvdh

src/DataCollector/GateCollector.php

@@ -7,6 +7,7 @@
 use Illuminate\Auth\Access\Response;
 use Illuminate\Contracts\Auth\Access\Gate;
 use Illuminate\Contracts\Auth\Authenticatable;
+use Illuminate\Database\Eloquent\Model;
 use Symfony\Component\VarDumper\Cloner\VarCloner;
 use Illuminate\Support\Str;
 
@@ -32,9 +33,12 @@ public function __construct(Gate $gate)
      */
     protected function customizeMessageHtml($messageHtml, $message)
     {
-        $pos = strpos((string) $messageHtml, 'array:4');
+        $pos = strpos((string) $messageHtml, 'array:5');
         if ($pos !== false) {
-            $messageHtml = substr_replace($messageHtml, $message['ability'], $pos, 7);
+
+            $name = $message['ability'] .' ' . $message['target'] ?? '';
+
+            $messageHtml = substr_replace($messageHtml, $name, $pos, 7);
         }
 
         return parent::customizeMessageHtml($messageHtml, $message);
@@ -56,8 +60,19 @@ public function addCheck($user, $ability, $result, $arguments = [])
             $label = $result->allowed() ? 'success' : 'error';
         }
 
+        $target = null;
+        if (isset($arguments[0])) {
+            if ($arguments[0] instanceof Model) {
+                $model = $arguments[0];
+                $target = get_class($model) . '(' . $model->getKeyName() .'=' . $model->getKey().')';
+            } else if (is_string($arguments[0])) {
+                $target = $arguments[0];
+            }
+        }
+
         $this->addMessage([
             'ability' => $ability,
+            'target' => $target,
             'result' => $result,
             $userKey => $userId,
             'arguments' => $this->getDataFormatter()->formatVar($arguments),

tests/DataCollector/GateCollectorTest.php

@@ -37,14 +37,14 @@ public function testItCollectsGateChecks()
         $gateError = $collect['messages'][0];
         $this->assertEquals('error', $gateError['label']);
         $this->assertEquals(
-            '[ability => test, result => null, user => 1, arguments => []]',
+            '[ability => test, target => null, result => null, user => 1, arguments => []]',
             $gateError['message']
         );
 
         $gateSuccess = $collect['messages'][1];
         $this->assertEquals('success', $gateSuccess['label']);
         $this->assertEquals(
-            '[ability => test, result => true, user => 1, arguments => []]',
+            '[ability => test, target => null, result => true, user => 1, arguments => []]',
             $gateSuccess['message']
         );
     }