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

Specify namespace on global functions (fix #35) (#36)

Browse source 
* Specify namespace on global functions (fix #35)

* merge

* Revert some \ additions

* small fixes
This commit is contained in:
Samuel Štancl 2019-04-24 17:33:41 +02:00 • committed by GitHub
parent 35abb6191d
commit 97ec172fd4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/TenantManager.php
View file

@ -2,7 +2,6 @@
namespace Stancl\Tenancy;
use Illuminate\Support\Facades\Redis;
use Stancl\Tenancy\Interfaces\StorageDriver;
use Stancl\Tenancy\Traits\BootstrapsTenancy;
use Illuminate\Contracts\Foundation\Application;
@ -166,7 +165,7 @@ class TenantManager
public function getDatabaseName($tenant = []): string
{
$tenant = $tenant ?: $this->tenant;
return config('tenancy.database.prefix') . $tenant['uuid'] . config('tenancy.database.suffix');
return $this->app['config']['tenancy.database.prefix'] . $tenant['uuid'] . $this->app['config']['tenancy.database.suffix'];
}
/**
@ -233,7 +232,7 @@ class TenantManager
{
$uuid = $uuid ?: $this->tenant['uuid'];
if (is_array($key)) {
if (\is_array($key)) {
return $this->jsonDecodeArrayValues($this->storage->getMany($uuid, $key));
}
@ -250,7 +249,7 @@ class TenantManager
*/
public function put($key, $value = null, string $uuid = null)
{
if (is_null($uuid)) {
if (\is_null($uuid)) {
if (! isset($this->tenant['uuid'])) {
throw new \Exception("No UUID supplied (and no tenant is currently identified).");
}
@ -264,11 +263,11 @@ class TenantManager
$target = []; // black hole
}
if (! is_null($value)) {
if (! \is_null($value)) {
return $target[$key] = json_decode($this->storage->put($uuid, $key, json_encode($value)), true);
}
if (! is_array($key)) {
if (! \is_array($key)) {
throw new \Exception("No value supplied for key $key.");
}
@ -310,7 +309,7 @@ class TenantManager
*/
public function __invoke($attribute)
{
if (is_null($attribute)) {
if (\is_null($attribute)) {
return $this->tenant;
}