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

Use more accurate terminology

Browse source
This commit is contained in:
lukinovec 2025-07-31 16:54:08 +02:00
parent 7bdbe9d880
commit c180c2c54e
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Bootstrappers/LogTenancyBootstrapper.php
View file

@ -36,7 +36,7 @@ class LogTenancyBootstrapper implements TenancyBootstrapper
* Custom channel configuration overrides. * Custom channel configuration overrides.
* *
* Examples: * Examples:
* - Array mapping (the default approach): ['slack' => ['url' => 'webhookUrl']] maps $tenant->webhookUrl to slack.url (if $tenant->webhookUrl is set, otherwise, the override is ignored) * - Array mapping (the default approach): ['slack' => ['url' => 'webhookUrl']] maps $tenant->webhookUrl to slack.url (if $tenant->webhookUrl is not null, otherwise, the override is ignored)
* - Closure: ['slack' => fn ($config, $tenant) => $config->set('logging.channels.slack.url', $tenant->slackUrl)] * - Closure: ['slack' => fn ($config, $tenant) => $config->set('logging.channels.slack.url', $tenant->slackUrl)]
*/ */
public static array $channelOverrides = []; public static array $channelOverrides = [];
@ -109,8 +109,8 @@ class LogTenancyBootstrapper implements TenancyBootstrapper
protected function overrideChannelConfig(string $channel, array|Closure $override, Tenant $tenant): void protected function overrideChannelConfig(string $channel, array|Closure $override, Tenant $tenant): void
{ {
if (is_array($override)) { if (is_array($override)) {
// Map tenant properties to channel config keys. // Map tenant attributes to channel config keys.
// If the tenant property is not set (= is null), // If the tenant attribute is null,
// the override is ignored and the channel config key's value remains unchanged. // the override is ignored and the channel config key's value remains unchanged.
foreach ($override as $configKey => $tenantAttributeName) { foreach ($override as $configKey => $tenantAttributeName) {
$tenantAttribute = $tenant->getAttribute($tenantAttributeName); $tenantAttribute = $tenant->getAttribute($tenantAttributeName);

6
tests/Bootstrappers/LogTenancyBootstrapperTest.php
View file

@ -135,17 +135,17 @@ test('channel overrides work correctly with both arrays and closures', function
expect(config('logging.channels.slack.username'))->toBe('Default'); // Not changed at all expect(config('logging.channels.slack.username'))->toBe('Default'); // Not changed at all
}); });
test('channel config keys remains unchanged if the specified tenant override property is not set', function() { test('channel config keys remains unchanged if the specified tenant override attribute is null', function() {
config(['logging.default' => 'slack']); config(['logging.default' => 'slack']);
config(['logging.channels.slack.username' => 'Default username']); config(['logging.channels.slack.username' => 'Default username']);
LogTenancyBootstrapper::$channelOverrides = [ LogTenancyBootstrapper::$channelOverrides = [
'slack' => ['username' => 'nonExistentProperty'], // $tenant->nonExistentProperty 'slack' => ['username' => 'nonExistentAttribute'], // $tenant->nonExistentAttribute
]; ];
tenancy()->initialize(Tenant::create()); tenancy()->initialize(Tenant::create());
// The username should remain unchanged since the tenant property is not set // The username should remain unchanged since the tenant attribute is null
expect(config('logging.channels.slack.username'))->toBe('Default username'); expect(config('logging.channels.slack.username'))->toBe('Default username');
}); });