archtechx/tenancy
1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2025-12-12 12:54:05 +00:00
Code Activity

Merge remote-tracking branch 'origin/master' into merge-public-repo-master

Browse source
This commit is contained in:
Samuel Štancl 2024-02-10 21:55:54 +01:00
commit a430b1de29
2 changed files with 31 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Bootstrappers/QueueTenancyBootstrapper.php
View file

@ -41,7 +41,7 @@ class QueueTenancyBootstrapper implements TenancyBootstrapper
*/
public static function __constructStatic(Application $app): void
{
static::setUpJobListener($app->make(Dispatcher::class), $app->runningUnitTests());
static::setUpJobListener($app->make(Dispatcher::class));
}
public function __construct(Repository $config, QueueManager $queue)
@ -52,7 +52,7 @@ class QueueTenancyBootstrapper implements TenancyBootstrapper
$this->setUpPayloadGenerator();
}
protected static function setUpJobListener(Dispatcher $dispatcher, bool $runningTests): void
protected static function setUpJobListener(Dispatcher $dispatcher): void
{
$previousTenant = null;
@ -69,10 +69,8 @@ class QueueTenancyBootstrapper implements TenancyBootstrapper
});
// If we're running tests, we make sure to clean up after any artisan('queue:work') calls
$revertToPreviousState = function ($event) use (&$previousTenant, $runningTests) {
if ($runningTests) {
static::revertToPreviousState($event, $previousTenant);
}
$revertToPreviousState = function ($event) use (&$previousTenant) {
static::revertToPreviousState($event, $previousTenant);
};
$dispatcher->listen(JobProcessed::class, $revertToPreviousState); // artisan('queue:work') which succeeds