From 2def3b20dda9454af05962e842c17b1d9360a0e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20=C5=A0tancl?= Date: Thu, 17 Oct 2019 19:24:27 +0200 Subject: [PATCH] Better dependency injection --- .../QueueTenancyBootstrapper.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/TenancyBootstrappers/QueueTenancyBootstrapper.php b/src/TenancyBootstrappers/QueueTenancyBootstrapper.php index 9568d8bf..c547215c 100644 --- a/src/TenancyBootstrappers/QueueTenancyBootstrapper.php +++ b/src/TenancyBootstrappers/QueueTenancyBootstrapper.php @@ -4,7 +4,8 @@ declare(strict_types=1); namespace Stancl\Tenancy\TenancyBootstrappers; -use Illuminate\Contracts\Foundation\Application; +use Illuminate\Config\Repository; +use Illuminate\Queue\QueueManager; use Illuminate\Support\Testing\Fakes\QueueFake; use Stancl\Tenancy\Contracts\TenancyBootstrapper; use Stancl\Tenancy\Tenant; @@ -14,16 +15,15 @@ class QueueTenancyBootstrapper implements TenancyBootstrapper /** @var bool Has tenancy been started. */ public $started = false; - /** @var Application */ - protected $app; + /** @var Repository */ + protected $config; - public function __construct(Application $app) + public function __construct(Repository $config, QueueManager $queue) { - $this->app = $app; + $this->config = $config; $bootstrapper = &$this; - $queue = $this->app['queue']; if (! $queue instanceof QueueFake) { $queue->createPayloadUsing(function ($connection) use (&$bootstrapper) { return $bootstrapper->getPayload($connection); @@ -47,7 +47,7 @@ class QueueTenancyBootstrapper implements TenancyBootstrapper return []; } - if ($this->app['config']["queue.connections.$connection.tenancy"] === false) { + if ($this->config["queue.connections.$connection.tenancy"] === false) { return []; }