Nodarx/provider_imap
1
0
Fork 0
generated from Nodarx/template
Code Issues 1 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

refactor: migrate to scoped execution contexts

Browse Source 
Signed-off-by: Sebastian Krupinski <krupinski01@gmail.com>
This commit is contained in:
Sebastian Krupinski
2026-07-27 00:50:43 -04:00
parent 067c748b98
commit 98f5f85242
5 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Console/ConnectCommand.php
+3 -3
View File
@@ -13,7 +13,7 @@ use KTXM\ProviderImap\Providers\Provider;
use KTXM\ProviderImap\Providers\Service; use KTXM\ProviderImap\Providers\Service;
use KTXM\ProviderImap\Providers\ServiceIdentityBasic; use KTXM\ProviderImap\Providers\ServiceIdentityBasic;
use KTXM\ProviderImap\Providers\ServiceLocation; use KTXM\ProviderImap\Providers\ServiceLocation;
use KTXC\SessionTenant; use KTXC\Context\TenantContext;
use Symfony\Component\Console\Attribute\AsCommand; use Symfony\Component\Console\Attribute\AsCommand;
use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputArgument;
@@ -41,7 +41,7 @@ class ConnectCommand extends Command
{ {
public function __construct( public function __construct(
private readonly Provider $provider, private readonly Provider $provider,
private readonly SessionTenant $sessionTenant, private readonly TenantContext $tenantContext,
) { ) {
parent::__construct(); parent::__construct();
} }
@@ -186,7 +186,7 @@ class ConnectCommand extends Command
// ── Persist ────────────────────────────────────────────────────────── // ── Persist ──────────────────────────────────────────────────────────
$this->sessionTenant->configureById($tenantId); $this->tenantContext->resolveIdentifier($tenantId);
$label = $io->ask('Service label', $username); $label = $io->ask('Service label', $username);
if ($label) { if ($label) {
lib/Console/DisconnectCommand.php
+4 -4
View File
@@ -11,7 +11,7 @@ namespace KTXM\ProviderImap\Console;
use KTXM\ProviderImap\Providers\Provider; use KTXM\ProviderImap\Providers\Provider;
use KTXM\ProviderImap\Providers\Service; use KTXM\ProviderImap\Providers\Service;
use KTXC\SessionTenant; use KTXC\Context\TenantContext;
use Symfony\Component\Console\Attribute\AsCommand; use Symfony\Component\Console\Attribute\AsCommand;
use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputArgument;
@@ -37,7 +37,7 @@ class DisconnectCommand extends Command
{ {
public function __construct( public function __construct(
private readonly Provider $provider, private readonly Provider $provider,
private readonly SessionTenant $sessionTenant, private readonly TenantContext $tenantContext,
) { ) {
parent::__construct(); parent::__construct();
} }
@@ -86,7 +86,7 @@ class DisconnectCommand extends Command
$userId = (string) ($input->getOption('user') ?? ''); $userId = (string) ($input->getOption('user') ?? '');
if ($tenantId !== '' && $userId !== '') { if ($tenantId !== '' && $userId !== '') {
$this->sessionTenant->configureById($tenantId); $this->tenantContext->resolveIdentifier($tenantId);
$services = $this->provider->serviceList($tenantId, $userId); $services = $this->provider->serviceList($tenantId, $userId);
if (empty($services)) { if (empty($services)) {
@@ -130,7 +130,7 @@ class DisconnectCommand extends Command
} }
// ── Fetch service for display ──────────────────────────────────────── // ── Fetch service for display ────────────────────────────────────────
$this->sessionTenant->configureById($tenantId); $this->tenantContext->resolveIdentifier($tenantId);
$service = $this->provider->serviceFetch($tenantId, $userId, $serviceId); $service = $this->provider->serviceFetch($tenantId, $userId, $serviceId);
if ($service === null) { if ($service === null) {
lib/Console/DiscoverCommand.php
+3 -3
View File
@@ -14,7 +14,7 @@ use KTXM\ProviderImap\Providers\Service;
use KTXM\ProviderImap\Providers\ServiceIdentityBasic; use KTXM\ProviderImap\Providers\ServiceIdentityBasic;
use KTXM\ProviderImap\Providers\ServiceLocation; use KTXM\ProviderImap\Providers\ServiceLocation;
use KTXM\ProviderImap\Service\Discovery; use KTXM\ProviderImap\Service\Discovery;
use KTXC\SessionTenant; use KTXC\Context\TenantContext;
use Symfony\Component\Console\Attribute\AsCommand; use Symfony\Component\Console\Attribute\AsCommand;
use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputArgument;
@@ -43,7 +43,7 @@ class DiscoverCommand extends Command
public function __construct( public function __construct(
private readonly Provider $provider, private readonly Provider $provider,
private readonly Discovery $discovery, private readonly Discovery $discovery,
private readonly SessionTenant $sessionTenant, private readonly TenantContext $tenantContext,
) { ) {
parent::__construct(); parent::__construct();
} }
@@ -210,7 +210,7 @@ class DiscoverCommand extends Command
// ── Persist ────────────────────────────────────────────────────────── // ── Persist ──────────────────────────────────────────────────────────
$this->sessionTenant->configureById($tenantId); $this->tenantContext->resolveIdentifier($tenantId);
$label = $io->ask('Service label', $address); $label = $io->ask('Service label', $address);
if ($label) { if ($label) {
lib/Console/TestCommand.php
+4 -4
View File
@@ -9,7 +9,7 @@ declare(strict_types=1);
namespace KTXM\ProviderImap\Console; namespace KTXM\ProviderImap\Console;
use KTXC\SessionTenant; use KTXC\Context\TenantContext;
use KTXM\ProviderImap\Client\Command\SelectCommand; use KTXM\ProviderImap\Client\Command\SelectCommand;
use KTXM\ProviderImap\Client\FetchOptions; use KTXM\ProviderImap\Client\FetchOptions;
use KTXM\ProviderImap\Client\FetchTarget; use KTXM\ProviderImap\Client\FetchTarget;
@@ -41,7 +41,7 @@ class TestCommand extends Command
{ {
public function __construct( public function __construct(
private readonly Provider $provider, private readonly Provider $provider,
private readonly SessionTenant $sessionTenant, private readonly TenantContext $tenantContext,
) { ) {
parent::__construct(); parent::__construct();
} }
@@ -108,7 +108,7 @@ class TestCommand extends Command
return Command::FAILURE; return Command::FAILURE;
} }
$this->sessionTenant->configureById($tenantId); $this->tenantContext->resolveIdentifier($tenantId);
$service = $this->provider->serviceFetch($tenantId, $userId, $serviceId); $service = $this->provider->serviceFetch($tenantId, $userId, $serviceId);
if ($service === null) { if ($service === null) {
@@ -269,7 +269,7 @@ class TestCommand extends Command
return; return;
} }
$this->sessionTenant->configureById($tenantId); $this->tenantContext->resolveIdentifier($tenantId);
$services = $this->provider->serviceList($tenantId, $userId); $services = $this->provider->serviceList($tenantId, $userId);
if ($services === []) { if ($services === []) {
lib/Service/Remote/RemoteMailService.php
+1 -2
View File
@@ -11,7 +11,6 @@ namespace KTXM\ProviderImap\Service\Remote;
use DateTimeImmutable; use DateTimeImmutable;
use Generator; use Generator;
use KTXC\Server;
use KTXC\Logger\PlainFileLogger; use KTXC\Logger\PlainFileLogger;
use KTXM\ProviderImap\Client\Client as ImapClient; use KTXM\ProviderImap\Client\Client as ImapClient;
use KTXM\ProviderImap\Client\Command\AppendCommand; use KTXM\ProviderImap\Client\Command\AppendCommand;
@@ -132,7 +131,7 @@ class RemoteMailService
return null; return null;
} }
$logDir = Server::getInstance()?->logDir() ?? __DIR__ . '/../../../../../var/log'; $logDir = dirname(__DIR__, 5) . '/var/log';
return new PlainFileLogger($logDir . '/' . $channel, $this->service->identifier()); return new PlainFileLogger($logDir . '/' . $channel, $this->service->identifier());
} }