generated from Nodarx/template
Compare commits
4 Commits
52fe5194d7
...
2b73615793
| Author | SHA1 | Date | |
|---|---|---|---|
| 2b73615793 | |||
| f4edaade10 | |||
| 8624ee9d83 | |||
| 98f5f85242 |
Generated
+7
-7
@@ -1201,16 +1201,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "phpunit/phpunit",
|
"name": "phpunit/phpunit",
|
||||||
"version": "12.5.31",
|
"version": "12.5.33",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
||||||
"reference": "0608d157a284f15cc73b99a3327eff06b66a176d"
|
"reference": "b98e028a26c5c5ba7e4a54be96ccf35f2914d184"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0608d157a284f15cc73b99a3327eff06b66a176d",
|
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b98e028a26c5c5ba7e4a54be96ccf35f2914d184",
|
||||||
"reference": "0608d157a284f15cc73b99a3327eff06b66a176d",
|
"reference": "b98e028a26c5c5ba7e4a54be96ccf35f2914d184",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@@ -1279,7 +1279,7 @@
|
|||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
|
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
|
||||||
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
|
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
|
||||||
"source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.31"
|
"source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.33"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
@@ -1287,7 +1287,7 @@
|
|||||||
"type": "other"
|
"type": "other"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2026-07-06T14:54:16+00:00"
|
"time": "2026-07-28T13:58:09+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "sebastian/cli-parser",
|
"name": "sebastian/cli-parser",
|
||||||
@@ -2315,5 +2315,5 @@
|
|||||||
"platform-overrides": {
|
"platform-overrides": {
|
||||||
"php": "8.3"
|
"php": "8.3"
|
||||||
},
|
},
|
||||||
"plugin-api-version": "2.6.0"
|
"plugin-api-version": "2.9.0"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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) {
|
||||||
|
|||||||
@@ -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) {
|
||||||
|
|||||||
@@ -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) {
|
||||||
|
|||||||
@@ -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 === []) {
|
||||||
|
|||||||
@@ -200,8 +200,9 @@ class Service implements ServiceBaseInterface, ServiceMutableInterface, ServiceC
|
|||||||
if (isset($data[self::PROPERTY_IDENTITY])) {
|
if (isset($data[self::PROPERTY_IDENTITY])) {
|
||||||
$this->setIdentity($this->freshIdentity(null, $data[self::PROPERTY_IDENTITY]));
|
$this->setIdentity($this->freshIdentity(null, $data[self::PROPERTY_IDENTITY]));
|
||||||
}
|
}
|
||||||
if (isset($data[self::PROPERTY_PRIMARY_ADDRESS]) && is_string($data[self::PROPERTY_PRIMARY_ADDRESS])) {
|
if (isset($data[self::PROPERTY_PRIMARY_ADDRESS])) {
|
||||||
$this->setPrimaryAddress(new Address($data[self::PROPERTY_PRIMARY_ADDRESS]));
|
$value = $data[self::PROPERTY_PRIMARY_ADDRESS];
|
||||||
|
$this->setPrimaryAddress(is_array($value) ? Address::fromArray($value) : new Address((string)$value));
|
||||||
}
|
}
|
||||||
if (isset($data[self::PROPERTY_SECONDARY_ADDRESSES]) && is_array($data[self::PROPERTY_SECONDARY_ADDRESSES])) {
|
if (isset($data[self::PROPERTY_SECONDARY_ADDRESSES]) && is_array($data[self::PROPERTY_SECONDARY_ADDRESSES])) {
|
||||||
$this->setSecondaryAddresses(array_map(
|
$this->setSecondaryAddresses(array_map(
|
||||||
|
|||||||
@@ -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());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -115,7 +115,7 @@ function sameIdentity(a: ServiceIdentity | null, b: ServiceIdentity | null): boo
|
|||||||
variant="outlined"
|
variant="outlined"
|
||||||
prepend-inner-icon="mdi-account"
|
prepend-inner-icon="mdi-account"
|
||||||
class="mb-4"
|
class="mb-4"
|
||||||
autocomplete="username"
|
autocomplete="off"
|
||||||
autocorrect="off"
|
autocorrect="off"
|
||||||
autocapitalize="none"
|
autocapitalize="none"
|
||||||
:rules="[rules.required]"
|
:rules="[rules.required]"
|
||||||
@@ -130,7 +130,7 @@ function sameIdentity(a: ServiceIdentity | null, b: ServiceIdentity | null): boo
|
|||||||
variant="outlined"
|
variant="outlined"
|
||||||
prepend-inner-icon="mdi-lock"
|
prepend-inner-icon="mdi-lock"
|
||||||
class="mb-4"
|
class="mb-4"
|
||||||
autocomplete="current-password"
|
autocomplete="new-password"
|
||||||
:rules="[rules.required]"
|
:rules="[rules.required]"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user