- Fix conflicts

This commit is contained in:
mcndave authored and Dave Mc Nicoll committed 2026-10-19 19:52:24 +00:00
1 parent ec59a36afb
commit a903153fe2
8 files changed
+39 -15

No files matched your search

+6
View File
@@ -10,6 +10,8 @@ use Ulmus\User\{Authorize\HeaderAuthentication,
Middleware\AuthenticationMiddleware,
Middleware\HeaderAuthenticationMiddleware,
Middleware\PostRequestAuthenticationMiddleware,
Middleware\LocalMacAddressMiddleware,
Authorize\MacAddressAuthentication,
Authorize\PostRequestAuthentication};
use Picea\Picea;
@@ -34,6 +36,10 @@ return [
PostRequestAuthenticationMiddleware::class => create(PostRequestAuthenticationMiddleware::class)->constructor(get(PostRequestAuthentication::class)),
MacAddressAuthentication::class => create(MacAddressAuthentication::class)->constructor(get(Authenticate::class), "mac"),
LocalMacAddressMiddleware::class => create(LocalMacAddressMiddleware::class)->constructor(get(Entity\UserInterface::class), get('authentication.error'), get(MacAddressAuthentication::class)),
'authentication.method' => null,
'authorize.error' => function(ContainerInterface $c) {