From ebec9264104975d2139c603eabed46f2bd81f88e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20=C5=A0tancl?= Date: Sun, 14 Jun 2020 14:18:49 +0200 Subject: [PATCH] Telescope v3 tags --- src/Bootstrappers/QueueTenancyBootstrapper.php | 3 --- src/Features/TelescopeTags.php | 18 +++--------------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/src/Bootstrappers/QueueTenancyBootstrapper.php b/src/Bootstrappers/QueueTenancyBootstrapper.php index b8015d75..5923928d 100644 --- a/src/Bootstrappers/QueueTenancyBootstrapper.php +++ b/src/Bootstrappers/QueueTenancyBootstrapper.php @@ -23,9 +23,6 @@ class QueueTenancyBootstrapper implements TenancyBootstrapper /** @var QueueManager */ protected $queue; - /** @var Dispatcher */ - protected $event; - /** * The normal constructor is only executed after tenancy is bootstrapped. * However, we're registering a hook to initialize tenancy. Therefore, diff --git a/src/Features/TelescopeTags.php b/src/Features/TelescopeTags.php index a3b9cdda..0a580d23 100644 --- a/src/Features/TelescopeTags.php +++ b/src/Features/TelescopeTags.php @@ -11,9 +11,6 @@ use Stancl\Tenancy\Tenancy; class TelescopeTags implements Feature { - /** @var callable User-specific callback that returns tags. */ - public static $getTagsUsing; - public function bootstrap(Tenancy $tenancy): void { if (! class_exists(Telescope::class)) { @@ -21,28 +18,19 @@ class TelescopeTags implements Feature } Telescope::tag(function (IncomingEntry $entry) { - $tags = $this->getTags($entry); + $tags = []; if (! request()->route()) { return $tags; } if (tenancy()->initialized) { - $tags = array_merge($tags, [ + $tags = [ 'tenant:' . tenant('id'), - ]); + ]; } return $tags; }); } - - public static function getTags(IncomingEntry $entry): array - { - $callback = static::$getTagsUsing ?? function () { - return []; - }; - - return $callback($entry); - } }