Merge branch 'master' into object-storage

yiisoft · Sep 8, 2024 · e14cb23 · e14cb23
2 parents 1d77c4f + 544e56d
commit e14cb23
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 203 deletions.
diff --git a/composer.json b/composer.json
@@ -62,7 +62,6 @@
         "yiisoft/error-handler": "^3.0",
         "yiisoft/event-dispatcher": "^1.0",
         "yiisoft/log": "^2.0",
-        "yiisoft/middleware-dispatcher": "^3.0|^4.0|^5.0",
         "yiisoft/yii-console": "^2.0",
         "yiisoft/yii-http": "^1.0"
     },

diff --git a/config/events-web.php b/config/events-web.php
@@ -3,21 +3,18 @@
 declare(strict_types=1);
 
 use Yiisoft\ErrorHandler\Event\ApplicationError;
-use Yiisoft\Middleware\Dispatcher\Event\AfterMiddleware;
-use Yiisoft\Middleware\Dispatcher\Event\BeforeMiddleware;
 use Yiisoft\Profiler\ProfilerInterface;
-use Yiisoft\Yii\Debug\Collector\Web\MiddlewareCollector;
+use Yiisoft\Yii\Debug\Collector\ExceptionCollector;
 use Yiisoft\Yii\Debug\Collector\Web\RequestCollector;
 use Yiisoft\Yii\Debug\Collector\Web\WebAppInfoCollector;
-use Yiisoft\Yii\Debug\Collector\ExceptionCollector;
 use Yiisoft\Yii\Debug\Debugger;
 use Yiisoft\Yii\Http\Event\AfterEmit;
 use Yiisoft\Yii\Http\Event\AfterRequest;
 use Yiisoft\Yii\Http\Event\ApplicationShutdown;
 use Yiisoft\Yii\Http\Event\ApplicationStartup;
 use Yiisoft\Yii\Http\Event\BeforeRequest;
 
-if (!(bool)($params['yiisoft/yii-debug']['enabled'] ?? false)) {
+if (!(bool) ($params['yiisoft/yii-debug']['enabled'] ?? false)) {
     return [];
 }
 
@@ -42,12 +39,6 @@
         [WebAppInfoCollector::class, 'collect'],
         [Debugger::class, 'shutdown'],
     ],
-    BeforeMiddleware::class => [
-        [MiddlewareCollector::class, 'collect'],
-    ],
-    AfterMiddleware::class => [
-        [MiddlewareCollector::class, 'collect'],
-    ],
     ApplicationError::class => [
         [ExceptionCollector::class, 'collect'],
     ],

diff --git a/config/params.php b/config/params.php
@@ -22,7 +22,6 @@
 use Yiisoft\Yii\Debug\Collector\Stream\HttpStreamCollector;
 use Yiisoft\Yii\Debug\Collector\TimelineCollector;
 use Yiisoft\Yii\Debug\Collector\VarDumperCollector;
-use Yiisoft\Yii\Debug\Collector\Web\MiddlewareCollector;
 use Yiisoft\Yii\Debug\Collector\Web\RequestCollector;
 use Yiisoft\Yii\Debug\Collector\Web\WebAppInfoCollector;
 use Yiisoft\Yii\Debug\Command\DebugContainerCommand;
@@ -50,7 +49,6 @@
         'collectors.web' => [
             WebAppInfoCollector::class,
             RequestCollector::class,
-            MiddlewareCollector::class,
         ],
         'collectors.console' => [
             ConsoleAppInfoCollector::class,

diff --git a/src/Collector/Web/MiddlewareCollector.php b/src/Collector/Web/MiddlewareCollector.php
diff --git a/tests/Unit/Collector/MiddlewareCollectorTest.php b/tests/Unit/Collector/MiddlewareCollectorTest.php
diff --git a/tests/Unit/Support/DummyMiddleware.php b/tests/Unit/Support/DummyMiddleware.php