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

Merge branch 'may25' into rls-fake-constrained-foreign-keys

Browse source
This commit is contained in:
Samuel Štancl 2025-07-01 18:28:53 +02:00
commit 5561ce208e
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Concerns/DealsWithRouteContexts.php
View file

@ -110,7 +110,7 @@ trait DealsWithRouteContexts
foreach ($middleware as $inner) { foreach ($middleware as $inner) {
if (! $inner instanceof Closure && isset($middlewareGroups[$inner])) { if (! $inner instanceof Closure && isset($middlewareGroups[$inner])) {
$innerMiddleware = Arr::wrap($middlewareGroups[$inner]); $innerMiddleware = array_merge($innerMiddleware, Arr::wrap($middlewareGroups[$inner]));
} }
} }

12
tests/RouteMiddlewareTest.php
View file

@ -69,6 +69,18 @@ test('tenancy detects presence of route middleware correctly', function (string
InitializeTenancyByDomainOrSubdomain::class, InitializeTenancyByDomainOrSubdomain::class,
]); ]);
test('getRouteMiddleware properly unpacks all mw groups on a route', function() {
$route = Route::get('/foo', fn () => true)->middleware(['foo', 'bar']);
Route::middlewareGroup('foo', [PreventAccessFromUnwantedDomains::class]);
Route::middlewareGroup('bar', [InitializeTenancyByDomain::class]);
expect(tenancy()->getRouteMiddleware($route))->toContain(
PreventAccessFromUnwantedDomains::class,
InitializeTenancyByDomain::class
);
});
test('domain identification middleware is configurable', function() { test('domain identification middleware is configurable', function() {
$route = Route::get('/welcome-route', fn () => 'welcome')->middleware([InitializeTenancyByDomain::class]); $route = Route::get('/welcome-route', fn () => 'welcome')->middleware([InitializeTenancyByDomain::class]);