From 0ea080e16ec9b182488e68d46f2ab8db58ce4712 Mon Sep 17 00:00:00 2001
From: Dmitriy Derepko <xepozz@list.ru>
Date: Mon, 24 Jun 2024 08:57:35 +0300
Subject: [PATCH] Adopt debug (#320)

---
 config/common/di/router.php   | 7 +------
 config/web/di/application.php | 3 ++-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/config/common/di/router.php b/config/common/di/router.php
index 4341fd2..4c9df52 100644
--- a/config/common/di/router.php
+++ b/config/common/di/router.php
@@ -3,13 +3,12 @@
 declare(strict_types=1);
 
 use Yiisoft\Config\Config;
-use Yiisoft\DataResponse\Middleware\FormatDataResponse;
 use Yiisoft\Csrf\CsrfMiddleware;
+use Yiisoft\DataResponse\Middleware\FormatDataResponse;
 use Yiisoft\Router\Group;
 use Yiisoft\Router\RouteCollection;
 use Yiisoft\Router\RouteCollectionInterface;
 use Yiisoft\Router\RouteCollectorInterface;
-use Yiisoft\Yii\Debug\Viewer\Middleware\ToolbarMiddleware;
 
 /** @var Config $config */
 
@@ -23,10 +22,6 @@
                     ->routes(...$config->get('routes'))
             );
 
-        if (!str_starts_with(getenv('YII_ENV') ?: '', 'prod')) {
-            $collector->prependMiddleware(ToolbarMiddleware::class);
-        }
-
         return new RouteCollection($collector);
     },
 ];
diff --git a/config/web/di/application.php b/config/web/di/application.php
index 0dc61b6..9dbff74 100644
--- a/config/web/di/application.php
+++ b/config/web/di/application.php
@@ -7,11 +7,12 @@
 use Yiisoft\Definitions\Reference;
 use Yiisoft\Injector\Injector;
 use Yiisoft\Middleware\Dispatcher\MiddlewareDispatcher;
+use Yiisoft\Yii\Http\Application;
 
 /** @var array $params */
 
 return [
-    Yiisoft\Yii\Http\Application::class => [
+    Application::class => [
         '__construct()' => [
             'dispatcher' => DynamicReference::to(static function (Injector $injector) use ($params) {
                 return $injector->make(MiddlewareDispatcher::class)