From 67cc4ffe5f5c44c6fae5ab28f82db9a85d295720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Thu, 12 Feb 2026 21:29:33 -0300 Subject: [PATCH] Extract dependency from Middleware\ResponseRendererLoading MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Uses DI instead. Signed-off-by: MaurĂ­cio Meneghini Fauth --- app/services.php | 2 +- src/Http/Middleware/ResponseRendererLoading.php | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/services.php b/app/services.php index 3c923392b5..38a196c8ec 100644 --- a/app/services.php +++ b/app/services.php @@ -236,7 +236,7 @@ return [ ], Middleware\ResponseRendererLoading::class => [ 'class' => Middleware\ResponseRendererLoading::class, - 'arguments' => [Config::class], + 'arguments' => [Config::class, ResponseRenderer::class], ], Middleware\ProfilingChecking::class => ['class' => Middleware\ProfilingChecking::class], Middleware\UserPreferencesLoading::class => [ diff --git a/src/Http/Middleware/ResponseRendererLoading.php b/src/Http/Middleware/ResponseRendererLoading.php index e4d98d2730..5f57f1f67d 100644 --- a/src/Http/Middleware/ResponseRendererLoading.php +++ b/src/Http/Middleware/ResponseRendererLoading.php @@ -14,20 +14,19 @@ use Psr\Http\Server\RequestHandlerInterface; use function assert; -final class ResponseRendererLoading implements MiddlewareInterface +final readonly class ResponseRendererLoading implements MiddlewareInterface { - public function __construct(private readonly Config $config) + public function __construct(private Config $config, private ResponseRenderer $responseRenderer) { } public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface { assert($request instanceof ServerRequest); - $responseRenderer = ResponseRenderer::getInstance(); - $responseRenderer->setAjax($request->isAjax()); + $this->responseRenderer->setAjax($request->isAjax()); if (! $this->config->hasSelectedServer()) { - $responseRenderer->getHeader()->disableMenuAndConsole(); - $responseRenderer->setMinimalFooter(); + $this->responseRenderer->getHeader()->disableMenuAndConsole(); + $this->responseRenderer->setMinimalFooter(); } return $handler->handle($request);