From 065b029f485e5512786270b4088eb8f79a8d3efc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20=C5=A0tancl?= Date: Fri, 30 Sep 2022 00:11:47 +0200 Subject: [PATCH] fix phpstan issues in FilesystemTenancyBootstrapper --- src/Bootstrappers/FilesystemTenancyBootstrapper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Bootstrappers/FilesystemTenancyBootstrapper.php b/src/Bootstrappers/FilesystemTenancyBootstrapper.php index cb77a752..e9e0d93d 100644 --- a/src/Bootstrappers/FilesystemTenancyBootstrapper.php +++ b/src/Bootstrappers/FilesystemTenancyBootstrapper.php @@ -47,7 +47,7 @@ class FilesystemTenancyBootstrapper implements TenancyBootstrapper // asset() if ($this->app['config']['tenancy.filesystem.asset_helper_tenancy'] ?? true) { if ($this->originalPaths['asset_url']) { - $this->app['config']['app.asset_url'] = ($this->originalPaths['asset_url'] ?? $this->app['config']['app.url']) . "/$suffix"; + $this->app['config']['app.asset_url'] = $this->originalPaths['asset_url'] . "/$suffix"; $this->app['url']->setAssetRoot($this->app['config']['app.asset_url']); } else { $this->app['url']->setAssetRoot($this->app['url']->route('stancl.tenancy.asset', ['path' => ''])); @@ -84,7 +84,7 @@ class FilesystemTenancyBootstrapper implements TenancyBootstrapper if ($url = str_replace( '%tenant_id%', - $tenant->getTenantKey(), + (string) $tenant->getTenantKey(), $this->app['config']["tenancy.filesystem.url_override.{$disk}"] ?? '' )) { $this->app['config']["filesystems.disks.{$disk}.url"] = url($url);