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

merge conflicts

Browse source
This commit is contained in:
Samuel Štancl 2019-10-27 20:19:57 +01:00
commit b734a25fec
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/StorageDrivers/Database/DomainRepository.php
View file

@ -1,5 +1,7 @@
<?php <?php
declare(strict_types=1);
namespace Stancl\Tenancy\StorageDrivers\Database; namespace Stancl\Tenancy\StorageDrivers\Database;
use Illuminate\Config\Repository as ConfigRepository; use Illuminate\Config\Repository as ConfigRepository;

2
src/StorageDrivers/Database/Repository.php
View file

@ -1,5 +1,7 @@
<?php <?php
declare(strict_types=1);
namespace Stancl\Tenancy\StorageDrivers\Database; namespace Stancl\Tenancy\StorageDrivers\Database;
use Illuminate\Config\Repository as ConfigRepository; use Illuminate\Config\Repository as ConfigRepository;

3
src/StorageDrivers/Database/TenantRepository.php
View file

@ -1,5 +1,7 @@
<?php <?php
declare(strict_types=1);
namespace Stancl\Tenancy\StorageDrivers\Database; namespace Stancl\Tenancy\StorageDrivers\Database;
use Illuminate\Config\Repository as ConfigRepository; use Illuminate\Config\Repository as ConfigRepository;
@ -99,6 +101,7 @@ class TenantRepository extends Repository
foreach ($keys as $key => $key) { foreach ($keys as $key => $key) {
if (in_array($key, static::customColumns())) { if (in_array($key, static::customColumns())) {
$data[$key] = null; $data[$key] = null;
return; return;
} else { } else {
unset($jsonData[$key]); unset($jsonData[$key]);