1
0
Fork 0
mirror of https://github.com/archtechx/tenancy.git synced 2025-12-12 11:14:04 +00:00

Laravel 6 support

This commit is contained in:
Samuel Štancl 2020-05-22 10:56:02 +02:00
parent d23dbf18ce
commit 0049a48383
5 changed files with 9 additions and 5 deletions

View file

@ -16,7 +16,7 @@ jobs:
strategy: strategy:
matrix: matrix:
laravel: [ laravel: [
# "^6.0", "^6.0",
"^7.0" "^7.0"
] ]

View file

@ -21,8 +21,10 @@ class Domain extends Model implements Contracts\Domain
protected $guarded = []; protected $guarded = [];
public static function booted() public static function boot()
{ {
parent::boot();
$ensureDomainIsNotOccupied = function (Domain $self) { $ensureDomainIsNotOccupied = function (Domain $self) {
if ($domain = Domain::where('domain', $self->domain)->first()) { if ($domain = Domain::where('domain', $self->domain)->first()) {
if ($domain->getKey() !== $self->getKey()) { if ($domain->getKey() !== $self->getKey()) {

View file

@ -7,8 +7,10 @@ use Stancl\Tenancy\Contracts\Syncable;
class TenantPivot extends Pivot class TenantPivot extends Pivot
{ {
public static function booted() public static function boot()
{ {
parent::boot();
static::saved(function (self $pivot) { static::saved(function (self $pivot) {
$parent = $pivot->pivotParent; $parent = $pivot->pivotParent;

View file

@ -11,7 +11,7 @@ use Symfony\Component\HttpFoundation\IpUtils;
class CheckTenantForMaintenanceMode extends CheckForMaintenanceMode class CheckTenantForMaintenanceMode extends CheckForMaintenanceMode
{ {
public function handle(Request $request, Closure $next) public function handle($request, Closure $next)
{ {
if (! tenant()) { if (! tenant()) {
throw new TenancyNotInitializedException; throw new TenancyNotInitializedException;

View file

@ -21,7 +21,7 @@ class ScopeSessionsTest extends TestCase
'middleware' => [StartSession::class, InitializeTenancyBySubdomain::class, ScopeSessions::class], 'middleware' => [StartSession::class, InitializeTenancyBySubdomain::class, ScopeSessions::class],
], function () { ], function () {
Route::get('/foo', function () { Route::get('/foo', function () {
return true; return 'true';
}); });
}); });