Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Http/Middleware/DashboardMiddleware.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

use Laminas\Permissions\Acl\AclInterface;
use Laminas\Permissions\Acl\Role\RoleInterface;
use Mezzio\Authentication\UserInterface;
use Override;
use Psr\EventDispatcher\EventDispatcherInterface;
use Psr\Http\Message\ResponseInterface;
Expand All @@ -15,6 +14,7 @@
use Psr\Http\Server\RequestHandlerInterface;
use Webware\Admin\AclWidgetFilterIterator;
use Webware\Admin\Event\RegisterWidgetEvent;
use Webware\Core\UserInterface;

/**
* Dispatches RegisterWidgetEvent so that modules may contribute
Expand Down
3 changes: 2 additions & 1 deletion test/integration/DashboardMiddlewareIntegrationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
use Webware\Admin\Event\RegisterWidgetEvent;
use Webware\Admin\Http\Middleware\DashboardMiddleware;
use Webware\Admin\WidgetInterface;
use Webware\Core\UserInterface as CoreUserInterface;

use function array_key_exists;
use function iterator_to_array;
Expand Down Expand Up @@ -125,7 +126,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface

$middleware = new DashboardMiddleware($dispatcher, $acl);
$middleware->process(
$request->withAttribute(UserInterface::class, $user),
$request->withAttribute(CoreUserInterface::class, $user),
$handler,
);
}
Expand Down
3 changes: 2 additions & 1 deletion test/unit/DashboardMiddlewareTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
use Webware\Admin\Event\RegisterWidgetEvent;
use Webware\Admin\Http\Middleware\DashboardMiddleware;
use Webware\Admin\WidgetInterface;
use Webware\Core\UserInterface as CoreUserInterface;

use function is_array;
use function iterator_to_array;
Expand Down Expand Up @@ -182,7 +183,7 @@ static function (RegisterWidgetEvent $event) use ($widgets): object {

$request = new ServerRequest();
if (null !== $user) {
$request = $request->withAttribute(UserInterface::class, $user);
$request = $request->withAttribute(CoreUserInterface::class, $user);
}

$handler = new class($box) implements RequestHandlerInterface {
Expand Down
Loading