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

PHP 8 support, test workflow syntax

Browse source
This commit is contained in:
Samuel Štancl 2020-11-30 16:14:08 +01:00
parent 126afcd0dd
commit 1f02310da9
5 changed files with 38 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Bootstrappers/FilesystemTenancyBootstrapper.php
View file

@ -59,7 +59,11 @@ class FilesystemTenancyBootstrapper implements TenancyBootstrapper
$filesystemDisk = Storage::disk($disk);
$this->originalPaths['disks'][$disk] = $filesystemDisk->getAdapter()->getPathPrefix();
if ($root = str_replace('%storage_path%', storage_path(), $this->app['config']["tenancy.filesystem.root_override.{$disk}"])) {
if ($root = str_replace(
'%storage_path%',
storage_path(),
$this->app['config']["tenancy.filesystem.root_override.{$disk}"] ?? ''
)) {
$filesystemDisk->getAdapter()->setPathPrefix($finalPrefix = $root);
} else {
$root = $this->app['config']["filesystems.disks.{$disk}.root"];

12
src/Concerns/CreatesDatabaseUsers.php
View file

@ -10,19 +10,15 @@ trait CreatesDatabaseUsers
{
public function createDatabase(TenantWithDatabase $tenant): bool
{
return $this->database()->transaction(function () use ($tenant) {
parent::createDatabase($tenant);
parent::createDatabase($tenant);
return $this->createUser($tenant->database());
});
return $this->createUser($tenant->database());
}
public function deleteDatabase(TenantWithDatabase $tenant): bool
{
return $this->database()->transaction(function () use ($tenant) {
parent::deleteDatabase($tenant);
parent::deleteDatabase($tenant);
return $this->deleteUser($tenant->database());
});
return $this->deleteUser($tenant->database());
}
}