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

Merge branch '3.x' of github.com:stancl/tenancy into 3.x

Browse source
This commit is contained in:
Samuel Štancl 2020-06-01 09:51:26 +02:00
commit b2c240a9f0
3 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/ci.yml vendored
View file

@ -5,9 +5,9 @@ env:
on:
push:
branches: [ 2.x, master ]
branches: [ 3.x, 2.x, master ]
pull_request:
branches: [ 2.x, master ]
branches: [ 3.x, 2.x, master ]
jobs:
tests:

8
README.md
View file

@ -3,11 +3,11 @@
</p>
<p align="center">
<a href="https://laravel.com"><img alt="Laravel 6.x" src="https://img.shields.io/badge/laravel-6.x-red.svg"></a>
<a href="https://laravel.com"><img alt="Laravel 6.x/7.x" src="https://img.shields.io/badge/laravel-6.x/7.x-red.svg"></a>
<a href="https://packagist.org/packages/stancl/tenancy"><img alt="Latest Stable Version" src="https://poser.pugx.org/stancl/tenancy/version"></a>
<a href="https://github.com/stancl/tenancy/actions"><img alt="GitHub Actions CI status" src="https://github.com/stancl/tenancy/workflows/CI/badge.svg"></a>
<a href="https://codecov.io/gh/stancl/tenancy"><img alt="codecov" src="https://codecov.io/gh/stancl/tenancy/branch/2.x/graph/badge.svg"></a>
<a href="https://github.com/stancl/tenancy/blob/2.x/DONATIONS.md"><img alt="Donate" src="https://img.shields.io/badge/Donate-%3C3-red"></a>
<a href="https://codecov.io/gh/stancl/tenancy"><img alt="codecov" src="https://codecov.io/gh/stancl/tenancy/branch/3.x/graph/badge.svg"></a>
<a href="https://github.com/stancl/tenancy/blob/3.x/DONATIONS.md"><img alt="Donate" src="https://img.shields.io/badge/Donate-%3C3-red"></a>
</p>
<h1><a href="https://tenancyforlaravel.com">Tenancy for Laravel &mdash; stancl/tenancy</a></h1>
@ -26,7 +26,7 @@ Documentation can be found here: https://tenancyforlaravel.com/docs/v2/
The repository with the documentation source code can be found here: [stancl/tenancy-docs](https://github.com/stancl/tenancy-docs).
### [Need help?](https://github.com/stancl/tenancy/blob/2.x/SUPPORT.md)
### [Need help?](https://github.com/stancl/tenancy/blob/3.x/SUPPORT.md)
### Credits

3
src/Features/TenantConfig.php
View file

@ -44,7 +44,6 @@ class TenantConfig implements Feature
public function setTenantConfig(Tenant $tenant): void
{
/** @var Tenant|Model $tenant */
foreach (static::$storageToConfigMap as $storageKey => $configKey) {
$override = $tenant->getAttribute($storageKey);
@ -53,7 +52,7 @@ class TenantConfig implements Feature
foreach ($configKey as $key) {
$this->originalConfig[$key] = $this->originalConfig[$key] ?? $this->config[$key];
$this->config[$key] = $override;
$this->config[$key] = $override;
}
} else {
$this->originalConfig[$configKey] = $this->originalConfig[$configKey] ?? $this->config[$configKey];